Address comments

Signed-off-by: siri-varma <[email protected]>

Author: siri-varma

pom.xml

@@ -17,7 +17,7 @@
     <grpc.version>1.69.0</grpc.version>
     <protobuf.version>3.25.5</protobuf.version>
     <protocCommand>protoc</protocCommand>
-    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.15.3/dapr/proto</dapr.proto.baseurl>
+    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.15.4/dapr/proto</dapr.proto.baseurl>
     <dapr.sdk.version>1.15.0-SNAPSHOT</dapr.sdk.version>
     <dapr.sdk.alpha.version>0.15.0-SNAPSHOT</dapr.sdk.alpha.version>
     <os-maven-plugin.version>1.7.1</os-maven-plugin.version>

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 {

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;

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}.

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;
 

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;
 

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(

sdk-tests/src/test/java/io/dapr/it/testcontainers/ContainerConstants.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(

sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprActorsIT.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;
+}

sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerConstants.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

sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprContainerIT.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)

sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprJobsIT.java

@@ -20,15 +20,14 @@
 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")
 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() {

sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprPlacementContainerIT.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");
+  }
+}

sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprSchedulerContainerIT.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;
 

sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.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))

spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/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))

spring-boot-examples/producer-app/src/test/java/io/dapr/springboot/examples/producer/DaprTestContainersConfig.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,16 +40,17 @@
 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<DaprContainer> {
   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 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> COMPONENT_CONVERTER = new ComponentYamlConverter(YAML_MAPPER);
   private static final YamlConverter<Subscription> SUBSCRIPTION_CONVERTER = new SubscriptionYamlConverter(YAML_MAPPER);
@@ -64,12 +64,12 @@ public class DaprContainer extends GenericContainer<DaprContainer> {
   private final Set<Component> components = new HashSet<>();
   private final Set<Subscription> subscriptions = new HashSet<>();
   private final Set<HttpEndpoint> 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;

testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.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";
 }

testcontainers-dapr/src/main/java/io/dapr/testcontainers/ContainerConstants.java renamed to testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.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();

testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprComponentTest.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;
 

testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ComponentYamlConverterTest.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;
 

testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ConfigurationYamlConverterTest.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 {

testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/HttpEndpointYamlConverterTest.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();