Skip to content

Fix DockerImageName parsing when tag and digest are used #11368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bedla wants to merge 1 commit into
base: main
Choose a base branch
from
+70 −29
Open

Fix DockerImageName parsing when tag and digest are used #11368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions core/src/main/java/org/testcontainers/utility/DockerImageName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,15 @@ public DockerImageName(String fullImageName) {
}

if (remoteName.contains("@sha256:")) {
repository = remoteName.split("@sha256:")[0];
versioning = new Sha256Versioning(remoteName.split("@sha256:")[1]);
String[] parts = remoteName.split("@sha256:");
if (parts[0].contains(":")) {
String[] repositoryAndTag = parts[0].split(":");
repository = repositoryAndTag[0];
versioning = new Versioning.TagSha256Versioning(repositoryAndTag[1], parts[1]);
} else {
repository = parts[0];
versioning = new Sha256Versioning(parts[1]);
}
} else if (remoteName.contains(":")) {
repository = remoteName.split(":")[0];
versioning = new TagVersioning(remoteName.split(":")[1]);
Expand Down
32 changes: 32 additions & 0 deletions core/src/main/java/org/testcontainers/utility/Versioning.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,36 @@ public String toString() {
return "sha256:" + hash;
}
}

@EqualsAndHashCode
class TagSha256Versioning implements Versioning {

public static final String TAG_REGEX = "[\\w][\\w.\\-]{0,127}";

public static final String HASH_REGEX = "[0-9a-fA-F]{32,}";

private final String tag;

private final String hash;

TagSha256Versioning(String tag, String hash) {
this.tag = tag;
this.hash = hash;
}

@Override
public boolean isValid() {
return tag.matches(TAG_REGEX) && hash.matches(HASH_REGEX);
}

@Override
public String getSeparator() {
return ":";
}

@Override
public String toString() {
return tag + "@sha256:" + hash;
}
}
}
56 changes: 29 additions & 27 deletions core/src/test/java/org/testcontainers/utility/DockerImageNameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public static String[] getNames() {
"registry.foo.com:1234/repo_here/my-name:1.0",
"registry.foo.com:1234/repo-here/my-name@sha256:1234abcd1234abcd1234abcd1234abcd",
"registry.foo.com:1234/my-name@sha256:1234abcd1234abcd1234abcd1234abcd",
"registry.foo.com:1234/my-name:my-tag@sha256:1234abcd1234abcd1234abcd1234abcd",
"1.2.3.4/my-name:1.0",
"1.2.3.4:1234/my-name:1.0",
"1.2.3.4/repo-here/my-name:1.0",
Expand Down Expand Up @@ -64,33 +65,34 @@ class Parsing {

public static Stream<Arguments> getNames() {
return Stream.of(
Arguments.of("", "", "myname", ":", null),
Arguments.of("", "", "myname", ":", "latest"),
Arguments.of("", "", "repo/myname", ":", null),
Arguments.of("", "", "repo/myname", ":", "latest"),
Arguments.of("registry.foo.com:1234", "/", "my-name", ":", null),
Arguments.of("registry.foo.com:1234", "/", "my-name", ":", "1.0"),
Arguments.of("registry.foo.com", "/", "my-name", ":", "1.0"),
Arguments.of("registry.foo.com:1234", "/", "repo_here/my-name", ":", null),
Arguments.of("registry.foo.com:1234", "/", "repo_here/my-name", ":", "1.0"),
Arguments.of("1.2.3.4:1234", "/", "repo_here/my-name", ":", null),
Arguments.of("1.2.3.4:1234", "/", "repo_here/my-name", ":", "1.0"),
Arguments.of("1.2.3.4:1234", "/", "my-name", ":", null),
Arguments.of("1.2.3.4:1234", "/", "my-name", ":", "1.0"),
Arguments.of("", "", "myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
Arguments.of("", "", "repo/myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
Arguments.of(
"registry.foo.com:1234",
"/",
"repo-here/my-name",
"@",
"sha256:1234abcd1234abcd1234abcd1234abcd"
),
Arguments.of("registry.foo.com:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
Arguments.of("1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
Arguments.of("1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
Arguments.of("1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
Arguments.of("1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd")
// Arguments.of("", "", "myname", ":", null),
// Arguments.of("", "", "myname", ":", "latest"),
// Arguments.of("", "", "repo/myname", ":", null),
// Arguments.of("", "", "repo/myname", ":", "latest"),
// Arguments.of("registry.foo.com:1234", "/", "my-name", ":", null),
// Arguments.of("registry.foo.com:1234", "/", "my-name", ":", "1.0"),
// Arguments.of("registry.foo.com", "/", "my-name", ":", "1.0"),
// Arguments.of("registry.foo.com:1234", "/", "repo_here/my-name", ":", null),
// Arguments.of("registry.foo.com:1234", "/", "repo_here/my-name", ":", "1.0"),
// Arguments.of("1.2.3.4:1234", "/", "repo_here/my-name", ":", null),
// Arguments.of("1.2.3.4:1234", "/", "repo_here/my-name", ":", "1.0"),
// Arguments.of("1.2.3.4:1234", "/", "my-name", ":", null),
// Arguments.of("1.2.3.4:1234", "/", "my-name", ":", "1.0"),
// Arguments.of("", "", "myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
// Arguments.of("", "", "repo/myname", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
// Arguments.of(
// "registry.foo.com:1234",
// "/",
// "repo-here/my-name",
// "@",
// "sha256:1234abcd1234abcd1234abcd1234abcd"
// ),
// Arguments.of("registry.foo.com:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
// Arguments.of("1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
// Arguments.of("1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
// Arguments.of("1.2.3.4", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
// Arguments.of("1.2.3.4:1234", "/", "my-name", "@", "sha256:1234abcd1234abcd1234abcd1234abcd"),
Arguments.of("1.2.3.4:1234", "/", "my-name", ":", "my-tag@sha256:1234abcd1234abcd1234abcd1234abcd")
);
}

Expand Down
Loading