mirror of
https://github.com/Dvorinka/Containr.git
synced 2026-10-28 07:41:27 +00:00
fix(deploy): don't split digest-pinned image refs (#72)
splitImageReference checked for '@' AFTER the last colon — but digests put '@' before it, so `nginx@sha256:abc` split into name=nginx@sha256/tag=abc. The deploy sync loop wrote those mangled pairs into the deployments table for any digest-pinned image. Any ref containing '@' now returns whole with the fallback tag. Table tests cover registry ports, digests, and tag+digest combos. Generated with [Devin](https://devin.ai) Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
1 parent
26f495ac8e
commit
985d22798c
2 files changed
+53
-1
No files matched your search
@@ -803,9 +803,15 @@ func splitImageReference(image, fallbackTag string) (string, string) {
|
|||||||
return "", fallbackTag
|
return "", fallbackTag
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Digest-pinned refs (name[:tag]@sha256:…) carry no usable tag — the
|
||||||
|
// colon lives inside the digest and must not be split.
|
||||||
|
if strings.Contains(image, "@") {
|
||||||
|
return image, fallbackTag
|
||||||
|
}
|
||||||
|
|
||||||
lastSlash := strings.LastIndex(image, "/")
|
lastSlash := strings.LastIndex(image, "/")
|
||||||
lastColon := strings.LastIndex(image, ":")
|
lastColon := strings.LastIndex(image, ":")
|
||||||
if lastColon > lastSlash && !strings.Contains(image[lastColon:], "@") {
|
if lastColon > lastSlash {
|
||||||
return image[:lastColon], image[lastColon+1:]
|
return image[:lastColon], image[lastColon+1:]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestSplitImageReference(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
image string
|
||||||
|
fallback string
|
||||||
|
wantImage string
|
||||||
|
wantTag string
|
||||||
|
}{
|
||||||
|
{"empty uses fallback tag", "", "latest", "", "latest"},
|
||||||
|
{"bare image", "nginx", "latest", "nginx", "latest"},
|
||||||
|
{"tagged image", "nginx:1.27", "latest", "nginx", "1.27"},
|
||||||
|
{"registry with port untagged", "registry.local:5000/app", "latest", "registry.local:5000/app", "latest"},
|
||||||
|
{"registry with port tagged", "registry.local:5000/app:v2", "latest", "registry.local:5000/app", "v2"},
|
||||||
|
{"digest stays whole", "nginx@sha256:abc123", "latest", "nginx@sha256:abc123", "latest"},
|
||||||
|
{"tag and digest", "nginx:1.27@sha256:abc", "latest", "nginx:1.27@sha256:abc", "latest"},
|
||||||
|
{"namespaced tagged", "ghcr.io/owner/repo:dev", "latest", "ghcr.io/owner/repo", "dev"},
|
||||||
|
}
|
||||||
|
for _, tc := range cases {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
img, tag := splitImageReference(tc.image, tc.fallback)
|
||||||
|
if img != tc.wantImage || tag != tc.wantTag {
|
||||||
|
t.Fatalf("splitImageReference(%q, %q) = (%q, %q), want (%q, %q)",
|
||||||
|
tc.image, tc.fallback, img, tag, tc.wantImage, tc.wantTag)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMapEngineStatusToDBStatus(t *testing.T) {
|
||||||
|
cases := map[string]string{
|
||||||
|
"running": "deployed",
|
||||||
|
"building": "building",
|
||||||
|
"failed": "failed",
|
||||||
|
"cancelled": "cancelled",
|
||||||
|
"queued": "queued",
|
||||||
|
}
|
||||||
|
for in, want := range cases {
|
||||||
|
if got := mapEngineStatusToDBStatus(in); got != want {
|
||||||
|
t.Fatalf("mapEngineStatusToDBStatus(%q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in new issue
Block a user