Skip to content

Commit 8b8684a

Browse files
authored
Make the DAPR version being used consistent across all tests (#1299)
1 parent 9b635da commit 8b8684a

File tree

29 files changed

+130
-57
lines changed

29 files changed

+130
-57
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
GOPROXY: https://proxy.golang.org
4040
JDK_VER: ${{ matrix.java }}
4141
DAPR_CLI_VER: 1.15.0
42-
DAPR_RUNTIME_VER: 1.15.3
42+
DAPR_RUNTIME_VER: 1.15.4
4343
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
4444
DAPR_CLI_REF:
4545
DAPR_REF:

.github/workflows/validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
GOPROXY: https://proxy.golang.org
3939
JDK_VER: ${{ matrix.java }}
4040
DAPR_CLI_VER: 1.15.0
41-
DAPR_RUNTIME_VER: 1.15.3
41+
DAPR_RUNTIME_VER: 1.15.4
4242
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
4343
DAPR_CLI_REF:
4444
DAPR_REF:

daprdocs/content/en/java-sdk-docs/spring-boot/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public class DaprTestContainersConfig {
8080
@ServiceConnection
8181
public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer){
8282

83-
return new DaprContainer("daprio/daprd:1.14.1")
83+
return new DaprContainer("daprio/daprd:1.15.4")
8484
.withAppName("producer-app")
8585
.withNetwork(daprNetwork)
8686
.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
235235
@ServiceConnection
236236
public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer, RabbitMQContainer rabbitMQContainer){
237237

238-
return new DaprContainer("daprio/daprd:1.14.1")
238+
return new DaprContainer("daprio/daprd:1.15.4")
239239
.withAppName("producer-app")
240240
.withNetwork(daprNetwork)
241241
.withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES))

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<grpc.version>1.69.0</grpc.version>
1818
<protobuf.version>3.25.5</protobuf.version>
1919
<protocCommand>protoc</protocCommand>
20-
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.15.3/dapr/proto</dapr.proto.baseurl>
20+
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.15.4/dapr/proto</dapr.proto.baseurl>
2121
<dapr.sdk.version>1.15.0-SNAPSHOT</dapr.sdk.version>
2222
<dapr.sdk.alpha.version>0.15.0-SNAPSHOT</dapr.sdk.alpha.version>
2323
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>

sdk-springboot/src/test/java/io/dapr/springboot/MockController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313

1414
package io.dapr.springboot;
1515

16-
import org.springframework.web.bind.annotation.*;
16+
import org.springframework.web.bind.annotation.PostMapping;
17+
import org.springframework.web.bind.annotation.RequestMapping;
18+
import org.springframework.web.bind.annotation.RequestMethod;
1719

