fix: error manifests discovery error (#483)

Signed-off-by: Charles-Edouard Brétéché <[email protected]>
kyverno · Nov 24, 2023 · da9d9de · da9d9de
1 parent 4ce7aeb
commit da9d9de
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/.release-notes/main.md b/.release-notes/main.md
@@ -25,3 +25,4 @@ Release notes for `TODO`.
 - Fixed a kuttl migration failure in case of unsupported file name
 - Fixed a potential invalid name when migrating a kuttl test step
 - Fixed a manifest discovery issue where manifests could be loaded in the wrong order
+- Fixed a manifest discovery issue where error manifests where not discovered correctly
diff --git a/pkg/discovery/discovery_test.go b/pkg/discovery/discovery_test.go
@@ -94,7 +94,7 @@ func TestDiscoverTests(t *testing.T) {
 							}, {
 								Error: &v1alpha1.Error{
 									FileRef: v1alpha1.FileRef{
-										File: "01-error.yaml",
+										File: "01-errors.yaml",
 									},
 								},
 							}},

diff --git a/pkg/discovery/load.go b/pkg/discovery/load.go
@@ -111,7 +111,7 @@ func LoadTest(fileName string, path string) (*Test, error) {
 				switch groups[2] {
 				case "assert":
 					assertFiles = append(assertFiles, file)
-				case "error":
+				case "errors":
 					errorFiles = append(errorFiles, file)
 				default:
 					otherFiles = append(otherFiles, file)
@@ -140,7 +140,7 @@ func LoadTest(fileName string, path string) (*Test, error) {
 							FileRef: fileRef,
 						},
 					})
-				case "error":
+				case "errors":
 					step.Spec.Try = append(step.Spec.Try, v1alpha1.Operation{
 						Error: &v1alpha1.Error{
 							FileRef: fileRef,

diff --git a/pkg/discovery/load_test.go b/pkg/discovery/load_test.go
@@ -253,7 +253,7 @@ func TestLoadTest(t *testing.T) {
 							}, {
 								Error: &v1alpha1.Error{
 									FileRef: v1alpha1.FileRef{
-										File: "01-error.yaml",
+										File: "01-errors.yaml",
 									},
 								},
 							}},
@@ -298,7 +298,7 @@ func TestLoadTest(t *testing.T) {
 							}, {
 								Error: &v1alpha1.Error{
 									FileRef: v1alpha1.FileRef{
-										File: "01-error.yaml",
+										File: "01-errors.yaml",
 									},
 								},
 							}},

diff --git a/testdata/discovery/manifests/01-error.yaml → testdata/discovery/manifests/01-errors.yaml b/testdata/discovery/manifests/01-error.yaml → testdata/discovery/manifests/01-errors.yaml
diff --git a/...scovery/steps-and-manifests/01-error.yaml → ...covery/steps-and-manifests/01-errors.yaml b/...scovery/steps-and-manifests/01-error.yaml → ...covery/steps-and-manifests/01-errors.yaml
diff --git a/testdata/kuttl/01-step.chainsaw.yaml b/testdata/kuttl/01-step.chainsaw.yaml
@@ -20,12 +20,10 @@ spec:
       apiVersion: v1
       kind: Pod
   - script:
-      check: null
       content: echo "hello world"
       skipLogOutput: true
   - command:
       args:
       - hello world
-      check: null
       entrypoint: echo
       skipLogOutput: true