manifest: add support ForceCompressionFormat

Implement containers/image#2068 for libimage/manifest.Push Signed-off-by: Aditya R <[email protected]>
flouthoc · Aug 8, 2023 · 170f138 · 170f138
1 parent a1478d1
commit 170f138
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/libimage/manifest_list.go b/libimage/manifest_list.go
@@ -461,6 +461,7 @@ func (m *ManifestList) Push(ctx context.Context, destination string, options *Ma
 		SignSigstorePrivateKeyPassphrase: options.SignSigstorePrivateKeyPassphrase,
 		RemoveSignatures:                 options.RemoveSignatures,
 		ManifestType:                     options.ManifestMIMEType,
+		ForceCompressionFormat:           options.ForceCompressionFormat,
 	}
 
 	_, d, err := m.list.Push(ctx, dest, pushOptions)

diff --git a/libimage/manifests/manifests.go b/libimage/manifests/manifests.go
@@ -72,6 +72,7 @@ type PushOptions struct {
 	ManifestType                     string                // the format to use when saving the list - possible options are oci, v2s1, and v2s2
 	SourceFilter                     LookupReferenceFunc   // filter the list source
 	AddCompression                   []string              // add existing instances with requested compression algorithms to manifest list
+	ForceCompressionFormat           bool                  // force push with requested compression ignoring the blobs which can be reused.
 }
 
 // Create creates a new list containing information about the specified image,
@@ -259,6 +260,7 @@ func (l *list) Push(ctx context.Context, dest types.ImageReference, options Push
 		SignSigstorePrivateKeyPassphrase: options.SignSigstorePrivateKeyPassphrase,
 		ForceManifestMIMEType:            singleImageManifestType,
 		EnsureCompressionVariantsExist:   compressionVariants,
+		ForceCompressionFormat:           options.ForceCompressionFormat,
 	}
 
 	// Copy whatever we were asked to copy.

diff --git a/libimage/manifests/manifests_test.go b/libimage/manifests/manifests_test.go
@@ -337,4 +337,8 @@ func TestPush(t *testing.T) {
 	options.AddCompression = []string{"zstd"}
 	_, _, err = list.Push(ctx, destRef, options)
 	assert.NoError(t, err, "list.Push(with replication for zstd specified)")
+
+	options.ForceCompressionFormat = true
+	_, _, err = list.Push(ctx, destRef, options)
+	assert.NoError(t, err, "list.Push(with ForceCompressionFormat: true)")
 }