docs(springboot cloudconfig): A fix of example docs.

Fix the example doc to make cloud config demo works both local and kubernetes

Signed-off-by: lony2003 <[email protected]>

Author: lony2003

spring-boot-examples/cloud-config-demo/src/test/java/io/dapr/springboot/examples/cloudconfig/CloudConfigTests.java

@@ -54,79 +54,8 @@
 @Tag("testcontainers")
 class CloudConfigTests {
 
-  public static final String CONFIG_STORE_NAME = "democonfigconf";
-  public static final String CONFIG_MULTI_NAME = "multivalue-yaml";
-  public static final String CONFIG_SINGLE_NAME = "dapr.spring.demo-config-config.singlevalue";
-
-  public static final String SECRET_STORE_NAME = "democonfig";
-  public static final String SECRET_MULTI_NAME = "multivalue-properties";
-  public static final String SECRET_SINGLE_NAME = "dapr.spring.demo-config-secret.singlevalue";
-
-  public static final String SECRET_STORE_NAME_MULTI = "democonfigMultivalued";
-
-  private static final Map<String, String> SINGLE_VALUE_PROPERTY = generateSingleValueProperty();
-  private static final Map<String, String> MULTI_VALUE_PROPERTY = generateMultiValueProperty();
-
-
-  private static final Map<String, String> STORE_PROPERTY = generateStoreProperty();
-
-  private static final Network DAPR_NETWORK = Network.newNetwork();
-
-  @Container
-  private static final RedisContainer REDIS_CONTAINER = new RedisContainer(
-      RedisContainer.DEFAULT_IMAGE_NAME.withTag(RedisContainer.DEFAULT_TAG)) {
-    @Override
-    protected void containerIsStarted(InspectContainerResponse containerInfo) {
-      super.containerIsStarted(containerInfo);
-
-      String address = getHost();
-      Integer port = getMappedPort(6379);
-
-      Logger logger = LoggerFactory.getLogger(CloudConfigTests.class);
-      // Put values using Jedis
-      try (Jedis jedis = new Jedis(address, port)) {
-        logger.info("Putting Dapr Cloud config to {}:{}", address, port);
-        jedis.set(CloudConfigTests.CONFIG_MULTI_NAME, DaprConfigurationStores.YAML_CONFIG);
-        jedis.set(CloudConfigTests.CONFIG_SINGLE_NAME, "testvalue");
-      }
-    }
-  }
-      .withNetworkAliases("redis")
-      .withCommand()
-      .withNetwork(DAPR_NETWORK);
-
-  @Container
-  @ServiceConnection
-  private static final DaprContainer DAPR_CONTAINER = new DaprContainer("daprio/daprd:1.14.4")
-      .withAppName("configuration-dapr-app")
-      .withNetwork(DAPR_NETWORK)
-      .withComponent(new Component(CONFIG_STORE_NAME, "configuration.redis", "v1", STORE_PROPERTY))
-      .withComponent(new Component(SECRET_STORE_NAME, "secretstores.local.file", "v1", SINGLE_VALUE_PROPERTY))
-      .withComponent(new Component(SECRET_STORE_NAME_MULTI, "secretstores.local.file", "v1", MULTI_VALUE_PROPERTY))
-      .withDaprLogLevel(DaprLogLevel.DEBUG)
-      .withLogConsumer(outputFrame -> System.out.println(outputFrame.getUtf8String()))
-      .dependsOn(REDIS_CONTAINER)
-      .withCopyToContainer(Transferable.of(DaprSecretStores.SINGLE_VALUED_SECRET), "/dapr-secrets/singlevalued.json")
-      .withCopyToContainer(Transferable.of(DaprSecretStores.MULTI_VALUED_SECRET), "/dapr-secrets/multivalued.json");
-
   static {
-    DAPR_CONTAINER.setPortBindings(List.of("3500:3500", "50001:50001"));
-  }
-
-  private static Map<String, String> generateStoreProperty() {
-    return Map.of("redisHost", "redis:6379",
-        "redisPassword", "");
-  }
-
-  private static Map<String, String> generateSingleValueProperty() {
-    return Map.of("secretsFile", "/dapr-secrets/singlevalued.json",
-        "multiValued", "false");
-  }
-
-  private static Map<String, String> generateMultiValueProperty() {
-    return Map.of("secretsFile", "/dapr-secrets/multivalued.json",
-        "nestedSeparator", ".",
-        "multiValued", "true");
+    DaprTestContainersConfig.DAPR_CONTAINER.start();
   }
 
   @BeforeEach

spring-boot-examples/cloud-config-demo/src/test/java/io/dapr/springboot/examples/cloudconfig/DaprTestContainersConfig.java

@@ -54,7 +54,7 @@ public class DaprTestContainersConfig {
 
   private static final Map<String, String> STORE_PROPERTY = generateStoreProperty();
 
-  private static final Network DAPR_NETWORK = getDaprNetwork();
+  private static final Network DAPR_NETWORK = Network.newNetwork();
 
   private static Map<String, String> generateStoreProperty() {
     return Map.of("redisHost", "redis:6379",
@@ -72,35 +72,6 @@ private static Map<String, String> generateMultiValueProperty() {
         "multiValued", "true");
   }
 
-  public static Network getDaprNetwork() {
-      Network defaultDaprNetwork = new Network() {
-        @Override
-        public String getId() {
-          return "dapr-network";
-        }
-
-        @Override
-        public void close() {
-
-        }
-
-        @Override
-        public Statement apply(Statement base, Description description) {
-          return null;
-        }
-      };
-
-      List<com.github.dockerjava.api.model.Network> networks = DockerClientFactory.instance().client().listNetworksCmd()
-          .withNameFilter("dapr-network").exec();
-      if (networks.isEmpty()) {
-        Network.builder().createNetworkCmdModifier(cmd -> cmd.withName("dapr-network")).build().getId();
-        return defaultDaprNetwork;
-      } else {
-        return defaultDaprNetwork;
-      }
-
-  }
-
   @Container
   private static final RedisContainer REDIS_CONTAINER = new RedisContainer(
       RedisContainer.DEFAULT_IMAGE_NAME.withTag(RedisContainer.DEFAULT_TAG)) {
@@ -115,8 +86,8 @@ protected void containerIsStarted(InspectContainerResponse containerInfo) {
       // Put values using Jedis
       try (Jedis jedis = new Jedis(address, port)) {
         logger.info("Putting Dapr Cloud config to {}:{}", address, port);
-        jedis.set(CloudConfigTests.CONFIG_MULTI_NAME, DaprConfigurationStores.YAML_CONFIG);
-        jedis.set(CloudConfigTests.CONFIG_SINGLE_NAME, "testvalue");
+        jedis.set(DaprTestContainersConfig.CONFIG_MULTI_NAME, DaprConfigurationStores.YAML_CONFIG);
+        jedis.set(DaprTestContainersConfig.CONFIG_SINGLE_NAME, "testvalue");
       }
     }
   }