improvements based on feedbacks

Signed-off-by: Batuhan Apaydın <batuhan.apaydin@trendyol.com>

cmd/crane/cmd/mutate.go

@@ -54,7 +54,7 @@ func NewCmdMutate(options *[]crane.Option) *cobra.Command {
 				cfg.Config.Labels = map[string]string{}
 			}
 
-			labels, err := splitKeyValuePairsInFormOfAnEqualSign(lbls)
+			labels, err := splitKeyVals(lbls)
 			if err != nil {
 				log.Fatal(err)
 			}
@@ -63,7 +63,7 @@ func NewCmdMutate(options *[]crane.Option) *cobra.Command {
 				cfg.Config.Labels[k] = v
 			}
 
-			annotations, err := splitKeyValuePairsInFormOfAnEqualSign(anntns)
+			annotations, err := splitKeyVals(anntns)
 			if err != nil {
 				log.Fatal(err)
 			}
@@ -81,9 +81,9 @@ func NewCmdMutate(options *[]crane.Option) *cobra.Command {
 			}
 
 			// Mutate and write image.
-			img, err = mutate.ManifestAnnotations(img, annotations)
+			img, err = mutate.Annotations(img, annotations)
 			if err != nil {
-				log.Fatalf("mutating config: %v", err)
+				log.Fatalf("mutating annotations: %v", err)
 			}
 
 			// If the new ref isn't provided, write over the original image.
@@ -117,7 +117,8 @@ func NewCmdMutate(options *[]crane.Option) *cobra.Command {
 	return mutateCmd
 }
 
-func splitKeyValuePairsInFormOfAnEqualSign(kvPairs []string) (map[string]string, error) {
+// splitKeyVals splits key value pairs which is in form hello=world
+func splitKeyVals(kvPairs []string) (map[string]string, error) {
 	m := map[string]string{}
 	for _, l := range kvPairs {
 		parts := strings.SplitN(l, "=", 2)

pkg/v1/mutate/mutate.go

@@ -113,14 +113,14 @@ func Config(base v1.Image, cfg v1.Config) (v1.Image, error) {
 	return ConfigFile(base, cf)
 }
 
-// ManifestAnnotations mutates the provided v1.Image to have the provided annotations
-func ManifestAnnotations(base v1.Image, annotations map[string]string) (v1.Image, error) {
+// Annotations mutates the provided v1.Image to have the provided annotations
+func Annotations(base v1.Image, annotations map[string]string) (v1.Image, error) {
 	m, err := base.Manifest()
 	if err != nil {
 		return nil, err
 	}
 
-	if len(m.Annotations) < 1 {
+	if m.Annotations == nil {
 		m.Annotations = map[string]string{}
 	}
 
@@ -133,7 +133,7 @@ func ManifestAnnotations(base v1.Image, annotations map[string]string) (v1.Image
 		manifest: m.DeepCopy(),
 	}
 
-	return image, err
+	return image, nil
 }
 
 // ConfigFile mutates the provided v1.Image to have the provided v1.ConfigFile

pkg/v1/mutate/mutate_test.go

@@ -266,20 +266,16 @@ func TestMutateConfig(t *testing.T) {
 	}
 }
 
-func TestMutateManifestAnnotations(t *testing.T) {
+func TestAnnotations(t *testing.T) {
 	source := sourceImage(t)
 
 	newAnnotations := map[string]string{
 		"im.the.first.annotation": "hello world",
 	}
 
-	result, err := mutate.ManifestAnnotations(source, newAnnotations)
+	result, err := mutate.Annotations(source, newAnnotations)
 	if err != nil {
-		t.Fatalf("failed to mutate a config: %v", err)
-	}
-
-	if manifestsAreEqual(t, source, result) {
-		t.Error("mutating the manifest annotations MUST mutate the manifest")
+		t.Fatalf("failed to mutate annotations: %v", err)
 	}
 
 	if configDigestsAreEqual(t, source, result) {