feat: Update config server IP to 127.0.0.1 and adjust tests (#1796)

Signed-off-by: Haotian Zhang <928016560@qq.com>
pull/1778/head
Haotian Zhang 6 months ago committed by Haotian Zhang
parent 8308a9f172
commit 733f3b504a

@ -2,3 +2,4 @@
--- ---
- [feat: Add config address to report client url conversion.](https://github.com/Tencent/spring-cloud-tencent/pull/1795) - [feat: Add config address to report client url conversion.](https://github.com/Tencent/spring-cloud-tencent/pull/1795)
- [feat: Update config server IP to 127.0.0.1 and adjust tests.](https://github.com/Tencent/spring-cloud-tencent/pull/1796)

@ -211,7 +211,7 @@ public class ConfigurationModifier implements PolarisConfigurationConfigModifier
} }
if (ipPort.length != 2) { if (ipPort.length != 2) {
throw new IllegalArgumentException("Config server address (" + address + ") is wrong, please check address like grpc://183.47.111.8:8091."); throw new IllegalArgumentException("Config server address (" + address + ") is wrong, please check address like grpc://127.0.0.1:8091.");
} }
LOGGER.info("[SCT] Check config server ipPort: {}", Arrays.asList(ipPort)); LOGGER.info("[SCT] Check config server ipPort: {}", Arrays.asList(ipPort));

@ -107,18 +107,18 @@ class ConfigurationModifierTest {
/** /**
* Test resolvePolarisAddressFromConfigAddress with a single address containing port. * Test resolvePolarisAddressFromConfigAddress with a single address containing port.
* Scenario: pass a single config address "grpc://192.168.1.100:8093". * Scenario: pass a single config address "grpc://127.0.0.1:8093".
* Expect: the port should be replaced with 8091. * Expect: the port should be replaced with 8091.
*/ */
@DisplayName("resolvePolarisAddressFromConfigAddress should replace port with 8091 for single address") @DisplayName("resolvePolarisAddressFromConfigAddress should replace port with 8091 for single address")
@Test @Test
void testResolvePolarisAddressFromConfigAddress_SingleAddress() throws Exception { void testResolvePolarisAddressFromConfigAddress_SingleAddress() throws Exception {
// Arrange // Arrange
String configAddress = "grpc://192.168.1.100:8093"; String configAddress = "grpc://127.0.0.1:8093";
try (MockedStatic<AddressUtils> mockedAddressUtils = Mockito.mockStatic(AddressUtils.class)) { try (MockedStatic<AddressUtils> mockedAddressUtils = Mockito.mockStatic(AddressUtils.class)) {
mockedAddressUtils.when(() -> AddressUtils.parseAddressList(anyString())) mockedAddressUtils.when(() -> AddressUtils.parseAddressList(anyString()))
.thenReturn(Collections.singletonList("192.168.1.100:8093")); .thenReturn(Collections.singletonList("127.0.0.1:8093"));
// Act // Act
List<String> result = invokeResolvePolarisAddressFromConfigAddress(configAddress); List<String> result = invokeResolvePolarisAddressFromConfigAddress(configAddress);
@ -126,7 +126,7 @@ class ConfigurationModifierTest {
// Assert // Assert
assertThat(result).isNotNull(); assertThat(result).isNotNull();
assertThat(result).hasSize(1); assertThat(result).hasSize(1);
assertThat(result.get(0)).isEqualTo("192.168.1.100:8091"); assertThat(result.get(0)).isEqualTo("127.0.0.1:8091");
} }
} }
@ -139,11 +139,11 @@ class ConfigurationModifierTest {
@Test @Test
void testResolvePolarisAddressFromConfigAddress_MultipleAddresses() throws Exception { void testResolvePolarisAddressFromConfigAddress_MultipleAddresses() throws Exception {
// Arrange // Arrange
String configAddress = "grpc://10.0.1.1:8093,grpc://10.0.1.2:8094"; String configAddress = "grpc://127.0.0.1:8093,grpc://127.0.0.1:8094";
try (MockedStatic<AddressUtils> mockedAddressUtils = Mockito.mockStatic(AddressUtils.class)) { try (MockedStatic<AddressUtils> mockedAddressUtils = Mockito.mockStatic(AddressUtils.class)) {
mockedAddressUtils.when(() -> AddressUtils.parseAddressList(anyString())) mockedAddressUtils.when(() -> AddressUtils.parseAddressList(anyString()))
.thenReturn(Arrays.asList("10.0.1.1:8093", "10.0.1.2:8094")); .thenReturn(Arrays.asList("127.0.0.1:8093", "127.0.0.1:8094"));
// Act // Act
List<String> result = invokeResolvePolarisAddressFromConfigAddress(configAddress); List<String> result = invokeResolvePolarisAddressFromConfigAddress(configAddress);
@ -151,8 +151,8 @@ class ConfigurationModifierTest {
// Assert // Assert
assertThat(result).isNotNull(); assertThat(result).isNotNull();
assertThat(result).hasSize(2); assertThat(result).hasSize(2);
assertThat(result.get(0)).isEqualTo("10.0.1.1:8091"); assertThat(result.get(0)).isEqualTo("127.0.0.1:8091");
assertThat(result.get(1)).isEqualTo("10.0.1.2:8091"); assertThat(result.get(1)).isEqualTo("127.0.0.1:8091");
} }
} }
@ -190,11 +190,11 @@ class ConfigurationModifierTest {
@Test @Test
void testResolvePolarisAddressFromConfigAddress_BlankAddressSkipped() throws Exception { void testResolvePolarisAddressFromConfigAddress_BlankAddressSkipped() throws Exception {
// Arrange // Arrange
String configAddress = "grpc://172.16.0.1:8093, ,grpc://172.16.0.2:9090"; String configAddress = "grpc://127.0.0.1:8093, ,grpc://127.0.0.1:9090";
try (MockedStatic<AddressUtils> mockedAddressUtils = Mockito.mockStatic(AddressUtils.class)) { try (MockedStatic<AddressUtils> mockedAddressUtils = Mockito.mockStatic(AddressUtils.class)) {
mockedAddressUtils.when(() -> AddressUtils.parseAddressList(anyString())) mockedAddressUtils.when(() -> AddressUtils.parseAddressList(anyString()))
.thenReturn(Arrays.asList("172.16.0.1:8093", " ", "172.16.0.2:9090")); .thenReturn(Arrays.asList("127.0.0.1:8093", " ", "127.0.0.1:9090"));
// Act // Act
List<String> result = invokeResolvePolarisAddressFromConfigAddress(configAddress); List<String> result = invokeResolvePolarisAddressFromConfigAddress(configAddress);
@ -202,8 +202,8 @@ class ConfigurationModifierTest {
// Assert // Assert
assertThat(result).isNotNull(); assertThat(result).isNotNull();
assertThat(result).hasSize(2); assertThat(result).hasSize(2);
assertThat(result.get(0)).isEqualTo("172.16.0.1:8091"); assertThat(result.get(0)).isEqualTo("127.0.0.1:8091");
assertThat(result.get(1)).isEqualTo("172.16.0.2:8091"); assertThat(result.get(1)).isEqualTo("127.0.0.1:8091");
} }
} }

@ -23,7 +23,7 @@ spring:
# enabled: true # enabled: true
# address: 127.0.0.1:9091 # address: 127.0.0.1:9091
config: config:
address: grpc://9.134.5.52:8093 address: grpc://119.91.66.223:8093
auto-refresh: true auto-refresh: true
groups: groups:
- name: ${spring.application.name} - name: ${spring.application.name}

Loading…
Cancel
Save