[grid] Fixing image parsing when a custom domain is used, fixes #8887

Author: diemol

java/server/src/org/openqa/selenium/docker/internal/Reference.java

@@ -38,7 +38,7 @@ public class Reference {
   private static final String DEFAULT_TAG = "latest";
 
   // Capturing groups used in patterns below
-  private static final String DOMAIN = "([\\w\\d-_.]+?(:(\\d+))?";
+  private static final String DOMAIN = "([\\w\\d-_.]+?(:(\\d+))?)";
   private static final String REPO = "([\\w\\d-_.]+?)";
   private static final String NAME = "([\\w\\d-_.]+?)";
   private static final String TAG = "([\\w\\d-_.]+?)";
@@ -59,6 +59,8 @@ public class Reference {
     .put(Pattern.compile(String.format("%s@%s", NAME, DIGEST)), m -> new Reference(DEFAULT_DOMAIN, DEFAULT_REPO, m.group(1), null, m.group(2)))
     .put(Pattern.compile(String.format("%s/%s:%s", REPO, NAME, TAG)), m -> new Reference(DEFAULT_DOMAIN, m.group(1), m.group(2), m.group(3), null))
     .put(Pattern.compile(String.format("%s/%s@%s", REPO, NAME, DIGEST)), m -> new Reference(DEFAULT_DOMAIN, m.group(1), m.group(2), null, m.group(3)))
+    .put(Pattern.compile(String.format("%s/%s/%s", DOMAIN, REPO, NAME)), m -> new Reference(m.group(1), m.group(4), m.group(5), DEFAULT_TAG, null))
+    .put(Pattern.compile(String.format("%s/%s/%s:%s", DOMAIN, REPO, NAME, TAG)), m -> new Reference(m.group(1), m.group(4), m.group(5), m.group(6), null))
     .build();
 
   private final String domain;

java/server/test/org/openqa/selenium/docker/internal/ReferenceTest.java

@@ -42,7 +42,8 @@ public static Collection<Object[]> data() {
       {"repo/img", new Reference("docker.io", "repo", "img", "latest",null)},
       {"repo/img:tag", new Reference("docker.io", "repo", "img", "tag",null)},
       {"repo/img@sha256:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", new Reference("docker.io", "repo", "img", null,"sha256:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff")},
-      // domain/repository/name:tag -> {domain: domain, repository: repository, name: name, tag: tag, digest: null}
+      {"images.sample.io/repo/img", new Reference("images.sample.io", "repo", "img", "latest",null)},
+      {"images.sample.io/repo/img:tag", new Reference("images.sample.io", "repo", "img", "tag",null)},
       // domain:port/repository/name@digest ->
     });
   }