Update testdata to handle aliases

docker · Sep 15, 2023 · b09e449 · b09e449
1 parent 103b44c
commit b09e449
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 3 deletions.
diff --git a/manifest/image/list.go b/manifest/image/list.go
@@ -141,13 +141,16 @@ func (l *ImageList) Dedup() error {
 		}
 	})
 
+	l.MakeAliases()
+
+	return nil
+}
+
+func (l *ImageList) MakeAliases() {
 	aliases := NewAliasCache(l.items).MakeAliasesForNames()
-	// TODO: check uniqueness of aliases, use tags and/or digests to disambiguate
 	for i := range aliases {
 		l.items[i].Alias = &aliases[i]
 	}
-
-	return nil
 }
 
 func (l *ImageList) Len() int { return len(l.items) }

diff --git a/manifest/imagecopier/imagecopier_test.go b/manifest/imagecopier/imagecopier_test.go
@@ -63,6 +63,8 @@ func makeImageCopierTest(tc testdata.TestCase) func(t *testing.T) {
 
 		SetNewImageRefs(makeDestination(tc.Description), sha256.New(), tc.Expected)
 
+		images.MakeAliases()
+
 		if tc.Expected != nil {
 			g.Expect(images.Items()).To(ConsistOf(tc.Expected))
 		} else {

diff --git a/manifest/imageresolver/imageresolver_test.go b/manifest/imageresolver/imageresolver_test.go
@@ -41,6 +41,8 @@ func makeImageResolverTest(tc testdata.TestCase) func(t *testing.T) {
 		resolver := NewRegistryResolver(nil)
 		g.Expect(resolver.ResolveDigests(ctx, images)).To(Succeed())
 
+		images.MakeAliases()
+
 		if tc.Expected != nil {
 			g.Expect(images.Items()).To(ConsistOf(tc.Expected))
 		} else {

diff --git a/manifest/packager/packager_test.go b/manifest/packager/packager_test.go
@@ -81,6 +81,8 @@ func makePackagerTest(tc testdata.TestCase) func(t *testing.T) {
 
 		g.Expect(updater.NewFileUpdater().Update(images)).To(Succeed())
 
+		images.MakeAliases()
+
 		if tc.Expected != nil {
 			g.Expect(images.Items()).To(ConsistOf(tc.Expected))
 		} else {

diff --git a/manifest/testdata/testdata.go b/manifest/testdata/testdata.go
@@ -282,6 +282,15 @@ var baseCasesDigests = map[string]string{
 	"ghcr.io/fluxcd/source-controller:v0.31.0":    "sha256:1e0b062d5129a462250eb03c5e8bd09b4cc42e88b25e39e35eee81d7ed2d15c0",
 }
 
+var baseCasesAliases = map[string]string{
+	"ghcr.io/projectcontour/contour:v1.24.1":      "contour",
+	"docker.io/envoyproxy/envoy:v1.25.1":          "envoy",
+	"ghcr.io/fluxcd/kustomize-controller:v0.30.0": "kustomize-controller",
+	"ghcr.io/fluxcd/source-controller:v0.31.0":    "source-controller",
+	"gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/webhook:v0.40.2@sha256:6b8aadbdcede63969ecb719e910b55b7681d87110fc0bf92ca4ee943042f620b":    "webhook",
+	"gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/controller:v0.40.2@sha256:dc7bc7d6607466b502d8dc22ba0598461d7477f608ab68aaff1ff4dedaa04f81": "controller",
+}
+
 func BaseYAMLCases() TestCases {
 	baseCases := make([]TestCase, len(baseYAMLCases))
 	copy(baseCases, baseYAMLCases)
@@ -298,6 +307,12 @@ func BaseYAMLCasesWithDigests(t *testing.T) TestCases {
 				t.Logf("digest not found for %s", c.Expected[e].OriginalRef())
 				t.FailNow()
 			}
+			if alias, ok := baseCasesAliases[c.Expected[e].OriginalRef()]; ok {
+				c.Expected[e].Alias = &alias
+			} else if c.Expected[e].Alias == nil {
+				t.Logf("alias not found for %s", c.Expected[e].OriginalRef())
+				t.FailNow()
+			}
 		}
 		baseCases[i] = c
 	}

diff --git a/manifest/updater/updater_test.go b/manifest/updater/updater_test.go
@@ -70,6 +70,8 @@ func makeUpdaterTest(tc testdata.TestCase) func(t *testing.T) {
 
 		g.Expect(NewFileUpdater().Update(images)).To(Succeed())
 
+		images.MakeAliases()
+
 		if tc.Expected != nil {
 			g.Expect(images.Items()).To(ConsistOf(tc.Expected))
 		} else {