msb-public
/
spring-cloud-tencent
mirror of https://github.com/Tencent/spring-cloud-tencent
3
1
Code Issues Projects Releases Wiki Activity

feat:support namespace exports configuration if not created. (#1612)

Browse Source 
Co-authored-by: Haotian Zhang <skyebefreeman@qq.com>
pull/1618/head
Fishtail 3 months ago committed by GitHub
parent 33da7565a0
commit 5de82251da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 108 additions and 12 deletions
Show Stats Download Patch File Download Diff File

1
CHANGELOG.md
Unescape View File

@ -42,3 +42,4 @@
- [feat:support ipv6.](https://github.com/Tencent/spring-cloud-tencent/pull/1600)
- [feat:support config all recover enabled.](https://github.com/Tencent/spring-cloud-tencent/pull/1603)
- [feat:support stat reporting path aggregation.](https://github.com/Tencent/spring-cloud-tencent/pull/1607)
- [feat:support namespace exports configuration if not created.](https://github.com/Tencent/spring-cloud-tencent/pull/1612)

14
spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/PolarisDiscoveryProperties.java
Unescape View File

@ -122,6 +122,11 @@ public class PolarisDiscoveryProperties {
*/
private Boolean allRecoverEnabled = true;
/**
* namespace exports if not created.
*/
private String namespaceExports;
public String getInstanceId() {
return instanceId;
}
@ -265,6 +270,14 @@ public class PolarisDiscoveryProperties {
this.registerEnabled = registerEnabled;
}
public String getNamespaceExports() {
return namespaceExports;
}
public void setNamespaceExports(String namespaceExports) {
this.namespaceExports = namespaceExports;
}
@Override
public String toString() {
return "PolarisDiscoveryProperties{" +
@ -284,6 +297,7 @@ public class PolarisDiscoveryProperties {
", zeroProtectionNeedTestConnectivity=" + zeroProtectionNeedTestConnectivity +
", preferIpv6=" + preferIpv6 +
", allRecoverEnabled=" + allRecoverEnabled +
", namespaceExports='" + namespaceExports + '\'' +
'}';
}
}

43
spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/NamespaceRegistrationCustomizer.java
Unescape View File

@ -0,0 +1,43 @@
/*
* Tencent is pleased to support the open source community by making spring-cloud-tencent available.
*
* Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved.
*
* Licensed under the BSD 3-Clause License (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://opensource.org/licenses/BSD-3-Clause
*
* Unless required by applicable law or agreed to in writing, software distributed
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package com.tencent.cloud.polaris.registry;
import com.tencent.cloud.polaris.PolarisDiscoveryProperties;
import com.tencent.polaris.api.utils.StringUtils;
/**
* 服务注册时端口相关逻辑.
*
* @author Haotian Zhang
*/
public class NamespaceRegistrationCustomizer implements PolarisRegistrationCustomizer {
private final PolarisDiscoveryProperties polarisDiscoveryProperties;
public NamespaceRegistrationCustomizer(PolarisDiscoveryProperties polarisDiscoveryProperties) {
this.polarisDiscoveryProperties = polarisDiscoveryProperties;
}
@Override
public void customize(PolarisRegistration registration) {
String namespaceExports = polarisDiscoveryProperties.getNamespaceExports();
if (StringUtils.isNotBlank(namespaceExports)) {
registration.getMetadata().put("POLARIS_INTERNAL_NAMESPACE_EXPORTS", namespaceExports);
}
}
}

5
spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistryAutoConfiguration.java
Unescape View File

@ -95,4 +95,9 @@ public class PolarisServiceRegistryAutoConfiguration {
public PolarisWebApplicationCheck polarisWebApplicationCheck() {
return new PolarisWebApplicationCheck();
}
@Bean
public NamespaceRegistrationCustomizer namespaceRegistrationCustomizer(PolarisDiscoveryProperties polarisDiscoveryProperties) {
return new NamespaceRegistrationCustomizer(polarisDiscoveryProperties);
}
}

5
spring-cloud-starter-tencent-polaris-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json
Unescape View File

@ -90,6 +90,11 @@
"defaultValue": true,
"description": "is all recover enable. Default: true."
},
{
"name": "spring.cloud.polaris.discovery.namespace-exports",
"type": "java.lang.String",
"description": "namespace exports if not created."
},
{
"name": "spring.cloud.polaris.discovery.eager-load.enabled",
"type": "java.lang.Boolean",

6
spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/PolarisDiscoveryPropertiesTest.java
Unescape View File

@ -94,6 +94,9 @@ public class PolarisDiscoveryPropertiesTest {
polarisDiscoveryProperties.setAllRecoverEnabled(false);
assertThat(polarisDiscoveryProperties.getAllRecoverEnabled()).isFalse();
polarisDiscoveryProperties.setNamespaceExports("*");
assertThat(polarisDiscoveryProperties.getNamespaceExports()).isEqualTo("*");
assertThat(polarisDiscoveryProperties.toString())
.isEqualTo("PolarisDiscoveryProperties{"
+ "namespace='Test'"
@ -110,6 +113,7 @@ public class PolarisDiscoveryPropertiesTest {
+ ", zeroProtectionEnabled=false"
+ ", zeroProtectionNeedTestConnectivity=false"
+ ", preferIpv6=true"
+ ", allRecoverEnabled=false}");
+ ", allRecoverEnabled=false"
+ ", namespaceExports='*'}");
}
}

12
spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/registry/PolarisRegistrationCustomizerTest.java
Unescape View File

@ -62,7 +62,7 @@ public class PolarisRegistrationCustomizerTest {
this.contextRunner.run(context -> {
PolarisRegistration polarisRegistration = context.getBean(PolarisRegistration.class);
polarisRegistration.customize();
PolarisRegistrationCustomizer customizer = context.getBean(PolarisRegistrationCustomizer.class);
TestPolarisRegistrationCustomizer customizer = context.getBean(TestPolarisRegistrationCustomizer.class);
verify(customizer, times(1)).customize(any(PolarisRegistration.class));
});
}
@ -71,8 +71,14 @@ public class PolarisRegistrationCustomizerTest {
@EnableAutoConfiguration
static class PolarisServiceRegistryAutoConfiguration {
@Bean
public PolarisRegistrationCustomizer polarisRegistrationCustomizer() {
return mock(PolarisRegistrationCustomizer.class);
public TestPolarisRegistrationCustomizer testPolarisRegistrationCustomizer() {
return mock(TestPolarisRegistrationCustomizer.class);
}
}
static class TestPolarisRegistrationCustomizer implements PolarisRegistrationCustomizer {
@Override
public void customize(PolarisRegistration polarisRegistration) {
}
}
}

21
spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/spi/impl/DefaultInstanceMetadataProvider.java
Unescape View File

@ -25,6 +25,9 @@ import java.util.Set;
import com.tencent.cloud.common.spi.InstanceMetadataProvider;
import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
import com.tencent.cloud.common.util.inet.PolarisInetUtils;
import com.tencent.polaris.api.utils.StringUtils;
import com.tencent.polaris.metadata.core.constant.MetadataConstants;
import static com.tencent.cloud.common.constant.MetadataConstant.DefaultMetadata.DEFAULT_METADATA_SOURCE_SERVICE_NAME;
import static com.tencent.cloud.common.constant.MetadataConstant.DefaultMetadata.DEFAULT_METADATA_SOURCE_SERVICE_NAMESPACE;
@ -48,10 +51,20 @@ public class DefaultInstanceMetadataProvider implements InstanceMetadataProvider
@Override
public Map<String, String> getMetadata() {
return new HashMap<String, String>() {{
put(DEFAULT_METADATA_SOURCE_SERVICE_NAMESPACE, LOCAL_NAMESPACE);
put(DEFAULT_METADATA_SOURCE_SERVICE_NAME, LOCAL_SERVICE);
}};
HashMap<String, String> defaultInstanceMetadata = new HashMap<>();
defaultInstanceMetadata.put(DEFAULT_METADATA_SOURCE_SERVICE_NAMESPACE, LOCAL_NAMESPACE);
defaultInstanceMetadata.put(DEFAULT_METADATA_SOURCE_SERVICE_NAME, LOCAL_SERVICE);
String ipv4Address = PolarisInetUtils.getIpString(false);
if (StringUtils.isNotBlank(ipv4Address)) {
defaultInstanceMetadata.put(MetadataConstants.ADDRESS_IPV4, ipv4Address);
}
String ipv6Address = PolarisInetUtils.getIpString(true);
if (StringUtils.isNotBlank(ipv6Address)) {
defaultInstanceMetadata.put(MetadataConstants.ADDRESS_IPV6, ipv6Address);
}
return defaultInstanceMetadata;
}
@Override

7
spring-cloud-tencent-commons/src/test/java/com/tencent/cloud/common/metadata/StaticMetadataManagerTest.java
Unescape View File

@ -57,6 +57,7 @@ import static org.mockito.Mockito.when;
@ExtendWith({MockitoExtension.class, SystemStubsExtension.class})
public class StaticMetadataManagerTest {
private static MockedStatic<ApplicationContextAwareUtils> mockedApplicationContextAwareUtils;
/**
* EnvironmentVariablesRule.
*/
@ -65,8 +66,6 @@ public class StaticMetadataManagerTest {
@Mock
private MetadataLocalProperties metadataLocalProperties;
private static MockedStatic<ApplicationContextAwareUtils> mockedApplicationContextAwareUtils;
@BeforeAll
static void beforeAll() {
mockedApplicationContextAwareUtils = Mockito.mockStatic(ApplicationContextAwareUtils.class);
@ -137,7 +136,7 @@ public class StaticMetadataManagerTest {
Arrays.asList(new MockedMetadataProvider(), new DefaultInstanceMetadataProvider(null)));
Map<String, String> metadata = metadataManager.getAllCustomMetadata();
assertThat(metadata.size()).isEqualTo(5);
assertThat(metadata.size()).isEqualTo(6);
assertThat(metadata.get("k1")).isEqualTo("v1");
assertThat(metadata.get("k2")).isEqualTo("v22");
assertThat(metadata.get("k3")).isEqualTo("v33");
@ -182,7 +181,7 @@ public class StaticMetadataManagerTest {
Arrays.asList(new MockedMetadataProvider(), new DefaultInstanceMetadataProvider(null)));
Map<String, String> metadata = metadataManager.getMergedStaticMetadata();
assertThat(metadata.size()).isEqualTo(8);
assertThat(metadata.size()).isEqualTo(9);
assertThat(metadata.get("k1")).isEqualTo("v1");
assertThat(metadata.get("k2")).isEqualTo("v22");
assertThat(metadata.get("k3")).isEqualTo("v33");

6
spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/config/PolarisContextEnvironmentPostProcessor.java
Unescape View File

@ -98,6 +98,12 @@ public final class PolarisContextEnvironmentPostProcessor implements Environment
polarisEnvProperties.put("spring.cloud.tencent.metadata.content.zone", zone);
}
// global namespace enabled
String globalNamespaceEnabled = environment.getProperty("global_namespace_enabled");
if (StringUtils.isNotBlank(globalNamespaceEnabled) && StringUtils.equals("true", globalNamespaceEnabled)) {
polarisEnvProperties.put("spring.cloud.polaris.discovery.namespace-exports", "*");
}
LOGGER.debug("polaris-env-properties:{}", polarisEnvProperties);
MapPropertySource propertySource = new MapPropertySource("polaris-env-properties", polarisEnvProperties);
environment.getPropertySources().addFirst(propertySource);

Write Preview
Loading…
Cancel
Save