[v0.17.x] internal/generate/olm-catalog: read only one manifest at a time (#3043)

openshift-cherrypick-robot · web-flow · commit 3a5ec195a380 · 2020-05-14T11:29:16.000-07:00
diff --git a/changelog/fragments/get-csv-manifest-bugfix.yaml b/changelog/fragments/get-csv-manifest-bugfix.yaml
@@ -0,0 +1,9 @@
+# entries is a list of entries to include in
+# release notes and/or the migration guide
+entries:
+  - description: >
+      CSV manifests read from disk are now properly marshaled into the CSV struct
+
+    kind: "bugfix"
+
+    breaking: false
diff --git a/internal/generate/olm-catalog/csv_util.go b/internal/generate/olm-catalog/csv_util.go
@@ -114,7 +114,7 @@ func getCSVFromDir(dir string) (*olmapiv1alpha1.ClusterServiceVersion, error) {
 			}
 			if typeMeta.Kind == olmapiv1alpha1.ClusterServiceVersionKind {
 				csv := &olmapiv1alpha1.ClusterServiceVersion{}
-				if err := yaml.Unmarshal(b, csv); err != nil {
+				if err := yaml.Unmarshal(manifest, csv); err != nil {
 					return nil, fmt.Errorf("error unmarshalling ClusterServiceVersion from manifest %s: %v", path, err)
 				}
 				return csv, nil

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ func getCSVFromDir(dir string) (*olmapiv1alpha1.ClusterServiceVersion, error) {`
`114`	`114`	`}`
`115`	`115`	`if typeMeta.Kind == olmapiv1alpha1.ClusterServiceVersionKind {`
`116`	`116`	`csv := &olmapiv1alpha1.ClusterServiceVersion{}`
`117`		`- if err := yaml.Unmarshal(b, csv); err != nil {`
	`117`	`+ if err := yaml.Unmarshal(manifest, csv); err != nil {`
`118`	`118`	`return nil, fmt.Errorf("error unmarshalling ClusterServiceVersion from manifest %s: %v", path, err)`
`119`	`119`	`}`
`120`	`120`	`return csv, nil`