Fix Unmarshall of the shared-deps for linting

Use strict to make sure we have the proper Dependency Signed-off-by: Itxaka <[email protected]>
rancher-sandbox · Apr 12, 2021 · 8582bb0 · 8582bb0
1 parent 26700a8
commit 8582bb0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/pkg/lint/rules/annotations.go b/pkg/lint/rules/annotations.go
@@ -74,7 +74,7 @@ func validateChartHypperSharedDeps(chart *helmChart.Metadata) error {
 func validateChartHypperSharedDepsCorrect(chart *helmChart.Metadata) error {
 	depList := chart.Annotations["hypper.cattle.io/shared-dependencies"]
 	var yamlDeps []*helmChart.Dependency
-	if err := yaml.Unmarshal([]byte(depList), &yamlDeps); err != nil {
+	if err := yaml.UnmarshalStrict([]byte(depList), &yamlDeps); err != nil {
 		return errors.New("Shared dependencies list is broken, please check the correct format")
 	}
 	return nil

diff --git a/pkg/lint/rules/testdata/badchartbrokenhypperdeps/Chart.yaml b/pkg/lint/rules/testdata/badchartbrokenhypperdeps/Chart.yaml
@@ -7,5 +7,6 @@ appVersion: "1.16.0"
 annotations:
   "hypper.cattle.io/release-name": "release"
   "hypper.cattle.io/namespace": "namespace"
-  "hypper.cattle.io/shared-dependencies": "jojo"
+  "hypper.cattle.io/shared-dependencies": |
+    - what: ever
 
diff --git a/pkg/lint/rules/testdata/goodchart/Chart.yaml b/pkg/lint/rules/testdata/goodchart/Chart.yaml
@@ -9,4 +9,4 @@ annotations:
   "hypper.cattle.io/release-name": "release"
   "hypper.cattle.io/namespace": "namespace"
   "hypper.cattle.io/shared-dependencies": |
-    - key: value
+    - name: shareddep