From 0e2c71cd6fdd35db6cf615aef59d900f64145c46 Mon Sep 17 00:00:00 2001 From: Jeffrey Regan Date: Thu, 31 May 2018 17:15:52 -0700 Subject: [PATCH] Drop the util package. --- pkg/commands/addpatch.go | 2 +- pkg/commands/addpatch_test.go | 2 +- pkg/commands/addresource.go | 2 +- pkg/commands/addresource_test.go | 2 +- pkg/commands/build.go | 2 +- pkg/commands/build_test.go | 2 +- pkg/commands/commands.go | 2 +- pkg/commands/configmap.go | 2 +- pkg/commands/configmap_test.go | 2 +- pkg/commands/diff.go | 2 +- pkg/commands/diff_test.go | 2 +- pkg/commands/init.go | 2 +- pkg/commands/set_name_prefix.go | 2 +- pkg/commands/set_name_prefix_test.go | 2 +- pkg/commands/util.go | 2 +- pkg/commands/util_test.go | 2 +- pkg/{util => }/fs/fakefile.go | 0 pkg/{util => }/fs/fakefileinfo.go | 0 pkg/{util => }/fs/fakefs.go | 0 pkg/{util => }/fs/fakefs_test.go | 0 pkg/{util => }/fs/fs.go | 0 pkg/{util => }/fs/realfile.go | 0 pkg/{util => }/fs/realfs.go | 0 pkg/loader/fileloader.go | 2 +- pkg/loader/loader_test.go | 2 +- pkg/loader/loadertest/fake_loader.go | 2 +- 26 files changed, 19 insertions(+), 19 deletions(-) rename pkg/{util => }/fs/fakefile.go (100%) rename pkg/{util => }/fs/fakefileinfo.go (100%) rename pkg/{util => }/fs/fakefs.go (100%) rename pkg/{util => }/fs/fakefs_test.go (100%) rename pkg/{util => }/fs/fs.go (100%) rename pkg/{util => }/fs/realfile.go (100%) rename pkg/{util => }/fs/realfs.go (100%) diff --git a/pkg/commands/addpatch.go b/pkg/commands/addpatch.go index fb84cbe16..60ed0161b 100644 --- a/pkg/commands/addpatch.go +++ b/pkg/commands/addpatch.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" "github.com/kubernetes-sigs/kustomize/pkg/constants" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" + "github.com/kubernetes-sigs/kustomize/pkg/fs" ) type addPatchOptions struct { diff --git a/pkg/commands/addpatch_test.go b/pkg/commands/addpatch_test.go index 43a605302..42cf0b447 100644 --- a/pkg/commands/addpatch_test.go +++ b/pkg/commands/addpatch_test.go @@ -24,7 +24,7 @@ import ( "strings" "github.com/kubernetes-sigs/kustomize/pkg/constants" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" + "github.com/kubernetes-sigs/kustomize/pkg/fs" ) const ( diff --git a/pkg/commands/addresource.go b/pkg/commands/addresource.go index 6d1be2cbb..5b2896b9a 100644 --- a/pkg/commands/addresource.go +++ b/pkg/commands/addresource.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" "github.com/kubernetes-sigs/kustomize/pkg/constants" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" + "github.com/kubernetes-sigs/kustomize/pkg/fs" ) type addResourceOptions struct { diff --git a/pkg/commands/addresource_test.go b/pkg/commands/addresource_test.go index 5526b6fa5..edab657ff 100644 --- a/pkg/commands/addresource_test.go +++ b/pkg/commands/addresource_test.go @@ -24,7 +24,7 @@ import ( "strings" "github.com/kubernetes-sigs/kustomize/pkg/constants" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" + "github.com/kubernetes-sigs/kustomize/pkg/fs" ) const ( diff --git a/pkg/commands/build.go b/pkg/commands/build.go index 32a842f45..3429516e2 100644 --- a/pkg/commands/build.go +++ b/pkg/commands/build.go @@ -26,8 +26,8 @@ import ( "github.com/kubernetes-sigs/kustomize/pkg/app" "github.com/kubernetes-sigs/kustomize/pkg/constants" + "github.com/kubernetes-sigs/kustomize/pkg/fs" "github.com/kubernetes-sigs/kustomize/pkg/loader" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" ) type buildOptions struct { diff --git a/pkg/commands/build_test.go b/pkg/commands/build_test.go index a13677eec..920175fef 100644 --- a/pkg/commands/build_test.go +++ b/pkg/commands/build_test.go @@ -28,7 +28,7 @@ import ( "github.com/ghodss/yaml" "github.com/kubernetes-sigs/kustomize/pkg/constants" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" + "github.com/kubernetes-sigs/kustomize/pkg/fs" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/pkg/commands/commands.go b/pkg/commands/commands.go index 484c5fdf6..70f93e9f8 100644 --- a/pkg/commands/commands.go +++ b/pkg/commands/commands.go @@ -21,7 +21,7 @@ import ( "io" "os" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" + "github.com/kubernetes-sigs/kustomize/pkg/fs" "github.com/kubernetes-sigs/kustomize/version" "github.com/spf13/cobra" ) diff --git a/pkg/commands/configmap.go b/pkg/commands/configmap.go index 80549f407..71c55ca21 100644 --- a/pkg/commands/configmap.go +++ b/pkg/commands/configmap.go @@ -24,8 +24,8 @@ import ( "github.com/kubernetes-sigs/kustomize/pkg/configmapandsecret" "github.com/kubernetes-sigs/kustomize/pkg/constants" + "github.com/kubernetes-sigs/kustomize/pkg/fs" "github.com/kubernetes-sigs/kustomize/pkg/types" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" ) func newCmdAddConfigMap(errOut io.Writer, fsys fs.FileSystem) *cobra.Command { diff --git a/pkg/commands/configmap_test.go b/pkg/commands/configmap_test.go index 38f55093b..a16ec2037 100644 --- a/pkg/commands/configmap_test.go +++ b/pkg/commands/configmap_test.go @@ -19,8 +19,8 @@ package commands import ( "testing" + "github.com/kubernetes-sigs/kustomize/pkg/fs" "github.com/kubernetes-sigs/kustomize/pkg/types" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" ) func TestNewAddConfigMapIsNotNil(t *testing.T) { diff --git a/pkg/commands/diff.go b/pkg/commands/diff.go index 7166d31e2..4ca349afc 100644 --- a/pkg/commands/diff.go +++ b/pkg/commands/diff.go @@ -26,8 +26,8 @@ import ( "github.com/kubernetes-sigs/kustomize/pkg/app" "github.com/kubernetes-sigs/kustomize/pkg/constants" "github.com/kubernetes-sigs/kustomize/pkg/diff" + "github.com/kubernetes-sigs/kustomize/pkg/fs" "github.com/kubernetes-sigs/kustomize/pkg/loader" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" ) type diffOptions struct { diff --git a/pkg/commands/diff_test.go b/pkg/commands/diff_test.go index 6e9898919..ba63f7f33 100644 --- a/pkg/commands/diff_test.go +++ b/pkg/commands/diff_test.go @@ -27,7 +27,7 @@ import ( "github.com/ghodss/yaml" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" + "github.com/kubernetes-sigs/kustomize/pkg/fs" "k8s.io/apimachinery/pkg/util/sets" ) diff --git a/pkg/commands/init.go b/pkg/commands/init.go index 07649ba05..32ee0ce1d 100644 --- a/pkg/commands/init.go +++ b/pkg/commands/init.go @@ -23,7 +23,7 @@ import ( "errors" "github.com/kubernetes-sigs/kustomize/pkg/constants" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" + "github.com/kubernetes-sigs/kustomize/pkg/fs" "github.com/spf13/cobra" ) diff --git a/pkg/commands/set_name_prefix.go b/pkg/commands/set_name_prefix.go index ddd91f104..9aebe799f 100644 --- a/pkg/commands/set_name_prefix.go +++ b/pkg/commands/set_name_prefix.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "github.com/kubernetes-sigs/kustomize/pkg/constants" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" + "github.com/kubernetes-sigs/kustomize/pkg/fs" ) type setNamePrefixOptions struct { diff --git a/pkg/commands/set_name_prefix_test.go b/pkg/commands/set_name_prefix_test.go index 752637311..c97bd522b 100644 --- a/pkg/commands/set_name_prefix_test.go +++ b/pkg/commands/set_name_prefix_test.go @@ -24,7 +24,7 @@ import ( "strings" "github.com/kubernetes-sigs/kustomize/pkg/constants" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" + "github.com/kubernetes-sigs/kustomize/pkg/fs" ) const ( diff --git a/pkg/commands/util.go b/pkg/commands/util.go index e19280908..a2a621191 100644 --- a/pkg/commands/util.go +++ b/pkg/commands/util.go @@ -25,9 +25,9 @@ import ( "github.com/ghodss/yaml" "github.com/kubernetes-sigs/kustomize/pkg/constants" + "github.com/kubernetes-sigs/kustomize/pkg/fs" interror "github.com/kubernetes-sigs/kustomize/pkg/internal/error" "github.com/kubernetes-sigs/kustomize/pkg/types" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" ) type kustomizationFile struct { diff --git a/pkg/commands/util_test.go b/pkg/commands/util_test.go index 61edc3e0b..bc31638c5 100644 --- a/pkg/commands/util_test.go +++ b/pkg/commands/util_test.go @@ -22,8 +22,8 @@ import ( "testing" "github.com/kubernetes-sigs/kustomize/pkg/constants" + "github.com/kubernetes-sigs/kustomize/pkg/fs" "github.com/kubernetes-sigs/kustomize/pkg/types" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" ) func TestWriteAndRead(t *testing.T) { diff --git a/pkg/util/fs/fakefile.go b/pkg/fs/fakefile.go similarity index 100% rename from pkg/util/fs/fakefile.go rename to pkg/fs/fakefile.go diff --git a/pkg/util/fs/fakefileinfo.go b/pkg/fs/fakefileinfo.go similarity index 100% rename from pkg/util/fs/fakefileinfo.go rename to pkg/fs/fakefileinfo.go diff --git a/pkg/util/fs/fakefs.go b/pkg/fs/fakefs.go similarity index 100% rename from pkg/util/fs/fakefs.go rename to pkg/fs/fakefs.go diff --git a/pkg/util/fs/fakefs_test.go b/pkg/fs/fakefs_test.go similarity index 100% rename from pkg/util/fs/fakefs_test.go rename to pkg/fs/fakefs_test.go diff --git a/pkg/util/fs/fs.go b/pkg/fs/fs.go similarity index 100% rename from pkg/util/fs/fs.go rename to pkg/fs/fs.go diff --git a/pkg/util/fs/realfile.go b/pkg/fs/realfile.go similarity index 100% rename from pkg/util/fs/realfile.go rename to pkg/fs/realfile.go diff --git a/pkg/util/fs/realfs.go b/pkg/fs/realfs.go similarity index 100% rename from pkg/util/fs/realfs.go rename to pkg/fs/realfs.go diff --git a/pkg/loader/fileloader.go b/pkg/loader/fileloader.go index 8022d3ee7..4122e47f4 100644 --- a/pkg/loader/fileloader.go +++ b/pkg/loader/fileloader.go @@ -21,7 +21,7 @@ import ( "os" "path/filepath" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" + "github.com/kubernetes-sigs/kustomize/pkg/fs" ) const currentDir = "." diff --git a/pkg/loader/loader_test.go b/pkg/loader/loader_test.go index e7b61a3d6..6ac2a475b 100644 --- a/pkg/loader/loader_test.go +++ b/pkg/loader/loader_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" + "github.com/kubernetes-sigs/kustomize/pkg/fs" ) func initializeRootLoader(fakefs fs.FileSystem) Loader { diff --git a/pkg/loader/loadertest/fake_loader.go b/pkg/loader/loadertest/fake_loader.go index 0030c6016..c3125dc13 100644 --- a/pkg/loader/loadertest/fake_loader.go +++ b/pkg/loader/loadertest/fake_loader.go @@ -19,8 +19,8 @@ package loadertest import ( "os" + "github.com/kubernetes-sigs/kustomize/pkg/fs" "github.com/kubernetes-sigs/kustomize/pkg/loader" - "github.com/kubernetes-sigs/kustomize/pkg/util/fs" ) // FakeLoader encapsulates the delegate Loader and the fake file system.