Add gRPC support to Dapr testcontainer

Author: wlfgang

testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainer.java

@@ -48,7 +48,6 @@ 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(DAPR_RUNTIME_IMAGE_TAG);
   private static final Yaml YAML_MAPPER = YamlMapperFactory.create();
@@ -76,6 +75,7 @@ public class DaprContainer extends GenericContainer<DaprContainer> {
   private DaprSchedulerContainer schedulerContainer;
   private String appName;
   private Integer appPort;
+  private DaprProtocol appProtocol;
   private String appHealthCheckPath;
   private Integer appHealthCheckProbeInterval = 5; //default from docs
   private Integer appHealthCheckProbeTimeout = 500; //default from docs
@@ -126,6 +126,11 @@ public DaprContainer withAppPort(Integer port) {
     return this;
   }
 
+  public DaprContainer withAppProtocol(DaprProtocol protocol) {
+    this.appProtocol = protocol;
+    return this;
+  }
+
   public DaprContainer withAppChannelAddress(String appChannelAddress) {
     this.appChannelAddress = appChannelAddress;
     return this;
@@ -308,8 +313,6 @@ protected void configure() {
     cmds.add("--app-id");
     cmds.add(appName);
     cmds.add("--dapr-listen-addresses=0.0.0.0");
-    cmds.add("--app-protocol");
-    cmds.add(DAPR_PROTOCOL.getName());
     cmds.add("--placement-host-address");
     cmds.add(placementService + ":50005");
     cmds.add("--scheduler-host-address");
@@ -325,6 +328,11 @@ protected void configure() {
       cmds.add(Integer.toString(appPort));
     }
 
+    if (appProtocol != null) {
+      cmds.add("--app-protocol");
+      cmds.add(appProtocol.getName());
+    }
+
     if (appHealthCheckPath != null && !appHealthCheckPath.isEmpty()) {
       cmds.add("--enable-app-health-check");
       cmds.add("--app-health-check-path");
@@ -413,6 +421,10 @@ public Integer getAppPort() {
     return appPort;
   }
 
+  public DaprProtocol getAppProtocol() {
+    return appProtocol;
+  }
+
   public String getAppHealthCheckPath() {
     return appHealthCheckPath;
   }

testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprContainerTest.java

@@ -6,6 +6,7 @@
 import static io.dapr.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
 import static io.dapr.testcontainers.DaprContainerConstants.DAPR_VERSION;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class DaprContainerTest {
 
@@ -78,4 +79,26 @@ public void appHealthParametersDefaultsTest(){
     assertEquals(3, dapr2.getAppHealthCheckThreshold());
 
   }
+
+  @Test
+  public void appPortProtocolDefaultsTest() {
+    try (DaprContainer daprContainer = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG)
+            .withAppName("dapr-app")) {
+      daprContainer.configure();
+      assertNull(daprContainer.getAppPort());
+      assertNull(daprContainer.getAppProtocol());
+    }
+
+    Integer port = 50003;
+    DaprProtocol protocol = DaprProtocol.GRPC;
+    try (DaprContainer daprContainer = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG)
+            .withAppName("dapr-app4")
+            .withAppPort(port)
+            .withAppProtocol(protocol)) {
+      daprContainer.configure();
+      assertEquals(port, daprContainer.getAppPort());
+      assertEquals(protocol, daprContainer.getAppProtocol());
+    }
+
+  }
 }