Fix a bug while auto-updating service images, as we were updating a c…

…opy of the image instead of a reference Add regression test Signed-off-by: Silvin Lubecki <[email protected]>
cnabio · Sep 10, 2019 · 7b5c27b · 7b5c27b
1 parent 1552fad
commit 7b5c27b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/remotes/fixup.go b/remotes/fixup.go
@@ -52,10 +52,11 @@ func FixupBundle(ctx context.Context, b *bundle.Bundle, ref reference.Named, res
 		return nil, err
 	}
 	// Fixup images
-	for _, original := range b.Images {
+	for name, original := range b.Images {
 		if err := fixupImage(ctx, &original.BaseImage, relocationMap, cfg, events, cfg.componentImagePlatformFilter); err != nil {
 			return nil, err
 		}
+		b.Images[name] = original
 	}
 
 	logger.Debug("Bundle fixed")

diff --git a/remotes/fixup_test.go b/remotes/fixup_test.go
@@ -40,6 +40,14 @@ func TestFixupBundleWithAutoUpdate(t *testing.T) {
 			},
 			// Target Invocation image manifest descriptor my.registry/namespace/my-app@sha256:beef1aa7866258751a261bae525a1842c7ff0662d4f34a355d5f36826abc0343 for mounting
 			{},
+			// Resolving source service image manifest descriptor my.registry/namespace/my-service
+			{
+				MediaType: ocischemav1.MediaTypeImageManifest,
+				Size:      43,
+				Digest:    "sha256:beef1aa7866258751a261bae525a1842c7ff0662d4f34a355d5f36826abc0344",
+			},
+			// Target service image manifest descriptor my.registry/namespace/my-app@sha256:beef1aa7866258751a261bae525a1842c7ff0662d4f34a355d5f36826abc0344 for mounting
+			{},
 		},
 	}
 	b := &bundle.Bundle{
@@ -52,6 +60,14 @@ func TestFixupBundleWithAutoUpdate(t *testing.T) {
 				},
 			},
 		},
+		Images: map[string]bundle.Image{
+			"my-service": {
+				BaseImage: bundle.BaseImage{
+					Image:     "my.registry/namespace/my-service",
+					ImageType: "docker",
+				},
+			},
+		},
 		Name:    "my-app",
 		Version: "0.1.0",
 	}
@@ -72,6 +88,17 @@ func TestFixupBundleWithAutoUpdate(t *testing.T) {
 				},
 			},
 		},
+		Images: map[string]bundle.Image{
+			"my-service": {
+				BaseImage: bundle.BaseImage{
+					Image:     "my.registry/namespace/my-service",
+					ImageType: "docker",
+					MediaType: ocischemav1.MediaTypeImageManifest,
+					Size:      43,
+					Digest:    "sha256:beef1aa7866258751a261bae525a1842c7ff0662d4f34a355d5f36826abc0344",
+				},
+			},
+		},
 		Name:    "my-app",
 		Version: "0.1.0",
 	}