From 1307148498bc377b577efbf0aa270a2f5e6504f1 Mon Sep 17 00:00:00 2001 From: salaboy Date: Wed, 4 Sep 2024 15:23:01 +0100 Subject: [PATCH] adding @ServiceConnection to Dapr --- .../spring/data/DaprKeyValueRepositoryIT.java | 10 ++-------- .../data/MySQLDaprKeyValueTemplateIT.java | 9 ++------- .../data/PostgreSQLDaprKeyValueTemplateIT.java | 9 ++------- .../messaging/DaprSpringMessagingIT.java | 18 ++++++++---------- 4 files changed, 14 insertions(+), 32 deletions(-) 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 446b3b9ff..bc874e6ad 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 @@ -21,6 +21,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; @@ -65,6 +66,7 @@ public class DaprKeyValueRepositoryIT { .withNetwork(DAPR_NETWORK); @Container + @ServiceConnection private static final DaprContainer DAPR_CONTAINER = new DaprContainer("daprio/daprd:1.13.2") .withAppName("postgresql-repository-dapr-app") .withNetwork(DAPR_NETWORK) @@ -74,14 +76,6 @@ public class DaprKeyValueRepositoryIT { .withLogConsumer(outputFrame -> System.out.println(outputFrame.getUtf8String())) .dependsOn(POSTGRE_SQL_CONTAINER); - @DynamicPropertySource - static void daprProperties(DynamicPropertyRegistry registry) { - registry.add("dapr.http.endpoint", DAPR_CONTAINER::getHttpEndpoint); - registry.add("dapr.grpc.endpoint", DAPR_CONTAINER::getGrpcEndpoint); - registry.add("dapr.grpc.port", DAPR_CONTAINER::getGrpcPort); - registry.add("dapr.http.port", DAPR_CONTAINER::getHttpPort); - } - private static Map createStateStoreProperties() { Map result = new HashMap<>(); 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 6ac618cc4..728da00d9 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 @@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.data.keyvalue.core.query.KeyValueQuery; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.DynamicPropertyRegistry; @@ -80,6 +81,7 @@ public class MySQLDaprKeyValueTemplateIT { .waitingFor(MYSQL_WAIT_STRATEGY); @Container + @ServiceConnection private static final DaprContainer DAPR_CONTAINER = new DaprContainer("daprio/daprd:1.13.2") .withAppName("mysql-dapr-app") .withNetwork(DAPR_NETWORK) @@ -89,13 +91,6 @@ public class MySQLDaprKeyValueTemplateIT { .withLogConsumer(outputFrame -> System.out.println(outputFrame.getUtf8String())) .dependsOn(MY_SQL_CONTAINER); - @DynamicPropertySource - static void daprProperties(DynamicPropertyRegistry registry) { - registry.add("dapr.http.endpoint", DAPR_CONTAINER::getHttpEndpoint); - registry.add("dapr.grpc.endpoint", DAPR_CONTAINER::getGrpcEndpoint); - registry.add("dapr.grpc.port", DAPR_CONTAINER::getGrpcPort); - registry.add("dapr.http.port", DAPR_CONTAINER::getHttpPort); - } private static Map createStateStoreProperties() { Map result = new HashMap<>(); 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 84fa705c8..1d2ef4de8 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 @@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.data.keyvalue.core.query.KeyValueQuery; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.DynamicPropertyRegistry; @@ -66,6 +67,7 @@ public class PostgreSQLDaprKeyValueTemplateIT { .withNetwork(DAPR_NETWORK); @Container + @ServiceConnection private static final DaprContainer DAPR_CONTAINER = new DaprContainer("daprio/daprd:1.13.2") .withAppName("postgresql-dapr-app") .withNetwork(DAPR_NETWORK) @@ -75,13 +77,6 @@ public class PostgreSQLDaprKeyValueTemplateIT { .withLogConsumer(outputFrame -> System.out.println(outputFrame.getUtf8String())) .dependsOn(POSTGRE_SQL_CONTAINER); - @DynamicPropertySource - static void daprProperties(DynamicPropertyRegistry registry) { - registry.add("dapr.http.endpoint", DAPR_CONTAINER::getHttpEndpoint); - registry.add("dapr.grpc.endpoint", DAPR_CONTAINER::getGrpcEndpoint); - registry.add("dapr.grpc.port", DAPR_CONTAINER::getGrpcPort); - registry.add("dapr.http.port", DAPR_CONTAINER::getHttpPort); - } private static Map createStateStoreProperties() { Map result = new HashMap<>(); 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 94b00e8d9..1c238aa39 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 @@ -19,6 +19,7 @@ import io.dapr.testcontainers.Component; import io.dapr.testcontainers.DaprContainer; import io.dapr.testcontainers.DaprLogLevel; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -26,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; import org.testcontainers.containers.Network; @@ -56,6 +58,7 @@ public class DaprSpringMessagingIT { private static final Network DAPR_NETWORK = Network.newNetwork(); @Container + @ServiceConnection private static final DaprContainer DAPR_CONTAINER = new DaprContainer("daprio/daprd:1.13.2") .withAppName("messaging-dapr-app") .withNetwork(DAPR_NETWORK) @@ -65,22 +68,17 @@ public class DaprSpringMessagingIT { .withLogConsumer(outputFrame -> System.out.println(outputFrame.getUtf8String())) .withAppChannelAddress("host.testcontainers.internal"); - @DynamicPropertySource - static void daprProperties(DynamicPropertyRegistry registry) { - org.testcontainers.Testcontainers.exposeHostPorts(8080); - - registry.add("dapr.http.endpoint", DAPR_CONTAINER::getHttpEndpoint); - registry.add("dapr.grpc.endpoint", DAPR_CONTAINER::getGrpcEndpoint); - registry.add("dapr.grpc.port", DAPR_CONTAINER::getGrpcPort); - registry.add("dapr.http.port", DAPR_CONTAINER::getHttpPort); - } - @Autowired private DaprMessagingTemplate messagingTemplate; @Autowired private TestRestController testRestController; + @BeforeEach + public void setup(){ + org.testcontainers.Testcontainers.exposeHostPorts(8080); + } + @Test public void testDaprMessagingTemplate() throws InterruptedException { for (int i = 0; i < 10; i++) {