Move filesys package up to make public.

filesys/file.go

@@ -4,6 +4,7 @@
 package filesys
 
 import (
+	"io"
 	"os"
 	"time"
 )
@@ -32,3 +33,9 @@ func (fi *fileInfo) IsDir() bool { return fi.dir }
 
 // Sys should return underlying data source, but it now returns nil
 func (fi *fileInfo) Sys() interface{} { return nil }
+
+// File groups the basic os.File methods.
+type File interface {
+	io.ReadWriteCloser
+	Stat() (os.FileInfo, error)
+}

filesys/filesystem.go

@@ -5,8 +5,6 @@
 package filesys
 
 import (
-	"io"
-	"os"
 	"path/filepath"
 )
 
@@ -41,9 +39,3 @@ type FileSystem interface {
 	// Walk walks the file system with the given WalkFunc.
 	Walk(path string, walkFn filepath.WalkFunc) error
 }
-
-// File groups the basic os.File methods.
-type File interface {
-	io.ReadWriteCloser
-	Stat() (os.FileInfo, error)
-}

filesys/fsinmemory_test.go

@@ -10,101 +10,101 @@ import (
 )
 
 func TestExists(t *testing.T) {
-	x := MakeFsInMemory()
+	fSys := MakeFsInMemory()
-	if x.Exists("foo") {
+	if fSys.Exists("foo") {
 		t.Fatalf("expected no foo")
 	}
-	x.Mkdir("/")
+	fSys.Mkdir("/")
-	if !x.IsDir("/") {
+	if !fSys.IsDir("/") {
 		t.Fatalf("expected dir at /")
 	}
 }
 
 func TestIsDir(t *testing.T) {
-	x := MakeFsInMemory()
+	fSys := MakeFsInMemory()
 	expectedName := "my-dir"
-	err := x.Mkdir(expectedName)
+	err := fSys.Mkdir(expectedName)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	shouldExist(t, x, expectedName)
+	shouldExist(t, fSys, expectedName)
-	if !x.IsDir(expectedName) {
+	if !fSys.IsDir(expectedName) {
 		t.Fatalf(expectedName + " should be a dir")
 	}
 }
 
-func shouldExist(t *testing.T, fs FileSystem, name string) {
+func shouldExist(t *testing.T, fSys FileSystem, name string) {
-	if !fs.Exists(name) {
+	if !fSys.Exists(name) {
 		t.Fatalf(name + " should exist")
 	}
 }
 
-func shouldNotExist(t *testing.T, fs FileSystem, name string) {
+func shouldNotExist(t *testing.T, fSys FileSystem, name string) {
-	if fs.Exists(name) {
+	if fSys.Exists(name) {
 		t.Fatalf(name + " should not exist")
 	}
 }
 
 func TestRemoveAll(t *testing.T) {
-	x := MakeFsInMemory()
+	fSys := MakeFsInMemory()
-	x.WriteFile("/foo/project/file.yaml", []byte("Unused"))
+	fSys.WriteFile("/foo/project/file.yaml", []byte("Unused"))
-	x.WriteFile("/foo/project/subdir/file.yaml", []byte("Unused"))
+	fSys.WriteFile("/foo/project/subdir/file.yaml", []byte("Unused"))
-	x.WriteFile("/foo/apple/subdir/file.yaml", []byte("Unused"))
+	fSys.WriteFile("/foo/apple/subdir/file.yaml", []byte("Unused"))
-	shouldExist(t, x, "/foo/project/file.yaml")
+	shouldExist(t, fSys, "/foo/project/file.yaml")
-	shouldExist(t, x, "/foo/project/subdir/file.yaml")
+	shouldExist(t, fSys, "/foo/project/subdir/file.yaml")
-	shouldExist(t, x, "/foo/apple/subdir/file.yaml")
+	shouldExist(t, fSys, "/foo/apple/subdir/file.yaml")
-	err := x.RemoveAll("/foo/project")
+	err := fSys.RemoveAll("/foo/project")
 	if err != nil {
 		t.Fatalf("Unexpected error: %v", err)
 	}
-	shouldNotExist(t, x, "/foo/project/file.yaml")
+	shouldNotExist(t, fSys, "/foo/project/file.yaml")
-	shouldNotExist(t, x, "/foo/project/subdir/file.yaml")
+	shouldNotExist(t, fSys, "/foo/project/subdir/file.yaml")
-	shouldExist(t, x, "/foo/apple/subdir/file.yaml")
+	shouldExist(t, fSys, "/foo/apple/subdir/file.yaml")
 }
 
 func TestIsDirDeeper(t *testing.T) {
-	x := MakeFsInMemory()
+	fSys := MakeFsInMemory()
-	x.WriteFile("/foo/project/file.yaml", []byte("Unused"))
+	fSys.WriteFile("/foo/project/file.yaml", []byte("Unused"))
-	x.WriteFile("/foo/project/subdir/file.yaml", []byte("Unused"))
+	fSys.WriteFile("/foo/project/subdir/file.yaml", []byte("Unused"))
-	if !x.IsDir("/") {
+	if !fSys.IsDir("/") {
 		t.Fatalf("/ should be a dir")
 	}
-	if !x.IsDir("/foo") {
+	if !fSys.IsDir("/foo") {
 		t.Fatalf("/foo should be a dir")
 	}
-	if !x.IsDir("/foo/project") {
+	if !fSys.IsDir("/foo/project") {
 		t.Fatalf("/foo/project should be a dir")
 	}
-	if x.IsDir("/fo") {
+	if fSys.IsDir("/fo") {
 		t.Fatalf("/fo should not be a dir")
 	}
-	if x.IsDir("/x") {
+	if fSys.IsDir("/x") {
 		t.Fatalf("/x should not be a dir")
 	}
 }
 
 func TestCreate(t *testing.T) {
-	x := MakeFsInMemory()
+	fSys := MakeFsInMemory()
-	f, err := x.Create("foo")
+	f, err := fSys.Create("foo")
 	if f == nil {
 		t.Fatalf("expected file")
 	}
 	if err != nil {
 		t.Fatalf("unexpected error")
 	}
-	shouldExist(t, x, "foo")
+	shouldExist(t, fSys, "foo")
 }
 
 func TestReadFile(t *testing.T) {
-	x := MakeFsInMemory()
+	fSys := MakeFsInMemory()
-	f, err := x.Create("foo")
+	f, err := fSys.Create("foo")
 	if f == nil {
 		t.Fatalf("expected file")
 	}
 	if err != nil {
 		t.Fatalf("unexpected error")
 	}
-	content, err := x.ReadFile("foo")
+	content, err := fSys.ReadFile("foo")
 	if len(content) != 0 {
 		t.Fatalf("expected no content")
 	}
@@ -114,13 +114,13 @@ func TestReadFile(t *testing.T) {
 }
 
 func TestWriteFile(t *testing.T) {
-	x := MakeFsInMemory()
+	fSys := MakeFsInMemory()
 	c := []byte("heybuddy")
-	err := x.WriteFile("foo", c)
+	err := fSys.WriteFile("foo", c)
 	if err != nil {
 		t.Fatalf("expected no error")
 	}
-	content, err := x.ReadFile("foo")
+	content, err := fSys.ReadFile("foo")
 	if err != nil {
 		t.Fatalf("expected read to work: %v", err)
 	}
@@ -130,10 +130,10 @@ func TestWriteFile(t *testing.T) {
 }
 
 func TestGlob(t *testing.T) {
-	x := MakeFsInMemory()
+	fSys := MakeFsInMemory()
-	x.Create("dir/foo")
+	fSys.Create("dir/foo")
-	x.Create("dir/bar")
+	fSys.Create("dir/bar")
-	files, err := x.Glob("dir/*")
+	files, err := fSys.Glob("dir/*")
 	if err != nil {
 		t.Fatalf("expected no error")
 	}

filesys/fsondisk_test.go

@@ -13,7 +13,7 @@ import (
 )
 
 func makeTestDir(t *testing.T) (FileSystem, string) {
-	x := MakeFsOnDisk()
+	fSys := MakeFsOnDisk()
 	td, err := ioutil.TempDir("", "kustomize_testing_dir")
 	if err != nil {
 		t.Fatalf("unexpected error %s", err)
@@ -22,20 +22,20 @@ func makeTestDir(t *testing.T) (FileSystem, string) {
 	if err != nil {
 		t.Fatalf("unexpected error %s", err)
 	}
-	if !x.Exists(testDir) {
+	if !fSys.Exists(testDir) {
 		t.Fatalf("expected existence")
 	}
-	if !x.IsDir(testDir) {
+	if !fSys.IsDir(testDir) {
 		t.Fatalf("expected directory")
 	}
-	return x, testDir
+	return fSys, testDir
 }
 
 func TestCleanedAbs_1(t *testing.T) {
-	x, testDir := makeTestDir(t)
+	fSys, testDir := makeTestDir(t)
 	defer os.RemoveAll(testDir)
 
-	d, f, err := x.CleanedAbs("")
+	d, f, err := fSys.CleanedAbs("")
 	if err != nil {
 		t.Fatalf("unexpected err=%v", err)
 	}
@@ -52,10 +52,10 @@ func TestCleanedAbs_1(t *testing.T) {
 }
 
 func TestCleanedAbs_2(t *testing.T) {
-	x, testDir := makeTestDir(t)
+	fSys, testDir := makeTestDir(t)
 	defer os.RemoveAll(testDir)
 
-	d, f, err := x.CleanedAbs("/")
+	d, f, err := fSys.CleanedAbs("/")
 	if err != nil {
 		t.Fatalf("unexpected err=%v", err)
 	}
@@ -68,16 +68,16 @@ func TestCleanedAbs_2(t *testing.T) {
 }
 
 func TestCleanedAbs_3(t *testing.T) {
-	x, testDir := makeTestDir(t)
+	fSys, testDir := makeTestDir(t)
 	defer os.RemoveAll(testDir)
 
-	err := x.WriteFile(
+	err := fSys.WriteFile(
 		filepath.Join(testDir, "foo"), []byte(`foo`))
 	if err != nil {
 		t.Fatalf("unexpected err=%v", err)
 	}
 
-	d, f, err := x.CleanedAbs(filepath.Join(testDir, "foo"))
+	d, f, err := fSys.CleanedAbs(filepath.Join(testDir, "foo"))
 	if err != nil {
 		t.Fatalf("unexpected err=%v", err)
 	}
@@ -90,21 +90,21 @@ func TestCleanedAbs_3(t *testing.T) {
 }
 
 func TestCleanedAbs_4(t *testing.T) {
-	x, testDir := makeTestDir(t)
+	fSys, testDir := makeTestDir(t)
 	defer os.RemoveAll(testDir)
 
-	err := x.MkdirAll(filepath.Join(testDir, "d1", "d2"))
+	err := fSys.MkdirAll(filepath.Join(testDir, "d1", "d2"))
 	if err != nil {
 		t.Fatalf("unexpected err=%v", err)
 	}
-	err = x.WriteFile(
+	err = fSys.WriteFile(
 		filepath.Join(testDir, "d1", "d2", "bar"),
 		[]byte(`bar`))
 	if err != nil {
 		t.Fatalf("unexpected err=%v", err)
 	}
 
-	d, f, err := x.CleanedAbs(
+	d, f, err := fSys.CleanedAbs(
 		filepath.Join(testDir, "d1", "d2"))
 	if err != nil {
 		t.Fatalf("unexpected err=%v", err)
@@ -116,7 +116,7 @@ func TestCleanedAbs_4(t *testing.T) {
 		t.Fatalf("unexpected f=%s", f)
 	}
 
-	d, f, err = x.CleanedAbs(
+	d, f, err = fSys.CleanedAbs(
 		filepath.Join(testDir, "d1", "d2", "bar"))
 	if err != nil {
 		t.Fatalf("unexpected err=%v", err)
@@ -130,26 +130,26 @@ func TestCleanedAbs_4(t *testing.T) {
 }
 
 func TestReadFilesRealFS(t *testing.T) {
-	x, testDir := makeTestDir(t)
+	fSys, testDir := makeTestDir(t)
 	defer os.RemoveAll(testDir)
 
-	err := x.WriteFile(path.Join(testDir, "foo"), []byte(`foo`))
+	err := fSys.WriteFile(path.Join(testDir, "foo"), []byte(`foo`))
 	if err != nil {
 		t.Fatalf("unexpected error %s", err)
 	}
-	if !x.Exists(path.Join(testDir, "foo")) {
+	if !fSys.Exists(path.Join(testDir, "foo")) {
 		t.Fatalf("expected foo")
 	}
-	if x.IsDir(path.Join(testDir, "foo")) {
+	if fSys.IsDir(path.Join(testDir, "foo")) {
 		t.Fatalf("expected foo not to be a directory")
 	}
 
-	err = x.WriteFile(path.Join(testDir, "bar"), []byte(`bar`))
+	err = fSys.WriteFile(path.Join(testDir, "bar"), []byte(`bar`))
 	if err != nil {
 		t.Fatalf("unexpected error %s", err)
 	}
 
-	files, err := x.Glob(path.Join("testDir", "*"))
+	files, err := fSys.Glob(path.Join("testDir", "*"))
 	expected := []string{
 		path.Join(testDir, "bar"),
 		path.Join(testDir, "foo"),

filesys/rpath.go

@@ -5,8 +5,8 @@ package filesys
 
 import "path/filepath"
 
-// RPath returns a rooted path, e.g. "/hey/foo" as
+// RootedPath returns a rooted path, e.g. "/foo/bar" as
-// opposed to "hey/foo".
+// opposed to "foo/bar".
-func RPath(elem ...string) string {
+func RootedPath(elem ...string) string {
 	return separator + filepath.Join(elem...)
 }

internal/loadertest/fakeloader.go

@@ -7,7 +7,7 @@ package loadertest
 import (
 	"log"
 
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/loader"
 	"sigs.k8s.io/kustomize/v3/pkg/types"

k8sdeps/configmapandsecret/configmapfactory_test.go

@@ -10,7 +10,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/loader"
 	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
@@ -133,13 +133,13 @@ func TestConstructConfigMap(t *testing.T) {
 
 	fSys := filesys.MakeFsInMemory()
 	fSys.WriteFile(
-		filesys.RPath("configmap", "app.env"),
+		filesys.RootedPath("configmap", "app.env"),
 		[]byte("DB_USERNAME=admin\nDB_PASSWORD=somepw\n"))
 	fSys.WriteFile(
-		filesys.RPath("configmap", "app-init.ini"),
+		filesys.RootedPath("configmap", "app-init.ini"),
 		[]byte("FOO=bar\nBAR=baz\n"))
 	fSys.WriteFile(
-		filesys.RPath("configmap", "app.bin"),
+		filesys.RootedPath("configmap", "app.bin"),
 		[]byte{0xff, 0xfd})
 	ldr := loader.NewFileLoaderAtRoot(validators.MakeFakeValidator(), fSys)
 	for _, tc := range testCases {

k8sdeps/configmapandsecret/secretfactory_test.go

@@ -9,7 +9,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/loader"
 	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"

kustomize/internal/commands/build/build.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/loader"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"

kustomize/internal/commands/commands.go

@@ -14,10 +14,10 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/create"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/version"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/transformer"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/validator"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 	"sigs.k8s.io/kustomize/v3/pkg/resmap"
 	"sigs.k8s.io/kustomize/v3/pkg/resource"

kustomize/internal/commands/config/config.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/transformers/config/defaultconfig"
 )
 

kustomize/internal/commands/config/config_test.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 func TestValidate(t *testing.T) {

kustomize/internal/commands/create/create.go

@@ -12,7 +12,7 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 )

kustomize/internal/commands/create/create_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/types"
 )
 

kustomize/internal/commands/edit/add/addbase.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 type addBaseOptions struct {

kustomize/internal/commands/edit/add/addbase_test.go

@@ -9,7 +9,7 @@ import (
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 const (

kustomize/internal/commands/edit/add/addmetadata.go

@@ -9,7 +9,7 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 	"sigs.k8s.io/kustomize/v3/pkg/types"
 )

kustomize/internal/commands/edit/add/addmetadata_test.go

@@ -8,7 +8,7 @@ import (
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )

kustomize/internal/commands/edit/add/addpatch.go

@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/patch"
 )
 

kustomize/internal/commands/edit/add/addpatch_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 const (

kustomize/internal/commands/edit/add/addresource.go

@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 type addResourceOptions struct {

kustomize/internal/commands/edit/add/addresource_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 const (

kustomize/internal/commands/edit/add/all.go

@@ -5,7 +5,7 @@ package add
 
 import (
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 

kustomize/internal/commands/edit/add/configmap.go

@@ -6,7 +6,7 @@ package add
 import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/types"
 )

kustomize/internal/commands/edit/add/configmap_test.go

@@ -6,7 +6,7 @@ package add
 import (
 	"testing"
 
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/loader"
 	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"

kustomize/internal/commands/edit/add/flagsandargs.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 // flagsAndArgs encapsulates the options for add secret/configmap commands.

kustomize/internal/commands/edit/add/flagsandargs_test.go

@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 func TestDataValidation_NoName(t *testing.T) {

kustomize/internal/commands/edit/add/secret.go

@@ -6,7 +6,7 @@ package add
 import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/types"
 )

kustomize/internal/commands/edit/add/secret_test.go

@@ -6,7 +6,7 @@ package add
 import (
 	"testing"
 
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/loader"
 	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"

kustomize/internal/commands/edit/all.go

@@ -9,7 +9,7 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/fix"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/remove"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/set"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/loader"
 )

kustomize/internal/commands/edit/fix/fix.go

@@ -6,7 +6,7 @@ package fix
 import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 // NewCmdFix returns an instance of 'fix' subcommand.

kustomize/internal/commands/edit/fix/fix_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 func TestFix(t *testing.T) {

kustomize/internal/commands/edit/remove/all.go

@@ -5,7 +5,7 @@ package remove
 
 import (
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 

kustomize/internal/commands/edit/remove/removemetadata.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 	"sigs.k8s.io/kustomize/v3/pkg/types"
 )

kustomize/internal/commands/edit/remove/removemetadata_test.go

@@ -10,7 +10,7 @@ import (
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )

kustomize/internal/commands/edit/remove/removepatch.go

@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/patch"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 )

kustomize/internal/commands/edit/remove/removepatch_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/patch"
 )
 

kustomize/internal/commands/edit/remove/removeresource.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 )
 

kustomize/internal/commands/edit/remove/removeresource_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 func TestRemoveResources(t *testing.T) {

kustomize/internal/commands/edit/set/all.go

@@ -5,7 +5,7 @@ package set
 
 import (
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 

kustomize/internal/commands/edit/set/set_name_prefix.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 type setNamePrefixOptions struct {

kustomize/internal/commands/edit/set/set_name_prefix_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 const (

kustomize/internal/commands/edit/set/set_name_suffix.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 type setNameSuffixOptions struct {

kustomize/internal/commands/edit/set/set_name_suffix_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 const (

kustomize/internal/commands/edit/set/setimage.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/image"
 )
 

kustomize/internal/commands/edit/set/setimage_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 func TestSetImage(t *testing.T) {

kustomize/internal/commands/edit/set/setnamespace.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )
 

kustomize/internal/commands/edit/set/setnamespace_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )
 

kustomize/internal/commands/kustfile/kustomizationfile.go

@@ -13,7 +13,7 @@ import (
 	"regexp"
 	"strings"
 
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/yaml"

kustomize/internal/commands/kustfile/kustomizationfile_test.go

@@ -10,7 +10,7 @@ import (
 
 	"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
 
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 	"sigs.k8s.io/kustomize/v3/pkg/types"
 )

kustomize/internal/commands/testutils/testutils.go

@@ -4,7 +4,7 @@
 package testutils
 
 import (
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
 )
 

kustomize/internal/commands/util/util.go

@@ -8,7 +8,7 @@ import (
 	"log"
 	"strings"
 
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 // GlobPatterns accepts a slice of glob strings and returns the set of

pkg/git/cloner.go

@@ -9,7 +9,7 @@ import (
 	"os/exec"
 
 	"github.com/pkg/errors"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 // Cloner is a function that can clone a git repo.

pkg/git/repospec.go

@@ -9,7 +9,7 @@ import (
 	"regexp"
 	"strings"
 
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 // Used as a temporary non-empty occupant of the cloneDir

pkg/loader/fileloader.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/git"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )

pkg/loader/fileloader_test.go

@@ -25,7 +25,7 @@ import (
 	"strings"
 	"testing"
 
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/git"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"

pkg/loader/kv_test.go

@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/types"
 	"sigs.k8s.io/kustomize/v3/pkg/validators"
 )

pkg/loader/loader.go

@@ -5,7 +5,7 @@
 package loader
 
 import (
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/git"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 )

pkg/loader/loadrestrictions.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/pflag"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 //go:generate stringer -type=loadRestrictions

pkg/loader/loadrestrictions_test.go

@@ -20,7 +20,7 @@ import (
 	"strings"
 	"testing"
 
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
+	"sigs.k8s.io/kustomize/v3/filesys"
 )
 
 func TestRestrictionNone(t *testing.T) {

pkg/resmap/factory_test.go

@@ -8,8 +8,8 @@ import (
 	"reflect"
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/internal/loadertest"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/gvk"
 	"sigs.k8s.io/kustomize/v3/pkg/ifc"
 	"sigs.k8s.io/kustomize/v3/pkg/loader"

pkg/target/plugindir_test.go

@@ -9,9 +9,9 @@ import (
 	"path/filepath"
 	"testing"
 
+	"sigs.k8s.io/kustomize/v3/filesys"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/v3/k8sdeps/transformer"
-	"sigs.k8s.io/kustomize/v3/pkg/filesys"
 	"sigs.k8s.io/kustomize/v3/pkg/kusttest"
 	"sigs.k8s.io/kustomize/v3/pkg/loader"
 	"sigs.k8s.io/kustomize/v3/pkg/plugins"