Only treat the last 2 path segments as repository

1 files changed, 13 insertions, 2 deletions

diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/DockerImageTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/DockerImageTest.java
index 71fd453aa26..2e0de192f03 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/DockerImageTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/DockerImageTest.java
@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.Optional;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
 
 /**
@@ -22,7 +23,8 @@ public class DockerImageTest {
                 "registry.example.com:9999/vespa/vespa:7.42", new DockerImage("registry.example.com:9999", "vespa/vespa", Optional.of("7.42")),
                 "registry.example.com/vespa/vespa:7.42", new DockerImage("registry.example.com", "vespa/vespa", Optional.of("7.42")),
                 "registry.example.com:9999/vespa/vespa", new DockerImage("registry.example.com:9999", "vespa/vespa", Optional.empty()),
-                "registry.example.com/vespa/vespa", new DockerImage("registry.example.com", "vespa/vespa", Optional.empty())
+                "registry.example.com/vespa/vespa", new DockerImage("registry.example.com", "vespa/vespa", Optional.empty()),
+                "registry.example.com/project/repo/vespa/vespa", new DockerImage("registry.example.com/project/repo", "vespa/vespa", Optional.empty())
         );
         tests.forEach((value, expected) -> {
             DockerImage parsed = DockerImage.fromString(value);
@@ -36,17 +38,26 @@ public class DockerImageTest {
     }
 
     @Test
+    public void registry_cannot_contain_slash() {
+        DockerImage image = DockerImage.fromString("registry.example.com/vespa/vespa");
+        assertThrows(IllegalArgumentException.class, () -> image.withRegistry(""));
+        assertThrows(IllegalArgumentException.class, () -> image.withRegistry("my-registry/path/"));
+    }
+
+    @Test
     public void parse_invalid() {
         List<String> tests = List.of(
                 "registry.example.com",
                 "registry.example.com/",
+                "registry.example.com/repository",
+                "registry.example.com/repository:",
                 "foo",
                 "foo:1.2.3"
         );
         for (var value : tests) {
             try {
                 DockerImage.fromString(value);
-                fail("Expected failure");
+                fail("Expected failure for: " + value);
             } catch (IllegalArgumentException ignored) {
             }
         }