1820
@RequestMapping(value = {"v1", "v2"})
1921
public class MockController {

sdk-tests/src/test/java/io/dapr/it/resiliency/SdkResiliencyIT.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@
5858
import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
5959
import static com.github.tomakehurst.wiremock.client.WireMock.verify;
6060
import static io.dapr.it.resiliency.SdkResiliencyIT.WIREMOCK_PORT;
61-
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_IMAGE_TAG;
62-
import static io.dapr.it.testcontainers.ContainerConstants.TOXIPROXY_IMAGE_TAG;
61+
import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
6362
import static org.assertj.core.api.Assertions.assertThat;
6463
import static org.junit.jupiter.api.Assertions.assertThrows;
6564

@@ -74,7 +73,7 @@ public class SdkResiliencyIT {
7473
private static final int INFINITE_RETRY = -1;
7574

7675
@Container
77-
private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_IMAGE_TAG)
76+
private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG)
7877
.withAppName("dapr-app")
7978
.withAppPort(WIREMOCK_PORT)
8079
.withDaprLogLevel(DaprLogLevel.DEBUG)
@@ -85,7 +84,7 @@ public class SdkResiliencyIT {
8584
.withNetwork(NETWORK);
8685

8786
@Container
88-
private static final ToxiproxyContainer TOXIPROXY = new ToxiproxyContainer(TOXIPROXY_IMAGE_TAG)
87+
private static final ToxiproxyContainer TOXIPROXY = new ToxiproxyContainer("ghcr.io/shopify/toxiproxy:2.5.0")
8988
.withNetwork(NETWORK);
9089

9190
private static Proxy proxy;

sdk-tests/src/test/java/io/dapr/it/spring/data/DaprKeyValueRepositoryIT.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@
3535

3636
import static io.dapr.it.spring.data.DaprSpringDataConstants.BINDING_NAME;
3737
import static io.dapr.it.spring.data.DaprSpringDataConstants.STATE_STORE_NAME;
38-
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_IMAGE_TAG;
39-
import static org.junit.jupiter.api.Assertions.*;
38+
import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
39+
import static org.junit.jupiter.api.Assertions.assertEquals;
40+
import static org.junit.jupiter.api.Assertions.assertFalse;
41+
import static org.junit.jupiter.api.Assertions.assertTrue;
4042

4143
/**
4244
* Integration tests for {@link DaprKeyValueRepositoryIT}.
@@ -65,7 +67,7 @@ public class DaprKeyValueRepositoryIT {
6567

6668
@Container
6769
@ServiceConnection
68-
private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_IMAGE_TAG)
70+
private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG)
6971
.withAppName("postgresql-repository-dapr-app")
7072
.withNetwork(DAPR_NETWORK)
7173
.withComponent(new Component(STATE_STORE_NAME, "state.postgresql", "v1", STATE_STORE_PROPERTIES))

sdk-tests/src/test/java/io/dapr/it/spring/data/MySQLDaprKeyValueTemplateIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
import static io.dapr.it.spring.data.DaprSpringDataConstants.STATE_STORE_NAME;
4646
import static io.dapr.it.spring.data.DaprSpringDataConstants.BINDING_NAME;
47-
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_IMAGE_TAG;
47+
import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
4848
import static org.assertj.core.api.Assertions.assertThat;
4949
import static org.junit.jupiter.api.Assertions.assertEquals;
5050

@@ -80,7 +80,7 @@ public class MySQLDaprKeyValueTemplateIT {
8080

8181
@Container
8282
@ServiceConnection
83-
private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_IMAGE_TAG)
83+
private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG)
8484
.withAppName("mysql-dapr-app")
8585
.withNetwork(DAPR_NETWORK)
8686
.withComponent(new Component(STATE_STORE_NAME, "state.mysql", "v1", STATE_STORE_PROPERTIES))

sdk-tests/src/test/java/io/dapr/it/spring/data/PostgreSQLDaprKeyValueTemplateIT.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,15 @@
3232
import org.testcontainers.junit.jupiter.Container;
3333
import org.testcontainers.junit.jupiter.Testcontainers;
3434

35-
import java.util.*;
35+
import java.util.ArrayList;
36+
import java.util.HashMap;
37+
import java.util.List;
38+
import java.util.Map;
39+
import java.util.Optional;
3640

3741
import static io.dapr.it.spring.data.DaprSpringDataConstants.BINDING_NAME;
3842
import static io.dapr.it.spring.data.DaprSpringDataConstants.STATE_STORE_NAME;
39-
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_IMAGE_TAG;
43+
import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
4044
import static org.assertj.core.api.Assertions.assertThat;
4145
import static org.junit.jupiter.api.Assertions.assertEquals;
4246

@@ -67,7 +71,7 @@ public class PostgreSQLDaprKeyValueTemplateIT {
6771

6872
@Container
6973
@ServiceConnection
70-
private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_IMAGE_TAG)
74+
private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG)
7175
.withAppName("postgresql-dapr-app")
7276
.withNetwork(DAPR_NETWORK)
7377
.withComponent(new Component(STATE_STORE_NAME, "state.postgresql", "v1", STATE_STORE_PROPERTIES))

sdk-tests/src/test/java/io/dapr/it/spring/messaging/DaprSpringMessagingIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import java.util.Collections;
3838
import java.util.List;
3939

40-
import static io.dapr.it.testcontainers.ContainerConstants.DAPR_IMAGE_TAG;
40+
import static io.dapr.it.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
4141
import static org.assertj.core.api.Assertions.assertThat;
4242

4343
@SpringBootTest(
@@ -61,7 +61,7 @@ public class DaprSpringMessagingIT {
6161

6262
@Container
6363
@ServiceConnection
64-
private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_IMAGE_TAG)
64+
private static final DaprContainer DAPR_CONTAINER = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG)
6565
.withAppName("messaging-dapr-app")
6666
.withNetwork(DAPR_NETWORK)
6767
.withComponent(new Component("pubsub", "pubsub.in-memory", "v1", Collections.emptyMap()))

0 commit comments

Comments
 (0)