Merge pull request #1815 from joncwong/rename-kyaml

Rename cmd/kyaml to cmd/config
2026-05-17 18:25:26 +00:00 · 2019-11-21 10:01:29 -08:00
parent d81913de42 14d4059f46
commit 672153f021
29 changed files with 12 additions and 11 deletions
--- a/cmd/config/.golangci.yml
+++ b/cmd/config/.golangci.yml
--- a/cmd/config/LICENSE_TEMPLATE
+++ b/cmd/config/LICENSE_TEMPLATE
--- a/cmd/config/Makefile
+++ b/cmd/config/Makefile
--- a/cmd/config/README.md
+++ b/cmd/config/README.md
@@ -1,4 +1,4 @@
-# cmd/kyaml
+# cmd/config

 This package exists to expose kyaml filters directly as cli commands for the purposes
 of development of the kyaml package and as a reference implementation for using the libraries.
--- a/cmd/config/cmd/cat.go
+++ b/cmd/config/cmd/cat.go
--- a/cmd/config/cmd/cat_test.go
+++ b/cmd/config/cmd/cat_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"

 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/cmd/kyaml/cmd"
+	"sigs.k8s.io/kustomize/cmd/config/cmd"
 )

 // TODO(pwittrock): write tests for reading / writing ResourceLists
--- a/cmd/config/cmd/cmdwrap.go
+++ b/cmd/config/cmd/cmdwrap.go
--- a/cmd/config/cmd/cmdwrap_test.go
+++ b/cmd/config/cmd/cmdwrap_test.go
--- a/cmd/config/cmd/cmdxargs.go
+++ b/cmd/config/cmd/cmdxargs.go
--- a/cmd/config/cmd/cmdxargs_test.go
+++ b/cmd/config/cmd/cmdxargs_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"

 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/cmd/kyaml/cmd"
+	"sigs.k8s.io/kustomize/cmd/config/cmd"
 )

 const (
--- a/cmd/config/cmd/count.go
+++ b/cmd/config/cmd/count.go
--- a/cmd/config/cmd/count_test.go
+++ b/cmd/config/cmd/count_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"

 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/cmd/kyaml/cmd"
+	"sigs.k8s.io/kustomize/cmd/config/cmd"
 )

 func TestCountCommand_files(t *testing.T) {
--- a/cmd/config/cmd/fmt.go
+++ b/cmd/config/cmd/fmt.go
--- a/cmd/config/cmd/fmt_test.go
+++ b/cmd/config/cmd/fmt_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"

 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/cmd/kyaml/cmd"
+	"sigs.k8s.io/kustomize/cmd/config/cmd"
 	"sigs.k8s.io/kustomize/kyaml/kio/filters/testyaml"
 )

--- a/cmd/config/cmd/grep.go
+++ b/cmd/config/cmd/grep.go
--- a/cmd/config/cmd/grep_test.go
+++ b/cmd/config/cmd/grep_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"

 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/cmd/kyaml/cmd"
+	"sigs.k8s.io/kustomize/cmd/config/cmd"
 )

 // TestGrepCommand_files verifies grep reads the files and filters them
--- a/cmd/config/cmd/merge.go
+++ b/cmd/config/cmd/merge.go
--- a/cmd/config/cmd/run-fns.go
+++ b/cmd/config/cmd/run-fns.go
--- a/cmd/config/cmd/test/override.yaml
+++ b/cmd/config/cmd/test/override.yaml
--- a/cmd/config/cmd/test/test.sh
+++ b/cmd/config/cmd/test/test.sh
--- a/cmd/config/cmd/tree.go
+++ b/cmd/config/cmd/tree.go
--- a/cmd/config/cmd/tree_test.go
+++ b/cmd/config/cmd/tree_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"

 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/cmd/kyaml/cmd"
+	"sigs.k8s.io/kustomize/cmd/config/cmd"
 )

 // TestCmd_files verifies fmt reads the files and filters them
--- a/cmd/config/cmd/util.go
+++ b/cmd/config/cmd/util.go
--- a/cmd/config/go.mod
+++ b/cmd/config/go.mod
@@ -1,4 +1,4 @@
-module sigs.k8s.io/kustomize/cmd/kyaml
+module sigs.k8s.io/kustomize/cmd/config

 go 1.13

--- a/cmd/config/go.sum
+++ b/cmd/config/go.sum
@@ -142,5 +142,6 @@ k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
 k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
--- a/cmd/config/inpututil/inpututil.go
+++ b/cmd/config/inpututil/inpututil.go
--- a/cmd/config/main.go
+++ b/cmd/config/main.go
@@ -7,7 +7,7 @@ import (
 	"os"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/cmd/kyaml/cmd"
+	"sigs.k8s.io/kustomize/cmd/config/cmd"
 	"sigs.k8s.io/kustomize/kyaml/yaml/merge2"
 	"sigs.k8s.io/kustomize/kyaml/yaml/merge3"
 )
--- a/travis/kyaml-pre-commit.sh
+++ b/travis/kyaml-pre-commit.sh
@@ -4,5 +4,5 @@ set -e
 cd kyaml
 make all

-cd ../cmd/kyaml
+cd ../cmd/config
 make all
--- a/travis/verify-deps.sh
+++ b/travis/verify-deps.sh
@@ -2,7 +2,7 @@

 set -o xtrace

-for dir in api kustomize pseudo kyaml plugin cmd/kyaml
+for dir in api kustomize pseudo kyaml plugin cmd/config
 do
  for item in api apimachinery client-go
  do