diff --git a/cmd/cli/kubectl-kyverno/apply/apply_command.go b/cmd/cli/kubectl-kyverno/apply/apply_command.go index 87f05ac7d9..92c425ce69 100644 --- a/cmd/cli/kubectl-kyverno/apply/apply_command.go +++ b/cmd/cli/kubectl-kyverno/apply/apply_command.go @@ -17,6 +17,7 @@ import ( "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/common" reportutils "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/report" sanitizederror "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/sanitizedError" + "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/source" "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/store" "github.com/kyverno/kyverno/pkg/autogen" "github.com/kyverno/kyverno/pkg/clients/dclient" @@ -381,7 +382,7 @@ func (c *ApplyCommandConfig) loadPolicies(skipInvalidPolicies SkippedInvalidPoli for _, policy := range c.PolicyPaths { policyPaths := []string{policy} - isGit := common.IsGitSourcePath(policyPaths) + isGit := source.IsGit(policy) if isGit { gitSourceURL, err := url.Parse(policyPaths[0]) diff --git a/cmd/cli/kubectl-kyverno/utils/common/common.go b/cmd/cli/kubectl-kyverno/utils/common/common.go index e9713bc3f7..9eeb79bed4 100644 --- a/cmd/cli/kubectl-kyverno/utils/common/common.go +++ b/cmd/cli/kubectl-kyverno/utils/common/common.go @@ -17,6 +17,7 @@ import ( "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/test/api" annotationsutils "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/annotations" sanitizederror "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/sanitizedError" + "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/source" "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/store" "github.com/kyverno/kyverno/pkg/autogen" "github.com/kyverno/kyverno/pkg/background/generate" @@ -78,7 +79,7 @@ func GetPolicies(paths []string) (policies []kyvernov1.PolicyInterface, validati err error ) - isHTTPPath := IsHTTPRegex.MatchString(path) + isHTTPPath := source.IsHttp(path) // path clean and retrieving file info can be possible if it's not an HTTP URL if !isHTTPPath { @@ -169,12 +170,6 @@ func GetPolicies(paths []string) (policies []kyvernov1.PolicyInterface, validati return policies, validatingAdmissionPolicies, errors } -// IsInputFromPipe - check if input is passed using pipe -func IsInputFromPipe() bool { - fileInfo, _ := os.Stdin.Stat() - return fileInfo.Mode()&os.ModeCharDevice == 0 -} - // RemoveDuplicateAndObjectVariables - remove duplicate variables func RemoveDuplicateAndObjectVariables(matches [][]string) string { var variableStr string @@ -251,7 +246,7 @@ func GetPoliciesFromPaths(fs billy.Filesystem, dirPath []string, isGit bool, pol } } else { if len(dirPath) > 0 && dirPath[0] == "-" { - if IsInputFromPipe() { + if source.IsStdin() { policyStr := "" scanner := bufio.NewScanner(os.Stdin) for scanner.Scan() { @@ -294,7 +289,7 @@ func GetResourceAccordingToResourcePath(fs billy.Filesystem, resourcePaths []str } } else { if len(resourcePaths) > 0 && resourcePaths[0] == "-" { - if IsInputFromPipe() { + if source.IsStdin() { resourceStr := "" scanner := bufio.NewScanner(os.Stdin) for scanner.Scan() { @@ -661,10 +656,6 @@ func GetUserInfoFromPath(fs billy.Filesystem, path string, isGit bool, policyRes return *userInfo, nil } -func IsGitSourcePath(policyPaths []string) bool { - return strings.Contains(policyPaths[0], "https://") -} - func GetGitBranchOrPolicyPaths(gitBranch, repoURL string, policyPaths []string) (string, string) { var gitPathToYamls string if gitBranch == "" { diff --git a/cmd/cli/kubectl-kyverno/utils/common/common_test.go b/cmd/cli/kubectl-kyverno/utils/common/common_test.go index 0d719782fe..4503263d17 100644 --- a/cmd/cli/kubectl-kyverno/utils/common/common_test.go +++ b/cmd/cli/kubectl-kyverno/utils/common/common_test.go @@ -118,38 +118,6 @@ func Test_NamespaceSelector(t *testing.T) { } } -func Test_IsGitSourcePath(t *testing.T) { - type TestCase struct { - path []string - actual bool - desired bool - } - testcases := []TestCase{ - { - path: []string{"https://github.com/kyverno/policies/openshift/team-validate-ns-name/"}, - desired: true, - }, - { - path: []string{"/kyverno/policies/openshift/team-validate-ns-name/"}, - desired: false, - }, - { - path: []string{"https://bitbucket.org/kyverno/policies/openshift/team-validate-ns-name"}, - desired: true, - }, - { - path: []string{"https://anydomain.com/kyverno/policies/openshift/team-validate-ns-name"}, - desired: true, - }, - } - for _, tc := range testcases { - tc.actual = IsGitSourcePath(tc.path) - if tc.actual != tc.desired { - t.Errorf("%s is not a git URL", tc.path) - } - } -} - func Test_GetGitBranchOrPolicyPaths(t *testing.T) { type TestCase struct { gitBranch string diff --git a/cmd/cli/kubectl-kyverno/utils/common/fetch.go b/cmd/cli/kubectl-kyverno/utils/common/fetch.go index 932d559186..2ac369ab56 100644 --- a/cmd/cli/kubectl-kyverno/utils/common/fetch.go +++ b/cmd/cli/kubectl-kyverno/utils/common/fetch.go @@ -13,6 +13,7 @@ import ( "github.com/go-git/go-billy/v5" kyvernov1 "github.com/kyverno/kyverno/api/kyverno/v1" "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/test/api" + "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/source" "github.com/kyverno/kyverno/pkg/autogen" "github.com/kyverno/kyverno/pkg/clients/dclient" kubeutils "github.com/kyverno/kyverno/pkg/utils/kube" @@ -246,7 +247,7 @@ func getFileBytes(path string) ([]byte, error) { err error ) - if IsHTTPRegex.MatchString(path) { + if source.IsHttp(path) { // We accept here that a random URL might be called based on user provided input. req, err := http.NewRequestWithContext(context.TODO(), http.MethodGet, path, nil) if err != nil { diff --git a/cmd/cli/kubectl-kyverno/utils/common/regex.go b/cmd/cli/kubectl-kyverno/utils/common/regex.go index 22bb210702..8e74c25494 100644 --- a/cmd/cli/kubectl-kyverno/utils/common/regex.go +++ b/cmd/cli/kubectl-kyverno/utils/common/regex.go @@ -6,6 +6,3 @@ import ( // RegexVariables represents regex for '{{}}' var RegexVariables = regexp.MustCompile(`\{\{[^{}]*\}\}`) - -// IsHTTPRegex represents regex for starts with http:// or https:// -var IsHTTPRegex = regexp.MustCompile("^(http|https)://") diff --git a/cmd/cli/kubectl-kyverno/utils/source/git.go b/cmd/cli/kubectl-kyverno/utils/source/git.go new file mode 100644 index 0000000000..4a8cc6730f --- /dev/null +++ b/cmd/cli/kubectl-kyverno/utils/source/git.go @@ -0,0 +1,5 @@ +package source + +func IsGit(in string) bool { + return IsHttp(in) +} diff --git a/cmd/cli/kubectl-kyverno/utils/source/git_test.go b/cmd/cli/kubectl-kyverno/utils/source/git_test.go new file mode 100644 index 0000000000..b82d7451a1 --- /dev/null +++ b/cmd/cli/kubectl-kyverno/utils/source/git_test.go @@ -0,0 +1,38 @@ +package source + +import "testing" + +func TestIsGit(t *testing.T) { + tests := []struct { + name string + in string + want bool + }{{ + name: "empty", + in: "", + want: false, + }, { + name: "http", + in: "http://github.com/kyverno/policies", + want: true, + }, { + name: "https", + in: "https://github.com/kyverno/policies", + want: true, + }, { + name: "local path", + in: "/github.com/kyverno/policies", + want: false, + }, { + name: "local path", + in: "/https/kyverno/policies", + want: false, + }} + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := IsGit(tt.in); got != tt.want { + t.Errorf("IsGit() = %v, want %v", got, tt.want) + } + }) + } +} diff --git a/cmd/cli/kubectl-kyverno/utils/source/http.go b/cmd/cli/kubectl-kyverno/utils/source/http.go new file mode 100644 index 0000000000..ccba59e38a --- /dev/null +++ b/cmd/cli/kubectl-kyverno/utils/source/http.go @@ -0,0 +1,11 @@ +package source + +import ( + "regexp" +) + +var isHTTPRegex = regexp.MustCompile("^(http|https)://") + +func IsHttp(in string) bool { + return isHTTPRegex.MatchString(in) +} diff --git a/cmd/cli/kubectl-kyverno/utils/source/http_test.go b/cmd/cli/kubectl-kyverno/utils/source/http_test.go new file mode 100644 index 0000000000..fb2c6f04e7 --- /dev/null +++ b/cmd/cli/kubectl-kyverno/utils/source/http_test.go @@ -0,0 +1,38 @@ +package source + +import "testing" + +func TestIsHttp(t *testing.T) { + tests := []struct { + name string + in string + want bool + }{{ + name: "empty", + in: "", + want: false, + }, { + name: "http", + in: "http://github.com/kyverno/policies", + want: true, + }, { + name: "https", + in: "https://github.com/kyverno/policies", + want: true, + }, { + name: "local path", + in: "/github.com/kyverno/policies", + want: false, + }, { + name: "local path", + in: "/https/kyverno/policies", + want: false, + }} + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := IsHttp(tt.in); got != tt.want { + t.Errorf("IsHttp() = %v, want %v", got, tt.want) + } + }) + } +} diff --git a/cmd/cli/kubectl-kyverno/utils/source/stdin.go b/cmd/cli/kubectl-kyverno/utils/source/stdin.go new file mode 100644 index 0000000000..42f6995351 --- /dev/null +++ b/cmd/cli/kubectl-kyverno/utils/source/stdin.go @@ -0,0 +1,13 @@ +package source + +import ( + "os" +) + +func IsStdin() bool { + fileInfo, err := os.Stdin.Stat() + if err != nil { + return false + } + return fileInfo.Mode()&os.ModeCharDevice == 0 +} diff --git a/cmd/cli/kubectl-kyverno/utils/source/stdin_test.go b/cmd/cli/kubectl-kyverno/utils/source/stdin_test.go new file mode 100644 index 0000000000..4ef69c294d --- /dev/null +++ b/cmd/cli/kubectl-kyverno/utils/source/stdin_test.go @@ -0,0 +1,20 @@ +package source + +import "testing" + +func TestIsStdin(t *testing.T) { + tests := []struct { + name string + want bool + }{{ + name: "default", + want: false, + }} + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := IsStdin(); got != tt.want { + t.Errorf("IsInputFromPipe() = %v, want %v", got, tt.want) + } + }) + } +}