Change "127.0.0.1" to SIDECAR_IP to dynamically account for IPv4 vs. IPv6 environments

.gitignore

@@ -4,6 +4,7 @@
 .run/
 .vs/
 .vscode/
+.devcontainer/
 
 # Output folders
 **/target/

sdk-actors/pom.xml

@@ -61,6 +61,12 @@
       <version>${grpc.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-validator</groupId>
+      <artifactId>commons-validator</artifactId>
+      <version>1.7</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

sdk-actors/src/test/java/io/dapr/actors/TestUtils.java

@@ -16,6 +16,7 @@
 import io.dapr.exceptions.DaprException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.function.Executable;
+import org.apache.commons.validator.routines.InetAddressValidator;
 
 public final class TestUtils {
 
@@ -54,4 +55,12 @@ public static <T extends Throwable> void assertThrowsDaprException(
     Assertions.assertEquals(expectedErrorCode, daprException.getErrorCode());
     Assertions.assertEquals(expectedErrorMessage, daprException.getMessage());
   }
-}
+
+  public static String formatIpAddress(final String ipAddress) {
+    String formattedIpAddress = ipAddress;
+    if(InetAddressValidator.getInstance().isValidInet6Address(ipAddress)) {
+      formattedIpAddress = "[" + ipAddress + "]"; // per URL spec https://url.spec.whatwg.org/#host-writing
+    }
+    return formattedIpAddress;
+  }
+}

sdk-actors/src/test/java/io/dapr/actors/client/DaprHttpClientTest.java

