Revert "back to original default"

This reverts commit 47d133e.
palantir · Mar 24, 2023 · 2dc3580 · 2dc3580
1 parent 47d133e
commit 2dc3580
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...-jupiter/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyExtensionTest.java b/...-jupiter/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyExtensionTest.java
@@ -77,7 +77,7 @@ void canReachDockerContainerByHostnameAndDomainNameWithProjectSpecified() throws
     @Test
     void canReachDockerContainerByContainerNameWithNetworkSpecified() throws IOException, InterruptedException {
         DockerProxyExtension dockerProxyExtension = DockerProxyExtension.fromNetworkName(
-                DOCKER_COMPOSE_EXTENSION.projectName().asString() + "_default", DockerProxyExtensionTest.class);
+                DOCKER_COMPOSE_EXTENSION.projectName().asString() + "-default", DockerProxyExtensionTest.class);
         try {
             dockerProxyExtension.before();
             URLConnection urlConnection = new URL("http://webserver").openConnection();
@@ -90,7 +90,7 @@ void canReachDockerContainerByContainerNameWithNetworkSpecified() throws IOExcep
     @Test
     void canReachDockerContainerByHostnameWithNetworkSpecified() throws IOException, InterruptedException {
         DockerProxyExtension dockerProxyExtension = DockerProxyExtension.fromNetworkName(
-                DOCKER_COMPOSE_EXTENSION.projectName().asString() + "_default", DockerProxyExtensionTest.class);
+                DOCKER_COMPOSE_EXTENSION.projectName().asString() + "-default", DockerProxyExtensionTest.class);
         try {
             dockerProxyExtension.before();
             URLConnection urlConnection = new URL("http://web").openConnection();
@@ -103,7 +103,7 @@ void canReachDockerContainerByHostnameWithNetworkSpecified() throws IOException,
     @Test
     void canReachDockerContainerByHostnameAndDomainNameWithNetworkSpecified() throws IOException, InterruptedException {
         DockerProxyExtension dockerProxyExtension = DockerProxyExtension.fromNetworkName(
-                DOCKER_COMPOSE_EXTENSION.projectName().asString() + "_default", DockerProxyExtensionTest.class);
+                DOCKER_COMPOSE_EXTENSION.projectName().asString() + "-default", DockerProxyExtensionTest.class);
         try {
             dockerProxyExtension.before();
             URLConnection urlConnection = new URL("http://web.server.here").openConnection();

diff --git a/...xy-rule-core/src/main/java/com/palantir/docker/proxy/ProjectBasedDockerContainerInfo.java b/...xy-rule-core/src/main/java/com/palantir/docker/proxy/ProjectBasedDockerContainerInfo.java
@@ -67,7 +67,7 @@ public Optional<String> getHostForIp(String ip) {
 
     @Override
     public String getNetworkName() {
-        return networkNameOverride.orElseGet(() -> projectName.asString() + "_default");
+        return networkNameOverride.orElseGet(() -> projectName.asString() + "-default");
     }
 
     @Override

diff --git a/...y-rule-junit4/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyRuleTest.java b/...y-rule-junit4/src/integrationTest/java/com/palantir/docker/proxy/DockerProxyRuleTest.java
@@ -75,7 +75,7 @@ public void canReachDockerContainerByHostnameAndDomainNameWithProjectSpecified()
     @Test
     public void canReachDockerContainerByContainerNameWithNetworkSpecified() throws IOException, InterruptedException {
         DockerProxyRule dockerProxyRule = DockerProxyRule.fromNetworkName(
-                DOCKER_COMPOSE_RULE.projectName().asString() + "_default", DockerProxyRuleTest.class);
+                DOCKER_COMPOSE_RULE.projectName().asString() + "-default", DockerProxyRuleTest.class);
         try {
             dockerProxyRule.before();
             URLConnection urlConnection = new URL("http://webserver").openConnection();
@@ -88,7 +88,7 @@ public void canReachDockerContainerByContainerNameWithNetworkSpecified() throws
     @Test
     public void canReachDockerContainerByHostnameWithNetworkSpecified() throws IOException, InterruptedException {
         DockerProxyRule dockerProxyRule = DockerProxyRule.fromNetworkName(
-                DOCKER_COMPOSE_RULE.projectName().asString() + "_default", DockerProxyRuleTest.class);
+                DOCKER_COMPOSE_RULE.projectName().asString() + "-default", DockerProxyRuleTest.class);
         try {
             dockerProxyRule.before();
             URLConnection urlConnection = new URL("http://web").openConnection();
@@ -102,7 +102,7 @@ public void canReachDockerContainerByHostnameWithNetworkSpecified() throws IOExc
     public void canReachDockerContainerByHostnameAndDomainNameWithNetworkSpecified()
             throws IOException, InterruptedException {
         DockerProxyRule dockerProxyRule = DockerProxyRule.fromNetworkName(
-                DOCKER_COMPOSE_RULE.projectName().asString() + "_default", DockerProxyRuleTest.class);
+                DOCKER_COMPOSE_RULE.projectName().asString() + "-default", DockerProxyRuleTest.class);
         try {
             dockerProxyRule.before();
             URLConnection urlConnection = new URL("http://web.server.here").openConnection();