From afd736428fcec48027dc0987fccb5e77f18e6b1c 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 20:20:17 +0200
Subject: [PATCH] chore: create cli pathutils package (#8164)
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>
---
 cmd/cli/kubectl-kyverno/test/test.go       | 27 +++++-----------------
 cmd/cli/kubectl-kyverno/utils/path/path.go | 24 +++++++++++++++++++
 2 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 cmd/cli/kubectl-kyverno/utils/path/path.go

diff --git a/cmd/cli/kubectl-kyverno/test/test.go b/cmd/cli/kubectl-kyverno/test/test.go
index e827b77a53..58401f3cea 100644
--- a/cmd/cli/kubectl-kyverno/test/test.go
+++ b/cmd/cli/kubectl-kyverno/test/test.go
@@ -3,7 +3,6 @@ package test
 import (
 	"fmt"
 	"os"
-	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -14,6 +13,7 @@ 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/utils/common"
+	pathutils "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/path"
 	sanitizederror "github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/sanitizedError"
 	"github.com/kyverno/kyverno/cmd/cli/kubectl-kyverno/utils/store"
 	"github.com/kyverno/kyverno/pkg/autogen"
@@ -81,17 +81,17 @@ func applyPoliciesFromPath(
 		}
 	}
 
-	policyFullPath := getFullPath(values.Policies, policyResourcePath, isGit)
-	resourceFullPath := getFullPath(values.Resources, policyResourcePath, isGit)
+	policyFullPath := pathutils.GetFullPaths(values.Policies, policyResourcePath, isGit)
+	resourceFullPath := pathutils.GetFullPaths(values.Resources, policyResourcePath, isGit)
 
 	for i, result := range values.Results {
 		arrPatchedResource := []string{result.PatchedResource}
 		arrGeneratedResource := []string{result.GeneratedResource}
 		arrCloneSourceResource := []string{result.CloneSourceResource}
 
-		patchedResourceFullPath := getFullPath(arrPatchedResource, policyResourcePath, isGit)
-		generatedResourceFullPath := getFullPath(arrGeneratedResource, policyResourcePath, isGit)
-		CloneSourceResourceFullPath := getFullPath(arrCloneSourceResource, policyResourcePath, isGit)
+		patchedResourceFullPath := pathutils.GetFullPaths(arrPatchedResource, policyResourcePath, isGit)
+		generatedResourceFullPath := pathutils.GetFullPaths(arrGeneratedResource, policyResourcePath, isGit)
+		CloneSourceResourceFullPath := pathutils.GetFullPaths(arrCloneSourceResource, policyResourcePath, isGit)
 
 		values.Results[i].PatchedResource = patchedResourceFullPath[0]
 		values.Results[i].GeneratedResource = generatedResourceFullPath[0]
@@ -253,21 +253,6 @@ func applyPoliciesFromPath(
 	return resultsMap, testResults, nil
 }
 
-func getFullPath(paths []string, policyResourcePath string, isGit bool) []string {
-	var pols []string
-	if !isGit {
-		for _, path := range paths {
-			if !filepath.IsAbs(path) {
-				pols = append(pols, filepath.Join(policyResourcePath, path))
-			} else {
-				pols = append(pols, path)
-			}
-		}
-		return pols
-	}
-	return paths
-}
-
 func selectResourcesForCheck(resources []*unstructured.Unstructured, values *api.Test) []*unstructured.Unstructured {
 	res, _, _ := selectResourcesForCheckInternal(resources, values)
 	return res
diff --git a/cmd/cli/kubectl-kyverno/utils/path/path.go b/cmd/cli/kubectl-kyverno/utils/path/path.go
new file mode 100644
index 0000000000..72769bf54e
--- /dev/null
+++ b/cmd/cli/kubectl-kyverno/utils/path/path.go
@@ -0,0 +1,24 @@
+package path
+
+import (
+	"path/filepath"
+)
+
+func GetFullPath(path string, basePath string) string {
+	if !filepath.IsAbs(path) {
+		return filepath.Join(basePath, path)
+	} else {
+		return path
+	}
+}
+
+func GetFullPaths(paths []string, basePath string, git bool) []string {
+	if git {
+		return paths
+	}
+	var out []string
+	for _, path := range paths {
+		out = append(out, GetFullPath(path, basePath))
+	}
+	return out
+}