fix(localstack): More reliable legacy tag detection

testcontainers · Jan 10, 2025 · 4d651db · 4d651db
1 parent 3330dc1
commit 4d651db
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/modules/localstack/localstack.go b/modules/localstack/localstack.go
@@ -24,7 +24,11 @@ func isLegacyMode(image string) bool {
 	parts := strings.Split(image, ":")
 	version := parts[len(parts)-1]
 
-	if version == "latest" {
+	if pos := strings.LastIndexByte(version, '-'); pos >= 0 {
+		version = version[0:pos]
+	}
+
+	if version == "latest" || version == "s3" || version == "s3-latest" || version == "stable" {
 		return false
 	}
 

diff --git a/modules/localstack/localstack_test.go b/modules/localstack/localstack_test.go
@@ -89,12 +89,25 @@ func TestIsLegacyMode(t *testing.T) {
 	}{
 		{"foo", true},
 		{"latest", false},
+		{"latest-amd64", false},
+		{"s3-latest", false},
+		{"s3-latest-amd64", false},
+		{"stable", false},
+		{"stable-amd64", false},
 		{"0.10.0", true},
+		{"0.10.0-amd64", true},
 		{"0.10.999", true},
+		{"0.10.999-amd64", true},
 		{"0.11", false},
+		{"0.11-amd64", false},
 		{"0.11.2", false},
+		{"0.11.2-amd64", false},
 		{"0.12", false},
+		{"0.12-amd64", false},
+		{"1", false},
+		{"1-amd64", false},
 		{"1.0", false},
+		{"1.0-amd64", false},
 	}
 
 	for _, tt := range tests {