@@ -25,6 +25,7 @@
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 
+import static io.dapr.actors.TestUtils.formatIpAddress;
 import static io.dapr.actors.TestUtils.assertThrowsDaprException;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -36,21 +37,40 @@ public class DaprHttpClientTest {
 
   private MockInterceptor mockInterceptor;
 
+  private String sidecarIp;
+
   private final String EXPECTED_RESULT = "{\"data\":\"ewoJCSJwcm9wZXJ0eUEiOiAidmFsdWVBIiwKCQkicHJvcGVydHlCIjogInZhbHVlQiIKCX0=\"}";
 
   @BeforeEach
   public void setUp() {
+    sidecarIp = formatIpAddress(Properties.SIDECAR_IP.get());
     mockInterceptor = new MockInterceptor(Behavior.UNORDERED);
     okHttpClient = new OkHttpClient.Builder().addInterceptor(mockInterceptor).build();
   }
 
   @Test
   public void invokeActorMethod() {
     mockInterceptor.addRule()
-        .post("http://127.0.0.1:3000/v1.0/actors/DemoActor/1/method/Payment")
+        .post("http://" + sidecarIp + ":3000/v1.0/actors/DemoActor/1/method/Payment")
+        .respond(EXPECTED_RESULT);
+    DaprHttp daprHttp = new DaprHttpProxy(sidecarIp, 3000, okHttpClient);
+    DaprHttpClient = new DaprHttpClient(daprHttp);
+    Mono<byte[]> mono =
+        DaprHttpClient.invoke("DemoActor", "1", "Payment", "".getBytes());
+    assertEquals(new String(mono.block()), EXPECTED_RESULT);
+  }
+
+  @Test
+  public void invokeActorMethodIPv6() {
+    String prevSidecarIp = sidecarIp;
+    System.setProperty(Properties.SIDECAR_IP.getName(), "2001:db8:3333:4444:5555:6666:7777:8888");
+    sidecarIp = formatIpAddress(Properties.SIDECAR_IP.get());
+    mockInterceptor.addRule()
+        .post("http://" + sidecarIp + ":3000/v1.0/actors/DemoActor/1/method/Payment")
         .respond(EXPECTED_RESULT);
-    DaprHttp daprHttp = new DaprHttpProxy(Properties.SIDECAR_IP.get(), 3000, okHttpClient);
+    DaprHttp daprHttp = new DaprHttpProxy(sidecarIp, 3000, okHttpClient);
     DaprHttpClient = new DaprHttpClient(daprHttp);
+    System.setProperty(Properties.SIDECAR_IP.getName(), prevSidecarIp);
     Mono<byte[]> mono =
         DaprHttpClient.invoke("DemoActor", "1", "Payment", "".getBytes());
     assertEquals(new String(mono.block()), EXPECTED_RESULT);
@@ -59,12 +79,12 @@ public void invokeActorMethod() {
   @Test
   public void invokeActorMethodError() {
     mockInterceptor.addRule()
-        .post("http://127.0.0.1:3000/v1.0/actors/DemoActor/1/method/Payment")
+        .post("http://" + sidecarIp + ":3000/v1.0/actors/DemoActor/1/method/Payment")
         .respond(404,
             ResponseBody.create("" +
                 "{\"errorCode\":\"ERR_SOMETHING\"," +
                 "\"message\":\"error message\"}", MediaTypes.MEDIATYPE_JSON));
-    DaprHttp daprHttp = new DaprHttpProxy(Properties.SIDECAR_IP.get(), 3000, okHttpClient);
+    DaprHttp daprHttp = new DaprHttpProxy(sidecarIp, 3000, okHttpClient);
     DaprHttpClient = new DaprHttpClient(daprHttp);
     Mono<byte[]> mono =
         DaprHttpClient.invoke("DemoActor", "1", "Payment", "".getBytes());

sdk-actors/src/test/java/io/dapr/actors/runtime/DaprHttpClientTest.java

@@ -38,6 +38,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.fail;
+import static io.dapr.actors.TestUtils.formatIpAddress;
 
 public class DaprHttpClientTest {
 
@@ -46,33 +47,50 @@ public class DaprHttpClientTest {
   private OkHttpClient okHttpClient;
 
   private MockInterceptor mockInterceptor;
+
+  private String sidecarIp;
 
   private final String EXPECTED_RESULT = "{\"data\":\"ewoJCSJwcm9wZXJ0eUEiOiAidmFsdWVBIiwKCQkicHJvcGVydHlCIjogInZhbHVlQiIKCX0=\"}";
 
   @BeforeEach
   public void setUp() throws Exception {
+    sidecarIp = formatIpAddress(Properties.SIDECAR_IP.get());
     mockInterceptor = new MockInterceptor(Behavior.UNORDERED);
     okHttpClient = new OkHttpClient.Builder().addInterceptor(mockInterceptor).build();
   }
 
   @Test
   public void getActorState() {
     mockInterceptor.addRule()
-      .get("http://127.0.0.1:3000/v1.0/actors/DemoActor/1/state/order")
+      .get("http://" + sidecarIp + ":3000/v1.0/actors/DemoActor/1/state/order")
       .respond(EXPECTED_RESULT);
-    DaprHttp daprHttp = new DaprHttpProxy(Properties.SIDECAR_IP.get(), 3000, okHttpClient);
+    DaprHttp daprHttp = new DaprHttpProxy(sidecarIp, 3000, okHttpClient);
     DaprHttpClient = new DaprHttpClient(daprHttp);
     Mono<byte[]> mono = DaprHttpClient.getState("DemoActor", "1", "order");
     assertEquals(new String(mono.block()), EXPECTED_RESULT);
   }
 
+  @Test
+  public void getActorStateIPv6() {
+    String prevSidecarIp = sidecarIp;
+    System.setProperty(Properties.SIDECAR_IP.getName(), "2001:db8:3333:4444:5555:6666:7777:8888");
+    sidecarIp = formatIpAddress(Properties.SIDECAR_IP.get());
+    mockInterceptor.addRule()
+      .get("http://" + sidecarIp + ":3000/v1.0/actors/DemoActor/1/state/order")
+      .respond(EXPECTED_RESULT);
+    DaprHttp daprHttp = new DaprHttpProxy(sidecarIp, 3000, okHttpClient);
+    DaprHttpClient = new DaprHttpClient(daprHttp);
+    System.setProperty(Properties.SIDECAR_IP.getName(), prevSidecarIp);
+    Mono<byte[]> mono = DaprHttpClient.getState("DemoActor", "1", "order");
+    assertEquals(new String(mono.block()), EXPECTED_RESULT);
+  }
 
   @Test
   public void saveActorStateTransactionally() {
     mockInterceptor.addRule()
-      .put("http://127.0.0.1:3000/v1.0/actors/DemoActor/1/state")
+      .put("http://" + sidecarIp + ":3000/v1.0/actors/DemoActor/1/state")
       .respond(EXPECTED_RESULT);
-    DaprHttp daprHttp = new DaprHttpProxy(Properties.SIDECAR_IP.get(), 3000, okHttpClient);
+    DaprHttp daprHttp = new DaprHttpProxy(sidecarIp, 3000, okHttpClient);
     DaprHttpClient = new DaprHttpClient(daprHttp);
     List<ActorStateOperation> ops = Collections.singletonList(new ActorStateOperation("UPSERT", "key", "value"));
     Mono<Void> mono = DaprHttpClient.saveStateTransactionally("DemoActor", "1", ops);
@@ -82,9 +100,9 @@ public void saveActorStateTransactionally() {
   @Test
   public void registerActorReminder() {
     mockInterceptor.addRule()
-      .put("http://127.0.0.1:3000/v1.0/actors/DemoActor/1/reminders/reminder")
+      .put("http://" + sidecarIp + ":3000/v1.0/actors/DemoActor/1/reminders/reminder")
       .respond(EXPECTED_RESULT);
-    DaprHttp daprHttp = new DaprHttpProxy(Properties.SIDECAR_IP.get(), 3000, okHttpClient);
+    DaprHttp daprHttp = new DaprHttpProxy(sidecarIp, 3000, okHttpClient);
     DaprHttpClient = new DaprHttpClient(daprHttp);
     Mono<Void> mono =
       DaprHttpClient.registerReminder(
@@ -98,9 +116,9 @@ public void registerActorReminder() {
   @Test
   public void unregisterActorReminder() {
     mockInterceptor.addRule()
-      .delete("http://127.0.0.1:3000/v1.0/actors/DemoActor/1/reminders/reminder")
+      .delete("http://" + sidecarIp + ":3000/v1.0/actors/DemoActor/1/reminders/reminder")
       .respond(EXPECTED_RESULT);
-    DaprHttp daprHttp = new DaprHttpProxy(Properties.SIDECAR_IP.get(), 3000, okHttpClient);
+    DaprHttp daprHttp = new DaprHttpProxy(sidecarIp, 3000, okHttpClient);
     DaprHttpClient = new DaprHttpClient(daprHttp);
     Mono<Void> mono = DaprHttpClient.unregisterReminder("DemoActor", "1", "reminder");
     assertNull(mono.block());
@@ -110,7 +128,7 @@ public void unregisterActorReminder() {
   public void registerActorTimer() {
     String data = "hello world";
     mockInterceptor.addRule()
-      .put("http://127.0.0.1:3000/v1.0/actors/DemoActor/1/timers/timer")
+      .put("http://" + sidecarIp + ":3000/v1.0/actors/DemoActor/1/timers/timer")
       .answer(new RuleAnswer() {
         @Override
         public Response.Builder respond(Request request) {
@@ -132,7 +150,7 @@ public Response.Builder respond(Request request) {
               .body(ResponseBody.create("{}", MediaType.get("application/json")));
         }
       });
-    DaprHttp daprHttp = new DaprHttpProxy(Properties.SIDECAR_IP.get(), 3000, okHttpClient);
+    DaprHttp daprHttp = new DaprHttpProxy(sidecarIp, 3000, okHttpClient);
     DaprHttpClient = new DaprHttpClient(daprHttp);
     Mono<Void> mono =
       DaprHttpClient.registerTimer(
@@ -150,9 +168,9 @@ public Response.Builder respond(Request request) {
   @Test
   public void unregisterActorTimer() {
     mockInterceptor.addRule()
-      .delete("http://127.0.0.1:3000/v1.0/actors/DemoActor/1/timers/timer")
+      .delete("http://" + sidecarIp + ":3000/v1.0/actors/DemoActor/1/timers/timer")
       .respond(EXPECTED_RESULT);
-    DaprHttp daprHttp = new DaprHttpProxy(Properties.SIDECAR_IP.get(), 3000, okHttpClient);
+    DaprHttp daprHttp = new DaprHttpProxy(sidecarIp, 3000, okHttpClient);
     DaprHttpClient = new DaprHttpClient(daprHttp);
     Mono<Void> mono = DaprHttpClient.unregisterTimer("DemoActor", "1", "timer");
     assertNull(mono.block());

sdk-tests/src/test/java/io/dapr/it/state/HelloWorldClientIT.java

@@ -15,6 +15,7 @@
 
 import io.dapr.it.BaseIT;
 import io.dapr.it.DaprRun;
+import io.dapr.config.Properties;
 import io.dapr.v1.DaprGrpc;
 import io.dapr.v1.DaprProtos;
 import io.grpc.ManagedChannel;
@@ -34,7 +35,7 @@ public void testHelloWorldState() throws Exception {
         2000
     );
     ManagedChannel channel =
-      ManagedChannelBuilder.forAddress("127.0.0.1", daprRun.getGrpcPort()).usePlaintext().build();
+      ManagedChannelBuilder.forAddress(Properties.SIDECAR_IP.get(), daprRun.getGrpcPort()).usePlaintext().build();
     DaprGrpc.DaprBlockingStub client = DaprGrpc.newBlockingStub(channel);
 
     String key = "mykey";

sdk-tests/src/test/java/io/dapr/it/state/HelloWorldGrpcStateService.java

@@ -14,6 +14,7 @@
 package io.dapr.it.state;
 
 import com.google.protobuf.ByteString;
+import io.dapr.config.Properties;
 import io.dapr.v1.CommonProtos.StateItem;
 import io.dapr.v1.DaprGrpc;
 import io.dapr.v1.DaprGrpc.DaprBlockingStub;
@@ -37,7 +38,7 @@ public static void main(String[] args) {
 
     // If port string is not valid, it will throw an exception.
     int grpcPortInt = Integer.parseInt(grpcPort);
-    ManagedChannel channel = ManagedChannelBuilder.forAddress("127.0.0.1", grpcPortInt).usePlaintext().build();
+    ManagedChannel channel = ManagedChannelBuilder.forAddress(Properties.SIDECAR_IP.get(), grpcPortInt).usePlaintext().build();
     DaprBlockingStub client = DaprGrpc.newBlockingStub(channel);
 
     String key = "mykey";

sdk/pom.xml

@@ -128,6 +128,12 @@
       <artifactId>junit-jupiter-migrationsupport</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-validator</groupId>
+      <artifactId>commons-validator</artifactId>
+      <version>1.7</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>

sdk/src/main/java/io/dapr/config/Properties.java

@@ -14,6 +14,7 @@
 package io.dapr.config;
 
 import io.dapr.client.DaprApiProtocol;
+import io.dapr.utils.NetworkUtils;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -27,7 +28,7 @@ public class Properties {
   /**
    * Dapr's default IP for HTTP and gRPC communication.
    */
-  private static final String DEFAULT_SIDECAR_IP = "127.0.0.1";
+  private static final String DEFAULT_SIDECAR_IP = NetworkUtils.getHostLoopbackAddress();
 
   /**
    * Dapr's default HTTP port.

sdk/src/main/java/io/dapr/utils/NetworkUtils.java

@@ -19,9 +19,11 @@
 import io.grpc.ManagedChannelBuilder;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.URI;
+import java.net.UnknownHostException;
 
 /**
  * Utility methods for network, internal to Dapr SDK.
@@ -112,4 +114,12 @@ private static void callWithRetry(Runnable function, long retryTimeoutMillisecon
       Thread.sleep(Math.min(remaining, RETRY_WAIT_MILLISECONDS));
     }
   }
-}
+
+  /**
+   * Retrieve loopback address for the host.
+   * @return The loopback address String
+   */
+  public static String getHostLoopbackAddress() {
+    return InetAddress.getLoopbackAddress().getHostAddress();
+  }
+}