Merge pull request #2984 from phanimarupaka/FixCmdCfgIssues

Do not print package info in grep
kubernetes-sigs · Sep 15, 2020 · ad7fed0 · ad7fed0
2 parents 00f0fd7 + cea2986
commit ad7fed0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/cmd/config/internal/commands/grep.go b/cmd/config/internal/commands/grep.go
@@ -120,6 +120,7 @@ func (r *GrepRunner) runE(c *cobra.Command, args []string) error {
 		recurseSubPackages: r.RecurseSubPackages,
 		cmdRunner:          r,
 		rootPkgPath:        args[1],
+		skipPkgPathPrint:   true,
 	}
 
 	return e.execute()
@@ -152,5 +153,6 @@ func (r *GrepRunner) executeCmd(w io.Writer, pkgPath string) error {
 			fmt.Fprintf(w, "%s\n", err.Error())
 		}
 	}
+	fmt.Fprintf(w, "---")
 	return nil
 }
diff --git a/cmd/config/internal/commands/grep_test.go b/cmd/config/internal/commands/grep_test.go
@@ -283,8 +283,7 @@ func TestGrepSubPackages(t *testing.T) {
 			name:    "grep-recurse-subpackages",
 			dataset: "dataset-without-setters",
 			args:    []string{"kind=Deployment"},
-			expected: `${baseDir}/mysql/
-# Copyright 2019 The Kubernetes Authors.
+			expected: `# Copyright 2019 The Kubernetes Authors.
 # SPDX-License-Identifier: Apache-2.0
 
 apiVersion: apps/v1
@@ -302,8 +301,7 @@ spec:
       containers:
       - name: mysql
         image: mysql:1.7.9
-
-${baseDir}/mysql/storage/
+---
 # Copyright 2019 The Kubernetes Authors.
 # SPDX-License-Identifier: Apache-2.0
 
@@ -322,15 +320,14 @@ spec:
       containers:
       - name: storage
         image: storage:1.7.7
-`,
+---`,
 		},
 		{
 			name:        "grep-top-level-pkg-no-recurse-subpackages",
 			dataset:     "dataset-without-setters",
 			args:        []string{"kind=Deployment", "-R=false"},
 			packagePath: "mysql",
-			expected: `${baseDir}/mysql/
-# Copyright 2019 The Kubernetes Authors.
+			expected: `# Copyright 2019 The Kubernetes Authors.
 # SPDX-License-Identifier: Apache-2.0
 
 apiVersion: apps/v1
@@ -348,15 +345,14 @@ spec:
       containers:
       - name: mysql
         image: mysql:1.7.9
-`,
+---`,
 		},
 		{
 			name:        "grep-nested-pkg-no-recurse-subpackages",
 			dataset:     "dataset-without-setters",
 			packagePath: "mysql/storage",
 			args:        []string{"kind=Deployment", "-R=false"},
-			expected: `${baseDir}/mysql/storage/
-# Copyright 2019 The Kubernetes Authors.
+			expected: `# Copyright 2019 The Kubernetes Authors.
 # SPDX-License-Identifier: Apache-2.0
 
 apiVersion: apps/v1
@@ -374,7 +370,7 @@ spec:
       containers:
       - name: storage
         image: storage:1.7.7
-`,
+---`,
 		},
 	}
 	for i := range tests {

diff --git a/kyaml/pathutil/pathutil.go b/kyaml/pathutil/pathutil.go
@@ -18,7 +18,7 @@ func DirsWithFile(root, fileName string, recurse bool) ([]string, error) {
 		// else return empty list
 		_, err := os.Stat(filepath.Join(root, fileName))
 		if !os.IsNotExist(err) {
-			res = append(res, root)
+			res = append(res, filepath.Clean(root))
 		}
 		return res, nil
 	}