From 3a2c71c4ba4e2f21f0845a1ae9b7957f1cddec59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles-Edouard=20Br=C3=A9t=C3=A9ch=C3=A9?=
 <charles.edouard@nirmata.com>
Date: Tue, 29 Aug 2023 21:28:26 +0200
Subject: [PATCH] fix: remove cli manifest commands (#8165)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
---
 CHANGELOG.md                                  |  1 +
 .../kubectl-kyverno/test/manifest/mutate.go   | 21 -------------------
 .../kubectl-kyverno/test/manifest/print.go    |  7 -------
 .../kubectl-kyverno/test/manifest/validate.go | 20 ------------------
 cmd/cli/kubectl-kyverno/test/test_command.go  | 21 ++++++-------------
 5 files changed, 7 insertions(+), 63 deletions(-)
 delete mode 100644 cmd/cli/kubectl-kyverno/test/manifest/mutate.go
 delete mode 100644 cmd/cli/kubectl-kyverno/test/manifest/print.go
 delete mode 100644 cmd/cli/kubectl-kyverno/test/manifest/validate.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 062b8aaf5e..a9200e3e94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Note
 
+- Remove CLI `kyverno test manifest ...` commands (replaced by `kyverno create ...`).
 - Added `--caSecretName` and `--tlsSecretName` flags to control names of certificate related secrets.
 - Added match conditions support in kyverno config map.
 - Deprecated flag `--imageSignatureRepository`. Will be removed in 1.12. Use per rule configuration `verifyImages.Repository` instead.
diff --git a/cmd/cli/kubectl-kyverno/test/manifest/mutate.go b/cmd/cli/kubectl-kyverno/test/manifest/mutate.go
deleted file mode 100644
index 1d10e149fd..0000000000
--- a/cmd/cli/kubectl-kyverno/test/manifest/mutate.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package manifest
-
-func PrintValidate() {
-	print(`
-name: <test_name>
-policies:
-  - <path/to/policy1.yaml>
-  - <path/to/policy2.yaml>
-resources:
-  - <path/to/resource1.yaml>
-  - <path/to/resource2.yaml>
-variables: <variable_file> (OPTIONAL)
-results:
-  - policy: <name> (For Namespaced [Policy] files, format is <policy_namespace>/<policy_name>)
-    rule: <name>
-    resource: <name>
-    namespace: <name> (OPTIONAL)
-    kind: <name>
-    patchedResource: <path/to/patched/resource.yaml>
-    result: <pass|fail|skip>`)
-}
diff --git a/cmd/cli/kubectl-kyverno/test/manifest/print.go b/cmd/cli/kubectl-kyverno/test/manifest/print.go
deleted file mode 100644
index 2bef6e398a..0000000000
--- a/cmd/cli/kubectl-kyverno/test/manifest/print.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package manifest
-
-import "fmt"
-
-func print(manifest string) {
-	fmt.Println(manifest)
-}
diff --git a/cmd/cli/kubectl-kyverno/test/manifest/validate.go b/cmd/cli/kubectl-kyverno/test/manifest/validate.go
deleted file mode 100644
index e3ccaac6ec..0000000000
--- a/cmd/cli/kubectl-kyverno/test/manifest/validate.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package manifest
-
-func PrintMutate() {
-	print(`
-name: <test_name>
-policies:
-  - <path/to/policy1.yaml>
-  - <path/to/policy2.yaml>
-resources:
-  - <path/to/resource1.yaml>
-  - <path/to/resource2.yaml>
-variables: <variable_file> (OPTIONAL)
-results:
-  - policy: <name> (For Namespaced [Policy] files, format is <policy_namespace>/<policy_name>)
-    rule: <name>
-    resource: <name>
-    namespace: <name> (OPTIONAL)
-    kind: <name>
-    result: <pass|fail|skip>`)
-}
diff --git a/cmd/cli/kubectl-kyverno/test/test_command.go b/cmd/cli/kubectl-kyverno/test/test_command.go
index 76bc6d6185..639657b4d0 100644
--- a/cmd/cli/kubectl-kyverno/test/test_command.go
+++ b/cmd/cli/kubectl-kyverno/test/test_command.go
@@ -6,7 +6,6 @@ import (
 
 	policyreportv1alpha2 "github.com/kyverno/kyverno/api/policyreport/v1alpha2"
 	"github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/test/api"
-	"github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/test/manifest"
 	"github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/color"
 	"github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/output/table"
 	sanitizederror "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/sanitizedError"
@@ -21,7 +20,7 @@ func Command() *cobra.Command {
 	var cmd *cobra.Command
 	var testCase string
 	var fileName, gitBranch string
-	var registryAccess, failOnly, removeColor, manifestValidate, manifestMutate, detailedResults bool
+	var registryAccess, failOnly, removeColor, detailedResults bool
 	cmd = &cobra.Command{
 		Use: "test <path_to_folder_Containing_test.yamls> [flags]\n  kyverno test <path_to_gitRepository_with_dir> --git-branch <branchName>\n  kyverno test --manifest-mutate > kyverno-test.yaml\n  kyverno test --manifest-validate > kyverno-test.yaml",
 		// Args:    cobra.ExactArgs(1),
@@ -38,17 +37,11 @@ func Command() *cobra.Command {
 					}
 				}
 			}()
-			if manifestMutate {
-				manifest.PrintMutate()
-			} else if manifestValidate {
-				manifest.PrintValidate()
-			} else {
-				store.SetRegistryAccess(registryAccess)
-				_, err = testCommandExecute(dirPath, fileName, gitBranch, testCase, failOnly, false, detailedResults)
-				if err != nil {
-					log.Log.V(3).Info("a directory is required")
-					return err
-				}
+			store.SetRegistryAccess(registryAccess)
+			_, err = testCommandExecute(dirPath, fileName, gitBranch, testCase, failOnly, false, detailedResults)
+			if err != nil {
+				log.Log.V(3).Info("a directory is required")
+				return err
 			}
 			return nil
 		},
@@ -56,8 +49,6 @@ func Command() *cobra.Command {
 	cmd.Flags().StringVarP(&fileName, "file-name", "f", "kyverno-test.yaml", "test filename")
 	cmd.Flags().StringVarP(&gitBranch, "git-branch", "b", "", "test github repository branch")
 	cmd.Flags().StringVarP(&testCase, "test-case-selector", "t", "", `run some specific test cases by passing a string argument in double quotes to this flag like - "policy=<policy_name>, rule=<rule_name>, resource=<resource_name". The argument could be any combination of policy, rule and resource.`)
-	cmd.Flags().BoolVar(&manifestMutate, "manifest-mutate", false, "prints out a template test manifest for a mutate policy")
-	cmd.Flags().BoolVar(&manifestValidate, "manifest-validate", false, "prints out a template test manifest for a validate policy")
 	cmd.Flags().BoolVar(&registryAccess, "registry", false, "If set to true, access the image registry using local docker credentials to populate external data")
 	cmd.Flags().BoolVar(&failOnly, "fail-only", false, "If set to true, display all the failing test only as output for the test command")
 	cmd.Flags().BoolVar(&removeColor, "remove-color", false, "Remove any color from output")