Issue #615 - adjusted test data missed in previous commit

nephio-project/nephio#615
Nordix · Dec 17, 2024 · 60cb107 · 60cb107
1 parent aa7a45f
commit 60cb107
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 36 deletions.
diff --git a/pkg/kpt/kptfileutil/util_test.go b/pkg/kpt/kptfileutil/util_test.go
@@ -1151,27 +1151,27 @@ metadata:
   name: pipeline
 pipeline:
   mutators:
-  - image: gcr.io/kpt-fn/search-replace:v0.1
+  - name: my-new-function
+    image: gcr.io/kpt-fn/search-replace:v0.1
     configMap:
       by-value: YOUR_TEAM
       put-value: my-team
-    name: my-new-function
-  - image: gcr.io/kpt-fn/generate-folders:v0.1
-    name: gf1
-  - image: gcr.io/kpt-fn/search-replace:v0.1
+  - name: gf1
+    image: gcr.io/kpt-fn/generate-folders:v0.1
+  - name: sr1
+    image: gcr.io/kpt-fn/search-replace:v0.1
     configMap:
       by-value: foo
       put-value: bar-new
-    name: sr1
-  - image: gcr.io/kpt-fn/set-labels:v0.1
+  - name: sl1
+    image: gcr.io/kpt-fn/set-labels:v0.1
     configMap:
       app: db
-    name: sl1
-  - image: gcr.io/kpt-fn/search-replace:v0.1
+  - name: sr2
+    image: gcr.io/kpt-fn/search-replace:v0.1
     configMap:
       by-value: abc
       put-comment: ${updated-setter-name}
-    name: sr2
 `,
 		},
 
@@ -1215,10 +1215,10 @@ metadata:
   name: pipeline
 pipeline:
   mutators:
-  - image: gcr.io/kpt/folder-ref
-    name: folder-ref
-  - image: gcr.io/kpt/gen-folders
-    name: gen-folders
+  - name: folder-ref
+    image: gcr.io/kpt/folder-ref
+  - name: gen-folders
+    image: gcr.io/kpt/gen-folders
 `,
 		},
 
@@ -1264,14 +1264,14 @@ metadata:
   name: pipeline
 pipeline:
   mutators:
-  - image: x-gcr.io/kpt/gen-folders
-    name: x-local
-  - image: b-gcr.io/kpt/gen-folders
-    name: b-local
-  - image: z-gcr.io/kpt/gen-folders
-    name: z-upstream
-  - image: a-gcr.io/kpt/gen-folders
-    name: a-upstream
+  - name: x-local
+    image: x-gcr.io/kpt/gen-folders
+  - name: b-local
+    image: b-gcr.io/kpt/gen-folders
+  - name: z-upstream
+    image: z-gcr.io/kpt/gen-folders
+  - name: a-upstream
+    image: a-gcr.io/kpt/gen-folders
 `,
 		},
 
@@ -1320,15 +1320,15 @@ metadata:
   name: pipeline
 pipeline:
   mutators:
-  - image: gcr.io/kpt/ref-folders
+  - name: ref-folders
+    image: gcr.io/kpt/ref-folders
     configMap:
       bar: foo
       foo: bar
-    name: ref-folders
-  - image: gcr.io/kpt/gen-folders
-    name: gen-folder-local
-  - image: gcr.io/kpt/gen-folders
-    name: gen-folder-upstream
+  - name: gen-folder-local
+    image: gcr.io/kpt/gen-folders
+  - name: gen-folder-upstream
+    image: gcr.io/kpt/gen-folders
 `,
 		},
 
@@ -1372,10 +1372,10 @@ metadata:
   name: pipeline
 pipeline:
   mutators:
-  - image: gcr.io/kpt/ref-folders
+  - name: ref-folders
+    image: gcr.io/kpt/ref-folders
     configMap:
       band: sleater-kinney
-    name: ref-folders
 `,
 		},
 	}

diff --git a/pkg/task/testdata/replace/Kptfile b/pkg/task/testdata/replace/Kptfile
@@ -15,9 +15,9 @@ metadata:
 pipeline:
   # Kptfile mutators
   mutators:
-  - configMap:
-      name: updated-bucket-name
-      namespace: updated-namespace
-      project-id: updated-project-id
-      storage-class: updated-storage-class
-    image: gcr.io/kpt-fn/apply-setters:v0.2.0
+    - configMap:
+        name: updated-bucket-name # line comment
+        namespace: updated-namespace
+        project-id: updated-project-id
+        storage-class: updated-storage-class
+      image: gcr.io/kpt-fn/apply-setters:v0.2.0