Upgrade nacos to 1.4.3.
Freeman Lau
3 years ago
parent
fe3c1a822d
commit
9d09a6df64
@ -0,0 +1,141 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2013-2022 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* 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.alibaba.cloud.imports.examples;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
import com.alibaba.cloud.imports.examples.model.UserConfig;
|
||||||
|
import com.alibaba.cloud.nacos.NacosConfigManager;
|
||||||
|
import com.alibaba.cloud.testsupport.HasDockerAndItEnabled;
|
||||||
|
import com.alibaba.nacos.api.exception.NacosException;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.junit.jupiter.api.condition.OS;
|
||||||
|
import org.testcontainers.containers.GenericContainer;
|
||||||
|
import org.testcontainers.junit.jupiter.Container;
|
||||||
|
import org.testcontainers.shaded.com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.boot.test.web.client.TestRestTemplate;
|
||||||
|
import org.springframework.boot.web.server.LocalServerPort;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.test.util.ReflectionTestUtils;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
import static org.junit.jupiter.api.condition.OS.MAC;
|
||||||
|
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The nacos image temporarily does not support the mac m1 chip (ARM).
|
||||||
|
* <p>
|
||||||
|
* If you test locally, you can use the image
|
||||||
|
* <a href="https://hub.docker.com/r/zhusaidong/nacos-server-m1">zhusaidong/nacos-server-m1:2.0.3</a>
|
||||||
|
*
|
||||||
|
* @author freeman
|
||||||
|
*/
|
||||||
|
@HasDockerAndItEnabled
|
||||||
|
@SpringBootTest(webEnvironment = RANDOM_PORT)
|
||||||
|
public class AppTest {
|
||||||
|
|
||||||
|
@LocalServerPort
|
||||||
|
private int port;
|
||||||
|
|
||||||
|
@Container
|
||||||
|
private static final GenericContainer nacos;
|
||||||
|
|
||||||
|
private static final String serverAddr;
|
||||||
|
|
||||||
|
static {
|
||||||
|
String image = getCurrentOs() == MAC
|
||||||
|
? "zhusaidong/nacos-server-m1:2.0.3"
|
||||||
|
: "nacos/nacos-server:1.4.2";
|
||||||
|
nacos = new GenericContainer(image).withExposedPorts(8848)
|
||||||
|
.withEnv("MODE", "standalone")
|
||||||
|
.withEnv("JVM_XMS", "256m")
|
||||||
|
.withEnv("JVM_XMX", "256m")
|
||||||
|
.withEnv("JVM_XMN", "128m");
|
||||||
|
|
||||||
|
nacos.start();
|
||||||
|
|
||||||
|
serverAddr = "127.0.0.1:" + nacos.getMappedPort(8848);
|
||||||
|
System.setProperty("spring.cloud.nacos.config.server-addr", serverAddr);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static OS getCurrentOs() {
|
||||||
|
return ReflectionTestUtils.invokeMethod(OS.class, "determineCurrentOs");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private TestRestTemplate restTemplate;
|
||||||
|
@Autowired
|
||||||
|
private NacosConfigManager nacosConfigManager;
|
||||||
|
|
||||||
|
private final ObjectMapper objectMapper = new ObjectMapper();
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testRefreshConfig() throws IOException, NacosException, InterruptedException {
|
||||||
|
// make sure nacos server is ready !
|
||||||
|
Thread.sleep(1500L);
|
||||||
|
|
||||||
|
ResponseEntity<String> response = restTemplate.getForEntity("http://127.0.0.1:" + port, String.class);
|
||||||
|
UserConfig userConfig = objectMapper.readValue(response.getBody(), UserConfig.class);
|
||||||
|
|
||||||
|
System.out.println("====== before refresh ======");
|
||||||
|
System.out.println(objectMapper.writeValueAsString(userConfig));
|
||||||
|
assertThat(userConfig.getAge()).isEqualTo(21);
|
||||||
|
assertThat(userConfig.getName()).isEqualTo("freeman");
|
||||||
|
assertThat(userConfig.getMap().size()).isEqualTo(2);
|
||||||
|
assertThat(userConfig.getUsers().size()).isEqualTo(2);
|
||||||
|
|
||||||
|
// update config
|
||||||
|
updateConfig();
|
||||||
|
|
||||||
|
// wait config refresh
|
||||||
|
Thread.sleep(2000L);
|
||||||
|
|
||||||
|
response = restTemplate.getForEntity("http://127.0.0.1:" + port, String.class);
|
||||||
|
userConfig = objectMapper.readValue(response.getBody(), UserConfig.class);
|
||||||
|
|
||||||
|
System.out.println("====== after refresh ======");
|
||||||
|
System.out.println(objectMapper.writeValueAsString(userConfig));
|
||||||
|
assertThat(userConfig.getAge()).isEqualTo(22);
|
||||||
|
assertThat(userConfig.getName()).isEqualTo("freeman1123");
|
||||||
|
assertThat(userConfig.getMap().size()).isEqualTo(3);
|
||||||
|
assertThat(userConfig.getUsers().size()).isEqualTo(2);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateConfig() throws NacosException {
|
||||||
|
nacosConfigManager.getConfigService().publishConfig("test.yml", "DEFAULT_GROUP",
|
||||||
|
"configdata:\n" +
|
||||||
|
" user:\n" +
|
||||||
|
" age: 22\n" +
|
||||||
|
" name: freeman1123\n" +
|
||||||
|
" map:\n" +
|
||||||
|
" hobbies:\n" +
|
||||||
|
" - art\n" +
|
||||||
|
" - programming\n" +
|
||||||
|
" - movie\n" +
|
||||||
|
" intro: Hello, I'm freeman\n" +
|
||||||
|
" extra: yo~\n" +
|
||||||
|
" users:\n" +
|
||||||
|
" - name: dad\n" +
|
||||||
|
" age: 20\n" +
|
||||||
|
" - name: mom\n" +
|
||||||
|
" age: 18", "yaml");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,63 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2013-2022 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* 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.alibaba.cloud.imports.examples;
|
||||||
|
|
||||||
|
import com.alibaba.cloud.nacos.NacosConfigManager;
|
||||||
|
import com.alibaba.nacos.api.config.ConfigService;
|
||||||
|
import com.alibaba.nacos.api.exception.NacosException;
|
||||||
|
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.context.event.EventListener;
|
||||||
|
import org.springframework.core.Ordered;
|
||||||
|
import org.springframework.core.annotation.Order;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author freeman
|
||||||
|
*/
|
||||||
|
@Configuration
|
||||||
|
public class Config {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosConfigManager nacosConfigManager;
|
||||||
|
|
||||||
|
@EventListener(ApplicationReadyEvent.class)
|
||||||
|
@Order(Ordered.HIGHEST_PRECEDENCE)
|
||||||
|
public void applicationReadyEventApplicationListener() throws NacosException {
|
||||||
|
pushConfig2Nacos(nacosConfigManager.getConfigService());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void pushConfig2Nacos(ConfigService configService)
|
||||||
|
throws NacosException {
|
||||||
|
configService.publishConfig("test.yml", "DEFAULT_GROUP",
|
||||||
|
"configdata:\n" +
|
||||||
|
" user:\n" +
|
||||||
|
" age: 21\n" +
|
||||||
|
" name: freeman\n" +
|
||||||
|
" map:\n" +
|
||||||
|
" hobbies:\n" +
|
||||||
|
" - art\n" +
|
||||||
|
" - programming\n" +
|
||||||
|
" intro: Hello, I'm freeman\n" +
|
||||||
|
" users:\n" +
|
||||||
|
" - name: dad\n" +
|
||||||
|
" age: 20\n" +
|
||||||
|
" - name: mom\n" +
|
||||||
|
" age: 18", "yaml");
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<parent>
|
||||||
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
|
<artifactId>spring-cloud-alibaba-examples</artifactId>
|
||||||
|
<version>${revision}</version>
|
||||||
|
</parent>
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<artifactId>spring-cloud-alibaba-test-support</artifactId>
|
||||||
|
<name>Spring Cloud Alibaba Test Support</name>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-test</artifactId>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.testcontainers</groupId>
|
||||||
|
<artifactId>junit-jupiter</artifactId>
|
||||||
|
<scope>compile</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
</project>
|
||||||
@ -0,0 +1,50 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012-2020 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* 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.alibaba.cloud.testsupport;
|
||||||
|
|
||||||
|
import java.lang.annotation.Documented;
|
||||||
|
import java.lang.annotation.ElementType;
|
||||||
|
import java.lang.annotation.Retention;
|
||||||
|
import java.lang.annotation.RetentionPolicy;
|
||||||
|
import java.lang.annotation.Target;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.extension.ExtendWith;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Disables test execution if Docker is unavailable.
|
||||||
|
* <p>
|
||||||
|
* We don't want to run integration tests on local machine, but give a change to run it.
|
||||||
|
* <p>
|
||||||
|
* Set system property
|
||||||
|
* {@link HasDockerAndItEnabledCondition#RUN_INTEGRATION_TESTS_PROPERTY} to 'true'
|
||||||
|
* <p>
|
||||||
|
* general usage: {@code mvn -Dit.enabled=true test}
|
||||||
|
* <p>
|
||||||
|
* <strong>NOTE:</strong> it means integration test
|
||||||
|
*
|
||||||
|
* @author Andy Wilkinson
|
||||||
|
* @author Phillip Webb
|
||||||
|
* @author freeman
|
||||||
|
* @since 2022
|
||||||
|
*/
|
||||||
|
@Target({ ElementType.TYPE, ElementType.METHOD })
|
||||||
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
|
@Documented
|
||||||
|
@ExtendWith(HasDockerAndItEnabledCondition.class)
|
||||||
|
public @interface HasDockerAndItEnabled {
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,64 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012-2020 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* 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.alibaba.cloud.testsupport;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.extension.ConditionEvaluationResult;
|
||||||
|
import org.junit.jupiter.api.extension.ExecutionCondition;
|
||||||
|
import org.junit.jupiter.api.extension.ExtensionContext;
|
||||||
|
import org.testcontainers.DockerClientFactory;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An {@link ExecutionCondition} that disables execution if Docker is unavailable.
|
||||||
|
*
|
||||||
|
* @author Andy Wilkinson
|
||||||
|
* @author Phillip Webb
|
||||||
|
* @author freeman
|
||||||
|
* @since 2022
|
||||||
|
*/
|
||||||
|
class HasDockerAndItEnabledCondition implements ExecutionCondition {
|
||||||
|
|
||||||
|
private static final String RUN_INTEGRATION_TESTS_PROPERTY = "it.enabled";
|
||||||
|
|
||||||
|
private static final ConditionEvaluationResult ENABLED = ConditionEvaluationResult
|
||||||
|
.enabled("Docker available.");
|
||||||
|
|
||||||
|
private static final ConditionEvaluationResult DISABLED = ConditionEvaluationResult
|
||||||
|
.disabled("Default not run integration tests, you can set '"
|
||||||
|
+ RUN_INTEGRATION_TESTS_PROPERTY + "=true' to enable.");
|
||||||
|
|
||||||
|
private static final ConditionEvaluationResult DOCKER_DISABLED = ConditionEvaluationResult
|
||||||
|
.disabled("Docker unavailable.");
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ConditionEvaluationResult evaluateExecutionCondition(
|
||||||
|
ExtensionContext context) {
|
||||||
|
try {
|
||||||
|
if (Boolean
|
||||||
|
.parseBoolean(System.getProperty(RUN_INTEGRATION_TESTS_PROPERTY))) {
|
||||||
|
DockerClientFactory.instance().client();
|
||||||
|
return ENABLED;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return DISABLED;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Throwable ignored) {
|
||||||
|
return DOCKER_DISABLED;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue