From 468e42563ba4c3a3a158553b01807f9a6ffc181a Mon Sep 17 00:00:00 2001 From: siri-varma Date: Tue, 8 Apr 2025 15:24:58 +0530 Subject: [PATCH 01/11] Fix versions Signed-off-by: siri-varma --- .../io/dapr/it/resiliency/SdkResiliencyIT.java | 4 ++-- .../it/spring/data/DaprKeyValueRepositoryIT.java | 4 ++-- .../spring/data/MySQLDaprKeyValueTemplateIT.java | 4 ++-- .../data/PostgreSQLDaprKeyValueTemplateIT.java | 4 ++-- .../spring/messaging/DaprSpringMessagingIT.java | 4 ++-- .../io/dapr/it/testcontainers/DaprActorsIT.java | 3 ++- .../dapr/it/testcontainers/DaprContainerIT.java | 4 ++-- .../testcontainers/DaprPlacementContainerIT.java | 1 + .../dapr/it/testcontainers/DaprWorkflowsIT.java | 4 ++-- .../io/dapr/testcontainers/DaprContainer.java | 16 +++++++++------- 10 files changed, 26 insertions(+), 22 deletions(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/resiliency/SdkResiliencyIT.java b/sdk-tests/src/test/java/io/dapr/it/resiliency/SdkResiliencyIT.java index bb194bf1f2..4c19c8331c 100644 --- a/sdk-tests/src/test/java/io/dapr/it/resiliency/SdkResiliencyIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/resiliency/SdkResiliencyIT.java @@ -58,7 +58,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; import static com.github.tomakehurst.wiremock.client.WireMock.verify; import static io.dapr.it.resiliency.SdkResiliencyIT.WIREMOCK_PORT; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_IMAGE_TAG; +import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static io.dapr.it.testcontainers.ContainerConstants.TOXIPROXY_IMAGE_TAG; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -74,7 +74,7 @@ public class SdkResiliencyIT { private static final int INFINITE_RETRY = -1; @Container - private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_IMAGE_TAG) + private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("dapr-app") .withAppPort(WIREMOCK_PORT) .withDaprLogLevel(DaprLogLevel.DEBUG) diff --git a/sdk-tests/src/test/java/io/dapr/it/spring/data/DaprKeyValueRepositoryIT.java b/sdk-tests/src/test/java/io/dapr/it/spring/data/DaprKeyValueRepositoryIT.java index 351e405cd9..57b6e40ac3 100644 --- a/sdk-tests/src/test/java/io/dapr/it/spring/data/DaprKeyValueRepositoryIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/spring/data/DaprKeyValueRepositoryIT.java @@ -35,7 +35,7 @@ import static io.dapr.it.spring.data.DaprSpringDataConstants.BINDING_NAME; import static io.dapr.it.spring.data.DaprSpringDataConstants.STATE_STORE_NAME; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_IMAGE_TAG; +import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.junit.jupiter.api.Assertions.*; /** @@ -65,7 +65,7 @@ public class DaprKeyValueRepositoryIT { @Container @ServiceConnection - private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_IMAGE_TAG) + private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("postgresql-repository-dapr-app") .withNetwork(DAPR_NETWORK) .withComponent(new Component(STATE_STORE_NAME, "state.postgresql", "v1", STATE_STORE_PROPERTIES)) diff --git a/sdk-tests/src/test/java/io/dapr/it/spring/data/MySQLDaprKeyValueTemplateIT.java b/sdk-tests/src/test/java/io/dapr/it/spring/data/MySQLDaprKeyValueTemplateIT.java index bdcbc61aed..1e1d959eef 100644 --- a/sdk-tests/src/test/java/io/dapr/it/spring/data/MySQLDaprKeyValueTemplateIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/spring/data/MySQLDaprKeyValueTemplateIT.java @@ -44,7 +44,7 @@ import static io.dapr.it.spring.data.DaprSpringDataConstants.STATE_STORE_NAME; import static io.dapr.it.spring.data.DaprSpringDataConstants.BINDING_NAME; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_IMAGE_TAG; +import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -80,7 +80,7 @@ public class MySQLDaprKeyValueTemplateIT { @Container @ServiceConnection - private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_IMAGE_TAG) + private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("mysql-dapr-app") .withNetwork(DAPR_NETWORK) .withComponent(new Component(STATE_STORE_NAME, "state.mysql", "v1", STATE_STORE_PROPERTIES)) diff --git a/sdk-tests/src/test/java/io/dapr/it/spring/data/PostgreSQLDaprKeyValueTemplateIT.java b/sdk-tests/src/test/java/io/dapr/it/spring/data/PostgreSQLDaprKeyValueTemplateIT.java index 56c8f9f88c..bac4d94516 100644 --- a/sdk-tests/src/test/java/io/dapr/it/spring/data/PostgreSQLDaprKeyValueTemplateIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/spring/data/PostgreSQLDaprKeyValueTemplateIT.java @@ -36,7 +36,7 @@ import static io.dapr.it.spring.data.DaprSpringDataConstants.BINDING_NAME; import static io.dapr.it.spring.data.DaprSpringDataConstants.STATE_STORE_NAME; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_IMAGE_TAG; +import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -67,7 +67,7 @@ public class PostgreSQLDaprKeyValueTemplateIT { @Container @ServiceConnection - private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_IMAGE_TAG) + private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("postgresql-dapr-app") .withNetwork(DAPR_NETWORK) .withComponent(new Component(STATE_STORE_NAME, "state.postgresql", "v1", STATE_STORE_PROPERTIES)) diff --git a/sdk-tests/src/test/java/io/dapr/it/spring/messaging/DaprSpringMessagingIT.java b/sdk-tests/src/test/java/io/dapr/it/spring/messaging/DaprSpringMessagingIT.java index a7ae667ddf..106519f8d2 100644 --- a/sdk-tests/src/test/java/io/dapr/it/spring/messaging/DaprSpringMessagingIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/spring/messaging/DaprSpringMessagingIT.java @@ -37,7 +37,7 @@ import java.util.Collections; import java.util.List; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_IMAGE_TAG; +import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest( @@ -61,7 +61,7 @@ public class DaprSpringMessagingIT { @Container @ServiceConnection - private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_IMAGE_TAG) + private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("messaging-dapr-app") .withNetwork(DAPR_NETWORK) .withComponent(new Component("pubsub", "pubsub.in-memory", "v1", Collections.emptyMap())) diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java index 69eefd9624..e503486f0e 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java @@ -37,6 +37,7 @@ import java.util.Random; import java.util.UUID; +import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.junit.jupiter.api.Assertions.assertEquals; @SpringBootTest( @@ -56,7 +57,7 @@ public class DaprActorsIT { private static final String ACTORS_MESSAGE_PATTERN = ".*Actor API level in the cluster has been updated to 10.*"; @Container - private static final DaprContainer DAPR_CONTAINER = new DaprContainer("daprio/daprd:1.14.4") + private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("actor-dapr-app") .withNetwork(DAPR_NETWORK) .withComponent(new Component("kvstore", "state.in-memory", "v1", diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerIT.java index bd94ddd114..54c3a3f625 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerIT.java @@ -49,7 +49,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; import static com.github.tomakehurst.wiremock.client.WireMock.verify; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_IMAGE_TAG; +import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; @@ -69,7 +69,7 @@ public class DaprContainerIT { private static final String APP_FOUND_MESSAGE_PATTERN = ".*application discovered on port 8081.*"; @Container - private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_IMAGE_TAG) + private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("dapr-app") .withAppPort(8081) .withAppHealthCheckPath("/actuator/health") diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprPlacementContainerIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprPlacementContainerIT.java index d7069a3f14..48648b6a10 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprPlacementContainerIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprPlacementContainerIT.java @@ -20,6 +20,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; import static org.junit.jupiter.api.Assertions.assertEquals; +import static io.dapr.it.testcontainers.ContainerConstants.DAPR_PLACEMENT_IMAGE_TAG; @Testcontainers @Tag("testcontainers") diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java index 576d85508d..ca8678e2d7 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java @@ -39,7 +39,7 @@ import java.util.Collections; import java.util.Map; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_IMAGE_TAG; +import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -57,7 +57,7 @@ public class DaprWorkflowsIT { private static final Network DAPR_NETWORK = Network.newNetwork(); @Container - private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_IMAGE_TAG) + private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("workflow-dapr-app") .withNetwork(DAPR_NETWORK) .withComponent(new Component("kvstore", "state.in-memory", "v1", diff --git a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java index 8959d91439..05024bb39f 100644 --- a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java +++ b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java @@ -46,7 +46,9 @@ public class DaprContainer extends GenericContainer { private static final int DAPRD_DEFAULT_HTTP_PORT = 3500; private static final int DAPRD_DEFAULT_GRPC_PORT = 50001; private static final DaprProtocol DAPR_PROTOCOL = DaprProtocol.HTTP; - private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("daprio/daprd"); + private static final String DAPR_VERSION = "1.15.3"; + private static final DockerImageName DEFAULT_IMAGE_NAME = + DockerImageName.parse("daprio/daprd:" + DAPR_VERSION); private static final Yaml YAML_MAPPER = YamlMapperFactory.create(); private static final YamlConverter COMPONENT_CONVERTER = new ComponentYamlConverter(YAML_MAPPER); private static final YamlConverter SUBSCRIPTION_CONVERTER = new SubscriptionYamlConverter(YAML_MAPPER); @@ -60,12 +62,12 @@ public class DaprContainer extends GenericContainer { private final Set components = new HashSet<>(); private final Set subscriptions = new HashSet<>(); private final Set httpEndpoints = new HashSet<>(); - private DaprLogLevel daprLogLevel = DaprLogLevel.INFO; - private String appChannelAddress = "localhost"; - private String placementService = "placement"; - private String schedulerService = "scheduler"; - private String placementDockerImageName = "daprio/placement"; - private String schedulerDockerImageName = "daprio/scheduler"; + private final DaprLogLevel daprLogLevel = DaprLogLevel.INFO; + private final String appChannelAddress = "localhost"; + private final String placementService = "placement"; + private final String schedulerService = "scheduler"; + private final String placementDockerImageName = "daprio/placement"; + private final String schedulerDockerImageName = "daprio/scheduler"; private Configuration configuration; private DaprPlacementContainer placementContainer; From d2910a86eae615d1ee91140299023430b101eb2b Mon Sep 17 00:00:00 2001 From: siri-varma Date: Tue, 8 Apr 2025 15:54:51 +0530 Subject: [PATCH 02/11] Fix thigns Signed-off-by: siri-varma --- daprdocs/content/en/java-sdk-docs/spring-boot/_index.md | 4 ++-- .../examples/consumer/DaprTestContainersConfig.java | 2 +- spring-boot-examples/kubernetes/README.md | 2 +- .../examples/producer/DaprTestContainersConfig.java | 2 +- .../java/io/dapr/testcontainers/ContainerConstants.java | 8 ++++++++ .../main/java/io/dapr/testcontainers/DaprContainer.java | 8 +++++--- .../java/io/dapr/testcontainers/DaprComponentTest.java | 5 +++-- .../converter/ComponentYamlConverterTest.java | 5 +++-- .../converter/ConfigurationYamlConverterTest.java | 3 ++- .../converter/HttpEndpointYamlConverterTest.java | 3 ++- .../converter/SubscriptionYamlConverterTest.java | 3 ++- 11 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 testcontainers-dapr/src/main/java/io/dapr/testcontainers/ContainerConstants.java diff --git a/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md b/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md index e515e2b39c..5edeee5820 100644 --- a/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md +++ b/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md @@ -80,7 +80,7 @@ public class DaprTestContainersConfig { @ServiceConnection public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer postgreSQLContainer){ - return new DaprContainer("daprio/daprd:1.14.1") + return new DaprContainer("daprio/daprd:1.15.3") .withAppName("producer-app") .withNetwork(daprNetwork) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) @@ -235,7 +235,7 @@ Finally, because Dapr PubSub requires a bidirectional connection between your ap @ServiceConnection public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer postgreSQLContainer, RabbitMQContainer rabbitMQContainer){ - return new DaprContainer("daprio/daprd:1.14.1") + return new DaprContainer("daprio/daprd:1.15.3") .withAppName("producer-app") .withNetwork(daprNetwork) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) diff --git a/spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/DaprTestContainersConfig.java b/spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/DaprTestContainersConfig.java index dc584b26b9..ab0c4949c8 100644 --- a/spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/DaprTestContainersConfig.java +++ b/spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/DaprTestContainersConfig.java @@ -87,7 +87,7 @@ public DaprContainer daprContainer(Network daprNetwork, RabbitMQContainer rabbit rabbitMqProperties.put("user", "guest"); rabbitMqProperties.put("password", "guest"); - return new DaprContainer("daprio/daprd:1.14.4") + return new DaprContainer("daprio/daprd:1.15.3") .withAppName("consumer-app") .withNetwork(daprNetwork).withComponent(new Component("pubsub", "pubsub.rabbitmq", "v1", rabbitMqProperties)) diff --git a/spring-boot-examples/kubernetes/README.md b/spring-boot-examples/kubernetes/README.md index 3bb5da421e..03eae2db37 100644 --- a/spring-boot-examples/kubernetes/README.md +++ b/spring-boot-examples/kubernetes/README.md @@ -30,7 +30,7 @@ Once you have the cluster up and running you can install Dapr: helm repo add dapr https://dapr.github.io/helm-charts/ helm repo update helm upgrade --install dapr dapr/dapr \ ---version=1.14.4 \ +--version=1.15.3 \ --namespace dapr-system \ --create-namespace \ --wait diff --git a/spring-boot-examples/producer-app/src/test/java/io/dapr/springboot/examples/producer/DaprTestContainersConfig.java b/spring-boot-examples/producer-app/src/test/java/io/dapr/springboot/examples/producer/DaprTestContainersConfig.java index 5d38f5841e..79a818a090 100644 --- a/spring-boot-examples/producer-app/src/test/java/io/dapr/springboot/examples/producer/DaprTestContainersConfig.java +++ b/spring-boot-examples/producer-app/src/test/java/io/dapr/springboot/examples/producer/DaprTestContainersConfig.java @@ -110,7 +110,7 @@ public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer p rabbitMqProperties.put("user", "guest"); rabbitMqProperties.put("password", "guest"); - return new DaprContainer("daprio/daprd:1.14.4") + return new DaprContainer("daprio/daprd:1.15.3") .withAppName("producer-app") .withNetwork(daprNetwork) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) diff --git a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/ContainerConstants.java b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/ContainerConstants.java new file mode 100644 index 0000000000..c1595499f3 --- /dev/null +++ b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/ContainerConstants.java @@ -0,0 +1,8 @@ +package io.dapr.testcontainers; + +public interface ContainerConstants { + String DAPR_VERSION = "1.15.3"; + String DAPR_PLACEMENT_IMAGE_TAG = "daprio/placement:" + DAPR_VERSION; + String DAPR_RUNTIME_IMAGE_TAG = "daprio/daprd:" + DAPR_VERSION; + String TOXIPROXY_IMAGE_TAG = "ghcr.io/shopify/toxiproxy:2.5.0"; +} diff --git a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java index 05024bb39f..944bbd8f64 100644 --- a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java +++ b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java @@ -41,14 +41,16 @@ import java.util.Map; import java.util.Set; +import static io.dapr.testcontainers.ContainerConstants.DAPR_PLACEMENT_IMAGE_TAG; +import static io.dapr.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; + public class DaprContainer extends GenericContainer { private static final Logger LOGGER = LoggerFactory.getLogger(DaprContainer.class); private static final int DAPRD_DEFAULT_HTTP_PORT = 3500; private static final int DAPRD_DEFAULT_GRPC_PORT = 50001; private static final DaprProtocol DAPR_PROTOCOL = DaprProtocol.HTTP; - private static final String DAPR_VERSION = "1.15.3"; private static final DockerImageName DEFAULT_IMAGE_NAME = - DockerImageName.parse("daprio/daprd:" + DAPR_VERSION); + DockerImageName.parse(DAPR_RUNTIME_IMAGE_TAG); private static final Yaml YAML_MAPPER = YamlMapperFactory.create(); private static final YamlConverter COMPONENT_CONVERTER = new ComponentYamlConverter(YAML_MAPPER); private static final YamlConverter SUBSCRIPTION_CONVERTER = new SubscriptionYamlConverter(YAML_MAPPER); @@ -66,7 +68,7 @@ public class DaprContainer extends GenericContainer { private final String appChannelAddress = "localhost"; private final String placementService = "placement"; private final String schedulerService = "scheduler"; - private final String placementDockerImageName = "daprio/placement"; + private final String placementDockerImageName = DAPR_PLACEMENT_IMAGE_TAG; private final String schedulerDockerImageName = "daprio/scheduler"; private Configuration configuration; diff --git a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java index b0d3387228..37446a6545 100644 --- a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java +++ b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java @@ -26,6 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; +import static io.dapr.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; public class DaprComponentTest { private final Yaml MAPPER = YamlMapperFactory.create(); @@ -33,7 +34,7 @@ public class DaprComponentTest { @Test public void containerConfigurationTest() { - DaprContainer dapr = new DaprContainer("daprio/daprd") + DaprContainer dapr = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("dapr-app") .withAppPort(8081) .withDaprLogLevel(DaprLogLevel.DEBUG) @@ -50,7 +51,7 @@ public void withComponentFromPath() { URL stateStoreYaml = this.getClass().getClassLoader().getResource("dapr-resources/statestore.yaml"); Path path = Paths.get(stateStoreYaml.getPath()); - DaprContainer dapr = new DaprContainer("daprio/daprd") + DaprContainer dapr = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("dapr-app") .withAppPort(8081) .withComponent(path) diff --git a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ComponentYamlConverterTest.java b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ComponentYamlConverterTest.java index eced458096..e23991c814 100644 --- a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ComponentYamlConverterTest.java +++ b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ComponentYamlConverterTest.java @@ -8,6 +8,7 @@ import java.util.Map; import java.util.Set; +import static io.dapr.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -17,7 +18,7 @@ class ComponentYamlConverterTest { @Test public void testComponentToYaml() { - DaprContainer dapr = new DaprContainer("daprio/daprd") + DaprContainer dapr = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("dapr-app") .withAppPort(8081) .withComponent(new Component( @@ -50,7 +51,7 @@ public void testComponentToYaml() { @Test public void testComponentWithInLineStringToYaml() { - DaprContainer dapr = new DaprContainer("daprio/daprd") + DaprContainer dapr = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("dapr-app") .withAppPort(8081) .withComponent(new Component( diff --git a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ConfigurationYamlConverterTest.java b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ConfigurationYamlConverterTest.java index 01b8968d56..7cf2249b33 100644 --- a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ConfigurationYamlConverterTest.java +++ b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ConfigurationYamlConverterTest.java @@ -22,6 +22,7 @@ import org.junit.jupiter.api.Test; import org.yaml.snakeyaml.Yaml; +import static io.dapr.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -52,7 +53,7 @@ public void testConfigurationToYaml() { AppHttpPipeline appHttpPipeline = new AppHttpPipeline(handlers); - DaprContainer dapr = new DaprContainer("daprio/daprd") + DaprContainer dapr = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("dapr-app") .withAppPort(8081) .withConfiguration(new Configuration("my-config", tracing, appHttpPipeline)) diff --git a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/HttpEndpointYamlConverterTest.java b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/HttpEndpointYamlConverterTest.java index ec2540fe92..9d46893b7c 100644 --- a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/HttpEndpointYamlConverterTest.java +++ b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/HttpEndpointYamlConverterTest.java @@ -7,6 +7,7 @@ import java.util.Set; +import static io.dapr.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.junit.jupiter.api.Assertions.assertEquals; class HttpEndpointYamlConverterTest { @@ -16,7 +17,7 @@ class HttpEndpointYamlConverterTest { @Test void testHttpEndpointToYaml() { - DaprContainer dapr = new DaprContainer("daprio/daprd") + DaprContainer dapr = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("dapr-app") .withAppPort(8081) .withHttpEndpoint(new HttpEndpoint("my-endpoint", "http://localhost:8080")) diff --git a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/SubscriptionYamlConverterTest.java b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/SubscriptionYamlConverterTest.java index a17984e603..b6a5143721 100644 --- a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/SubscriptionYamlConverterTest.java +++ b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/SubscriptionYamlConverterTest.java @@ -7,6 +7,7 @@ import java.util.Set; +import static io.dapr.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.junit.jupiter.api.Assertions.*; class SubscriptionYamlConverterTest { @@ -15,7 +16,7 @@ class SubscriptionYamlConverterTest { @Test public void testSubscriptionToYaml() { - DaprContainer dapr = new DaprContainer("daprio/daprd") + DaprContainer dapr = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("dapr-app") .withAppPort(8081) .withSubscription(new Subscription("my-subscription", "pubsub", "topic", "/events")) From c309b2d42ca50e98da8aab9bde0ba9a328e68d44 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Tue, 8 Apr 2025 16:11:48 +0530 Subject: [PATCH 03/11] Fix thigns Signed-off-by: siri-varma --- .../springboot/examples/consumer/DaprTestContainersConfig.java | 2 +- .../springboot/examples/producer/DaprTestContainersConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/DaprTestContainersConfig.java b/spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/DaprTestContainersConfig.java index ab0c4949c8..dc584b26b9 100644 --- a/spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/DaprTestContainersConfig.java +++ b/spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/DaprTestContainersConfig.java @@ -87,7 +87,7 @@ public DaprContainer daprContainer(Network daprNetwork, RabbitMQContainer rabbit rabbitMqProperties.put("user", "guest"); rabbitMqProperties.put("password", "guest"); - return new DaprContainer("daprio/daprd:1.15.3") + return new DaprContainer("daprio/daprd:1.14.4") .withAppName("consumer-app") .withNetwork(daprNetwork).withComponent(new Component("pubsub", "pubsub.rabbitmq", "v1", rabbitMqProperties)) diff --git a/spring-boot-examples/producer-app/src/test/java/io/dapr/springboot/examples/producer/DaprTestContainersConfig.java b/spring-boot-examples/producer-app/src/test/java/io/dapr/springboot/examples/producer/DaprTestContainersConfig.java index 79a818a090..5d38f5841e 100644 --- a/spring-boot-examples/producer-app/src/test/java/io/dapr/springboot/examples/producer/DaprTestContainersConfig.java +++ b/spring-boot-examples/producer-app/src/test/java/io/dapr/springboot/examples/producer/DaprTestContainersConfig.java @@ -110,7 +110,7 @@ public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer p rabbitMqProperties.put("user", "guest"); rabbitMqProperties.put("password", "guest"); - return new DaprContainer("daprio/daprd:1.15.3") + return new DaprContainer("daprio/daprd:1.14.4") .withAppName("producer-app") .withNetwork(daprNetwork) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) From bbb5d1ba162e661eef6c2058a08878dd91f56d95 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Tue, 8 Apr 2025 16:31:22 +0530 Subject: [PATCH 04/11] Fix thigns Signed-off-by: siri-varma --- .../src/main/java/io/dapr/testcontainers/DaprContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java index 944bbd8f64..abdc8beeda 100644 --- a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java +++ b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java @@ -50,7 +50,7 @@ public class DaprContainer extends GenericContainer { private static final int DAPRD_DEFAULT_GRPC_PORT = 50001; private static final DaprProtocol DAPR_PROTOCOL = DaprProtocol.HTTP; private static final DockerImageName DEFAULT_IMAGE_NAME = - DockerImageName.parse(DAPR_RUNTIME_IMAGE_TAG); + DockerImageName.parse("daprio/daprd"); private static final Yaml YAML_MAPPER = YamlMapperFactory.create(); private static final YamlConverter COMPONENT_CONVERTER = new ComponentYamlConverter(YAML_MAPPER); private static final YamlConverter SUBSCRIPTION_CONVERTER = new SubscriptionYamlConverter(YAML_MAPPER); From 12f1150a0e749b9570384995fcd4f8e8f1f01352 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Thu, 17 Apr 2025 12:31:07 +0530 Subject: [PATCH 05/11] Address comments Signed-off-by: siri-varma --- pom.xml | 2 +- .../io/dapr/springboot/MockController.java | 4 ++- .../dapr/it/resiliency/SdkResiliencyIT.java | 5 ++- .../spring/data/DaprKeyValueRepositoryIT.java | 6 ++-- .../data/MySQLDaprKeyValueTemplateIT.java | 2 +- .../PostgreSQLDaprKeyValueTemplateIT.java | 8 +++-- .../messaging/DaprSpringMessagingIT.java | 2 +- .../it/testcontainers/ContainerConstants.java | 9 ----- .../dapr/it/testcontainers/DaprActorsIT.java | 2 +- .../DaprContainerConstants.java | 8 +++++ .../it/testcontainers/DaprContainerIT.java | 5 ++- .../io/dapr/it/testcontainers/DaprJobsIT.java | 3 +- .../DaprPlacementContainerIT.java | 3 +- .../DaprSchedulerContainerIT.java | 36 +++++++++++++++++++ .../it/testcontainers/DaprWorkflowsIT.java | 2 +- .../consumer/DaprTestContainersConfig.java | 4 ++- .../producer/DaprTestContainersConfig.java | 4 ++- .../io/dapr/testcontainers/DaprContainer.java | 30 ++++++++++------ ...tants.java => DaprContainerConstants.java} | 6 ++-- .../testcontainers/DaprComponentTest.java | 2 +- .../converter/ComponentYamlConverterTest.java | 2 +- .../ConfigurationYamlConverterTest.java | 2 +- .../HttpEndpointYamlConverterTest.java | 2 +- .../SubscriptionYamlConverterTest.java | 4 +-- 24 files changed, 103 insertions(+), 50 deletions(-) delete mode 100644 sdk-tests/src/test/java/io/dapr/it/testcontainers/ContainerConstants.java create mode 100644 sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerConstants.java create mode 100644 sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java rename testcontainers-dapr/src/main/java/io/dapr/testcontainers/{ContainerConstants.java => DaprContainerConstants.java} (53%) diff --git a/pom.xml b/pom.xml index 2be2a6ab2b..51f5070027 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.69.0 3.25.5 protoc - https://raw.githubusercontent.com/dapr/dapr/v1.15.3/dapr/proto + https://raw.githubusercontent.com/dapr/dapr/v1.15.4/dapr/proto 1.15.0-SNAPSHOT 0.15.0-SNAPSHOT 1.7.1 diff --git a/sdk-springboot/src/test/java/io/dapr/springboot/MockController.java b/sdk-springboot/src/test/java/io/dapr/springboot/MockController.java index e4251e120d..943431d760 100644 --- a/sdk-springboot/src/test/java/io/dapr/springboot/MockController.java +++ b/sdk-springboot/src/test/java/io/dapr/springboot/MockController.java @@ -13,7 +13,9 @@ package io.dapr.springboot; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; @RequestMapping(value = {"v1", "v2"}) public class MockController { diff --git a/sdk-tests/src/test/java/io/dapr/it/resiliency/SdkResiliencyIT.java b/sdk-tests/src/test/java/io/dapr/it/resiliency/SdkResiliencyIT.java index 4c19c8331c..b0591e4eec 100644 --- a/sdk-tests/src/test/java/io/dapr/it/resiliency/SdkResiliencyIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/resiliency/SdkResiliencyIT.java @@ -58,8 +58,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; import static com.github.tomakehurst.wiremock.client.WireMock.verify; import static io.dapr.it.resiliency.SdkResiliencyIT.WIREMOCK_PORT; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; -import static io.dapr.it.testcontainers.ContainerConstants.TOXIPROXY_IMAGE_TAG; +import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -85,7 +84,7 @@ public class SdkResiliencyIT { .withNetwork(NETWORK); @Container - private static final ToxiproxyContainer TOXIPROXY = new ToxiproxyContainer(TOXIPROXY_IMAGE_TAG) + private static final ToxiproxyContainer TOXIPROXY = new ToxiproxyContainer("ghcr.io/shopify/toxiproxy:2.5.0") .withNetwork(NETWORK); private static Proxy proxy; diff --git a/sdk-tests/src/test/java/io/dapr/it/spring/data/DaprKeyValueRepositoryIT.java b/sdk-tests/src/test/java/io/dapr/it/spring/data/DaprKeyValueRepositoryIT.java index 57b6e40ac3..0d541fff99 100644 --- a/sdk-tests/src/test/java/io/dapr/it/spring/data/DaprKeyValueRepositoryIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/spring/data/DaprKeyValueRepositoryIT.java @@ -35,8 +35,10 @@ import static io.dapr.it.spring.data.DaprSpringDataConstants.BINDING_NAME; import static io.dapr.it.spring.data.DaprSpringDataConstants.STATE_STORE_NAME; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; -import static org.junit.jupiter.api.Assertions.*; +import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Integration tests for {@link DaprKeyValueRepositoryIT}. diff --git a/sdk-tests/src/test/java/io/dapr/it/spring/data/MySQLDaprKeyValueTemplateIT.java b/sdk-tests/src/test/java/io/dapr/it/spring/data/MySQLDaprKeyValueTemplateIT.java index 1e1d959eef..f07ab1002c 100644 --- a/sdk-tests/src/test/java/io/dapr/it/spring/data/MySQLDaprKeyValueTemplateIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/spring/data/MySQLDaprKeyValueTemplateIT.java @@ -44,7 +44,7 @@ import static io.dapr.it.spring.data.DaprSpringDataConstants.STATE_STORE_NAME; import static io.dapr.it.spring.data.DaprSpringDataConstants.BINDING_NAME; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; +import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/sdk-tests/src/test/java/io/dapr/it/spring/data/PostgreSQLDaprKeyValueTemplateIT.java b/sdk-tests/src/test/java/io/dapr/it/spring/data/PostgreSQLDaprKeyValueTemplateIT.java index bac4d94516..956343985c 100644 --- a/sdk-tests/src/test/java/io/dapr/it/spring/data/PostgreSQLDaprKeyValueTemplateIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/spring/data/PostgreSQLDaprKeyValueTemplateIT.java @@ -32,11 +32,15 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; import static io.dapr.it.spring.data.DaprSpringDataConstants.BINDING_NAME; import static io.dapr.it.spring.data.DaprSpringDataConstants.STATE_STORE_NAME; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; +import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/sdk-tests/src/test/java/io/dapr/it/spring/messaging/DaprSpringMessagingIT.java b/sdk-tests/src/test/java/io/dapr/it/spring/messaging/DaprSpringMessagingIT.java index 106519f8d2..ba0366d407 100644 --- a/sdk-tests/src/test/java/io/dapr/it/spring/messaging/DaprSpringMessagingIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/spring/messaging/DaprSpringMessagingIT.java @@ -37,7 +37,7 @@ import java.util.Collections; import java.util.List; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; +import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest( diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/ContainerConstants.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/ContainerConstants.java deleted file mode 100644 index 76cadb815d..0000000000 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/ContainerConstants.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.dapr.it.testcontainers; - -public interface ContainerConstants { - String TOXIPROXY_IMAGE_TAG = "ghcr.io/shopify/toxiproxy:2.5.0"; - String DAPR_RUNTIME_VERSION = "1.15.3"; - String DAPR_IMAGE_TAG = "daprio/daprd:" + DAPR_RUNTIME_VERSION; - String DAPR_PLACEMENT_IMAGE_TAG = "daprio/placement:" + DAPR_RUNTIME_VERSION; - String DAPR_SCHEDULER_IMAGE_TAG = "daprio/scheduler:" + DAPR_RUNTIME_VERSION; -} diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java index e503486f0e..28471c1c78 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java @@ -37,7 +37,7 @@ import java.util.Random; import java.util.UUID; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; +import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.junit.jupiter.api.Assertions.assertEquals; @SpringBootTest( diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerConstants.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerConstants.java new file mode 100644 index 0000000000..9e47ebdbb5 --- /dev/null +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerConstants.java @@ -0,0 +1,8 @@ +package io.dapr.it.testcontainers; + +public interface DaprContainerConstants { + String DAPR_RUNTIME_VERSION = "1.15.4"; + String DAPR_RUNTIME_IMAGE_TAG = "daprio/daprd:" + DAPR_RUNTIME_VERSION; + String DAPR_PLACEMENT_IMAGE_TAG = "daprio/placement:" + DAPR_RUNTIME_VERSION; + String DAPR_SCHEDULER_IMAGE_TAG = "daprio/scheduler:" + DAPR_RUNTIME_VERSION; +} diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerIT.java index 54c3a3f625..55096d5998 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerIT.java @@ -18,7 +18,6 @@ import io.dapr.client.DaprClientBuilder; import io.dapr.client.domain.Metadata; import io.dapr.client.domain.State; - import io.dapr.config.Properties; import io.dapr.testcontainers.DaprContainer; import org.junit.jupiter.api.BeforeEach; @@ -27,7 +26,6 @@ import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; -import static org.testcontainers.shaded.org.awaitility.Awaitility.await; import org.testcontainers.shaded.org.awaitility.core.ConditionTimeoutException; import java.io.IOException; @@ -49,10 +47,11 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; import static com.github.tomakehurst.wiremock.client.WireMock.verify; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; +import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.fail; +import static org.testcontainers.shaded.org.awaitility.Awaitility.await; @Testcontainers diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprJobsIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprJobsIT.java index 78e2ec7ecf..b9bf55d718 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprJobsIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprJobsIT.java @@ -34,7 +34,6 @@ import org.testcontainers.junit.jupiter.Testcontainers; import java.time.Instant; -import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; @@ -58,7 +57,7 @@ public class DaprJobsIT { private static final int PORT = RANDOM.nextInt(1000) + 8000; @Container - private static final DaprContainer DAPR_CONTAINER = new DaprContainer(ContainerConstants.DAPR_IMAGE_TAG) + private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG) .withAppName("jobs-dapr-app") .withNetwork(DAPR_NETWORK) .withDaprLogLevel(DaprLogLevel.DEBUG) diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprPlacementContainerIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprPlacementContainerIT.java index 48648b6a10..592a7afb0f 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprPlacementContainerIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprPlacementContainerIT.java @@ -20,7 +20,6 @@ import org.testcontainers.junit.jupiter.Testcontainers; import static org.junit.jupiter.api.Assertions.assertEquals; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_PLACEMENT_IMAGE_TAG; @Testcontainers @Tag("testcontainers") @@ -28,7 +27,7 @@ public class DaprPlacementContainerIT { @Container private static final DaprPlacementContainer PLACEMENT_CONTAINER = - new DaprPlacementContainer(ContainerConstants.DAPR_PLACEMENT_IMAGE_TAG); + new DaprPlacementContainer(DaprContainerConstants.DAPR_PLACEMENT_IMAGE_TAG); @Test public void testDaprPlacementContainerDefaults() { diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java new file mode 100644 index 0000000000..f2b2875f60 --- /dev/null +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java @@ -0,0 +1,36 @@ +/* + * Copyright 2024 The Dapr 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 + * http://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 io.dapr.it.testcontainers; + +import io.dapr.testcontainers.DaprPlacementContainer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +@Testcontainers +@Tag("testcontainers") +public class DaprSchedulerContainerIT { + + @Container + private static final DaprSchedulerContainer SCHEDULER_CONTAINER = + new DaprSchedulerContainer(DaprContainerConstants.DAPR_SCHEDULER_IMAGE_TAG); + + @Test + public void testDaprPlacementContainerDefaults() { + assertEquals(51005, SCHEDULER_CONTAINER.getPort(), "The default port is not set"); + } +} diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java index ca8678e2d7..a389081f39 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java @@ -39,7 +39,7 @@ import java.util.Collections; import java.util.Map; -import static io.dapr.it.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; +import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/DaprTestContainersConfig.java b/spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/DaprTestContainersConfig.java index dc584b26b9..9afafae26c 100644 --- a/spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/DaprTestContainersConfig.java +++ b/spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/DaprTestContainersConfig.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Map; +import static io.dapr.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; + @TestConfiguration(proxyBeanMethods = false) public class DaprTestContainersConfig { @@ -87,7 +89,7 @@ public DaprContainer daprContainer(Network daprNetwork, RabbitMQContainer rabbit rabbitMqProperties.put("user", "guest"); rabbitMqProperties.put("password", "guest"); - return new DaprContainer("daprio/daprd:1.14.4") + return new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("consumer-app") .withNetwork(daprNetwork).withComponent(new Component("pubsub", "pubsub.rabbitmq", "v1", rabbitMqProperties)) diff --git a/spring-boot-examples/producer-app/src/test/java/io/dapr/springboot/examples/producer/DaprTestContainersConfig.java b/spring-boot-examples/producer-app/src/test/java/io/dapr/springboot/examples/producer/DaprTestContainersConfig.java index 5d38f5841e..95603a36f1 100644 --- a/spring-boot-examples/producer-app/src/test/java/io/dapr/springboot/examples/producer/DaprTestContainersConfig.java +++ b/spring-boot-examples/producer-app/src/test/java/io/dapr/springboot/examples/producer/DaprTestContainersConfig.java @@ -33,6 +33,8 @@ import java.util.List; import java.util.Map; +import static io.dapr.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; + @TestConfiguration(proxyBeanMethods = false) public class DaprTestContainersConfig { @@ -110,7 +112,7 @@ public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer p rabbitMqProperties.put("user", "guest"); rabbitMqProperties.put("password", "guest"); - return new DaprContainer("daprio/daprd:1.14.4") + return new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("producer-app") .withNetwork(daprNetwork) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) diff --git a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java index abdc8beeda..dd008ed33f 100644 --- a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java +++ b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java @@ -27,7 +27,6 @@ import org.testcontainers.containers.wait.strategy.WaitStrategy; import org.testcontainers.images.builder.Transferable; import org.testcontainers.utility.DockerImageName; -import org.testcontainers.utility.MountableFile; import org.yaml.snakeyaml.Yaml; import java.io.IOException; @@ -41,8 +40,9 @@ import java.util.Map; import java.util.Set; -import static io.dapr.testcontainers.ContainerConstants.DAPR_PLACEMENT_IMAGE_TAG; -import static io.dapr.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; +import static io.dapr.testcontainers.DaprContainerConstants.DAPR_PLACEMENT_IMAGE_TAG; +import static io.dapr.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; +import static io.dapr.testcontainers.DaprContainerConstants.DAPR_SCHEDULER_IMAGE_TAG; public class DaprContainer extends GenericContainer { private static final Logger LOGGER = LoggerFactory.getLogger(DaprContainer.class); @@ -50,7 +50,7 @@ public class DaprContainer extends GenericContainer { private static final int DAPRD_DEFAULT_GRPC_PORT = 50001; private static final DaprProtocol DAPR_PROTOCOL = DaprProtocol.HTTP; private static final DockerImageName DEFAULT_IMAGE_NAME = - DockerImageName.parse("daprio/daprd"); + DockerImageName.parse(DAPR_RUNTIME_IMAGE_TAG); private static final Yaml YAML_MAPPER = YamlMapperFactory.create(); private static final YamlConverter COMPONENT_CONVERTER = new ComponentYamlConverter(YAML_MAPPER); private static final YamlConverter SUBSCRIPTION_CONVERTER = new SubscriptionYamlConverter(YAML_MAPPER); @@ -64,12 +64,12 @@ public class DaprContainer extends GenericContainer { private final Set components = new HashSet<>(); private final Set subscriptions = new HashSet<>(); private final Set httpEndpoints = new HashSet<>(); - private final DaprLogLevel daprLogLevel = DaprLogLevel.INFO; - private final String appChannelAddress = "localhost"; - private final String placementService = "placement"; - private final String schedulerService = "scheduler"; - private final String placementDockerImageName = DAPR_PLACEMENT_IMAGE_TAG; - private final String schedulerDockerImageName = "daprio/scheduler"; + private DaprLogLevel daprLogLevel = DaprLogLevel.INFO; + private String appChannelAddress = "localhost"; + private String placementService = "placement"; + private String schedulerService = "scheduler"; + private String placementDockerImageName = DAPR_PLACEMENT_IMAGE_TAG; + private String schedulerDockerImageName = DAPR_SCHEDULER_IMAGE_TAG; private Configuration configuration; private DaprPlacementContainer placementContainer; @@ -141,6 +141,11 @@ public DaprContainer withPlacementService(String placementService) { return this; } + public DaprContainer withSchedulerService(String schedulerService) { + this.schedulerService = schedulerService; + return this; + } + public DaprContainer withAppName(String appName) { this.appName = appName; return this; @@ -166,6 +171,11 @@ public DaprContainer withPlacementImage(String placementDockerImageName) { return this; } + public DaprContainer withSchedulerImage(String schedulerDockerImageName) { + this.schedulerDockerImageName = schedulerDockerImageName; + return this; + } + public DaprContainer withReusablePlacement(boolean shouldReusePlacement) { this.shouldReusePlacement = shouldReusePlacement; return this; diff --git a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/ContainerConstants.java b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java similarity index 53% rename from testcontainers-dapr/src/main/java/io/dapr/testcontainers/ContainerConstants.java rename to testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java index c1595499f3..4ec620bba9 100644 --- a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/ContainerConstants.java +++ b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java @@ -1,8 +1,8 @@ package io.dapr.testcontainers; -public interface ContainerConstants { - String DAPR_VERSION = "1.15.3"; +public interface DaprContainerConstants { + String DAPR_VERSION = "1.15.4"; String DAPR_PLACEMENT_IMAGE_TAG = "daprio/placement:" + DAPR_VERSION; + String DAPR_SCHEDULER_IMAGE_TAG = "daprio/scheduler:" + DAPR_VERSION; String DAPR_RUNTIME_IMAGE_TAG = "daprio/daprd:" + DAPR_VERSION; - String TOXIPROXY_IMAGE_TAG = "ghcr.io/shopify/toxiproxy:2.5.0"; } diff --git a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java index 37446a6545..d02a6c1cd7 100644 --- a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java +++ b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.java @@ -26,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; -import static io.dapr.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; +import static io.dapr.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; public class DaprComponentTest { private final Yaml MAPPER = YamlMapperFactory.create(); diff --git a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ComponentYamlConverterTest.java b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ComponentYamlConverterTest.java index e23991c814..405b9f3436 100644 --- a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ComponentYamlConverterTest.java +++ b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ComponentYamlConverterTest.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Set; -import static io.dapr.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; +import static io.dapr.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ConfigurationYamlConverterTest.java b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ConfigurationYamlConverterTest.java index 7cf2249b33..fe798611b5 100644 --- a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ConfigurationYamlConverterTest.java +++ b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ConfigurationYamlConverterTest.java @@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test; import org.yaml.snakeyaml.Yaml; -import static io.dapr.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; +import static io.dapr.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/HttpEndpointYamlConverterTest.java b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/HttpEndpointYamlConverterTest.java index 9d46893b7c..e83aed3f3c 100644 --- a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/HttpEndpointYamlConverterTest.java +++ b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/HttpEndpointYamlConverterTest.java @@ -7,7 +7,7 @@ import java.util.Set; -import static io.dapr.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; +import static io.dapr.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static org.junit.jupiter.api.Assertions.assertEquals; class HttpEndpointYamlConverterTest { diff --git a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/SubscriptionYamlConverterTest.java b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/SubscriptionYamlConverterTest.java index b6a5143721..2df4c6998d 100644 --- a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/SubscriptionYamlConverterTest.java +++ b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/SubscriptionYamlConverterTest.java @@ -7,8 +7,8 @@ import java.util.Set; -import static io.dapr.testcontainers.ContainerConstants.DAPR_RUNTIME_IMAGE_TAG; -import static org.junit.jupiter.api.Assertions.*; +import static io.dapr.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; +import static org.junit.jupiter.api.Assertions.assertEquals; class SubscriptionYamlConverterTest { private final Yaml MAPPER = YamlMapperFactory.create(); From 0b3d0ba79801d9780e07f55fd74d3493bb0ee9a9 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Thu, 17 Apr 2025 12:33:49 +0530 Subject: [PATCH 06/11] Address comments Signed-off-by: siri-varma --- .github/workflows/build.yml | 2 +- .github/workflows/validate.yml | 2 +- daprdocs/content/en/java-sdk-docs/spring-boot/_index.md | 4 ++-- spring-boot-examples/kubernetes/README.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 021e6f5f19..ba2f0c2a39 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: GOPROXY: https://proxy.golang.org JDK_VER: ${{ matrix.java }} DAPR_CLI_VER: 1.15.0 - DAPR_RUNTIME_VER: 1.15.3 + DAPR_RUNTIME_VER: 1.15.4 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh DAPR_CLI_REF: DAPR_REF: diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 1559f5aef4..7f09a2325a 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -38,7 +38,7 @@ jobs: GOPROXY: https://proxy.golang.org JDK_VER: ${{ matrix.java }} DAPR_CLI_VER: 1.15.0 - DAPR_RUNTIME_VER: 1.15.3 + DAPR_RUNTIME_VER: 1.15.4 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh DAPR_CLI_REF: DAPR_REF: diff --git a/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md b/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md index 5edeee5820..0fb159b442 100644 --- a/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md +++ b/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md @@ -80,7 +80,7 @@ public class DaprTestContainersConfig { @ServiceConnection public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer postgreSQLContainer){ - return new DaprContainer("daprio/daprd:1.15.3") + return new DaprContainer("daprio/daprd:1.15.4s") .withAppName("producer-app") .withNetwork(daprNetwork) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) @@ -235,7 +235,7 @@ Finally, because Dapr PubSub requires a bidirectional connection between your ap @ServiceConnection public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer postgreSQLContainer, RabbitMQContainer rabbitMQContainer){ - return new DaprContainer("daprio/daprd:1.15.3") + return new DaprContainer("daprio/daprd:1.15.4") .withAppName("producer-app") .withNetwork(daprNetwork) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) diff --git a/spring-boot-examples/kubernetes/README.md b/spring-boot-examples/kubernetes/README.md index 03eae2db37..9f047d76f3 100644 --- a/spring-boot-examples/kubernetes/README.md +++ b/spring-boot-examples/kubernetes/README.md @@ -30,7 +30,7 @@ Once you have the cluster up and running you can install Dapr: helm repo add dapr https://dapr.github.io/helm-charts/ helm repo update helm upgrade --install dapr dapr/dapr \ ---version=1.15.3 \ +--version=1.15.4 \ --namespace dapr-system \ --create-namespace \ --wait From ed0d97797a0f08e4193aed98b8c5e60e466217b6 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Thu, 17 Apr 2025 12:44:18 +0530 Subject: [PATCH 07/11] Address comments Signed-off-by: siri-varma --- .../io/dapr/it/testcontainers/DaprSchedulerContainerIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java index f2b2875f60..64d7f8769b 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java @@ -14,6 +14,7 @@ package io.dapr.it.testcontainers; import io.dapr.testcontainers.DaprPlacementContainer; +import io.dapr.testcontainers.DaprSchedulerContainer; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.testcontainers.junit.jupiter.Container; @@ -30,7 +31,7 @@ public class DaprSchedulerContainerIT { new DaprSchedulerContainer(DaprContainerConstants.DAPR_SCHEDULER_IMAGE_TAG); @Test - public void testDaprPlacementContainerDefaults() { + public void testDaprSchedulerContainerDefaults() { assertEquals(51005, SCHEDULER_CONTAINER.getPort(), "The default port is not set"); } } From 0064e9bad376b87775c7c4dcb4df22d075718529 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Thu, 17 Apr 2025 13:11:37 +0530 Subject: [PATCH 08/11] Address comments Signed-off-by: siri-varma --- daprdocs/content/en/java-sdk-docs/spring-boot/_index.md | 2 +- .../io/dapr/it/testcontainers/DaprSchedulerContainerIT.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md b/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md index 0fb159b442..4a53e21b2b 100644 --- a/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md +++ b/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md @@ -80,7 +80,7 @@ public class DaprTestContainersConfig { @ServiceConnection public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer postgreSQLContainer){ - return new DaprContainer("daprio/daprd:1.15.4s") + return new DaprContainer("daprio/daprd:1.15.4") .withAppName("producer-app") .withNetwork(daprNetwork) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java index 64d7f8769b..16a79730cc 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.java @@ -13,7 +13,6 @@ package io.dapr.it.testcontainers; -import io.dapr.testcontainers.DaprPlacementContainer; import io.dapr.testcontainers.DaprSchedulerContainer; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; From d61239ce518311fea92ee74edac27f079c441341 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Thu, 17 Apr 2025 13:25:51 +0530 Subject: [PATCH 09/11] Change message Signed-off-by: siri-varma --- .../src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java index 28471c1c78..b54adee998 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java @@ -54,7 +54,7 @@ public class DaprActorsIT { private static final Random RANDOM = new Random(); private static final int PORT = RANDOM.nextInt(1000) + 8000; - private static final String ACTORS_MESSAGE_PATTERN = ".*Actor API level in the cluster has been updated to 10.*"; + private static final String ACTORS_MESSAGE_PATTERN = ".*Actor runtime started.*"; @Container private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) From 47d3fb0b01ce9e97ff1cee300bfd9659863dbe08 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Thu, 17 Apr 2025 13:26:15 +0530 Subject: [PATCH 10/11] Change message Signed-off-by: siri-varma --- .../src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java index b54adee998..8878359391 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.java @@ -89,7 +89,8 @@ static void daprProperties(DynamicPropertyRegistry registry) { public void setUp(){ org.testcontainers.Testcontainers.exposeHostPorts(PORT); daprActorRuntime.registerActor(TestActorImpl.class); - // Ensure the subscriptions are registered + + // Wait for actor runtime to start. Wait.forLogMessage(ACTORS_MESSAGE_PATTERN, 1).waitUntilReady(DAPR_CONTAINER); } From 8449c535c6411173eb7b212ebf68c2c3e0f73f16 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Thu, 17 Apr 2025 14:43:10 +0530 Subject: [PATCH 11/11] Address comments Signed-off-by: siri-varma --- .../java/io/dapr/testcontainers/DaprSchedulerContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprSchedulerContainer.java b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprSchedulerContainer.java index bcac6a426e..96f530adc7 100644 --- a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprSchedulerContainer.java +++ b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprSchedulerContainer.java @@ -40,7 +40,7 @@ public DaprSchedulerContainer(DockerImageName dockerImageName) { } /** - * Creates a new Dapr scheduler container. + * Creates a new Dapr schedulers container. * @param image Docker image name. */ public DaprSchedulerContainer(String image) {