From a88ee3f93c29539366e8e50e3e174f3006f82524 Mon Sep 17 00:00:00 2001
From: Jeffrey Regan <jregan@google.com>
Date: Mon, 14 Oct 2019 12:26:23 -0700
Subject: [PATCH] Move filesys package up to make public.

---
 {pkg/filesys => filesys}/confirmeddir.go      |  0
 {pkg/filesys => filesys}/confirmeddir_test.go |  0
 pkg/filesys/fileinfo.go => filesys/file.go    |  7 ++
 {pkg/filesys => filesys}/fileinmemory.go      |  0
 {pkg/filesys => filesys}/fileondisk.go        |  0
 pkg/filesys/fs.go => filesys/filesystem.go    |  8 --
 {pkg/filesys => filesys}/fsinmemory.go        |  0
 {pkg/filesys => filesys}/fsinmemory_test.go   | 88 +++++++++----------
 {pkg/filesys => filesys}/fsondisk.go          |  0
 {pkg/filesys => filesys}/fsondisk_test.go     | 44 +++++-----
 {pkg/filesys => filesys}/rpath.go             |  6 +-
 internal/loadertest/fakeloader.go             |  2 +-
 .../configmapfactory_test.go                  |  8 +-
 .../configmapandsecret/secretfactory_test.go  |  2 +-
 kustomize/internal/commands/build/build.go    |  2 +-
 kustomize/internal/commands/commands.go       |  2 +-
 kustomize/internal/commands/config/config.go  |  2 +-
 .../internal/commands/config/config_test.go   |  2 +-
 kustomize/internal/commands/create/create.go  |  2 +-
 .../internal/commands/create/create_test.go   |  2 +-
 .../internal/commands/edit/add/addbase.go     |  2 +-
 .../commands/edit/add/addbase_test.go         |  2 +-
 .../internal/commands/edit/add/addmetadata.go |  2 +-
 .../commands/edit/add/addmetadata_test.go     |  2 +-
 .../internal/commands/edit/add/addpatch.go    |  2 +-
 .../commands/edit/add/addpatch_test.go        |  2 +-
 .../internal/commands/edit/add/addresource.go |  2 +-
 .../commands/edit/add/addresource_test.go     |  2 +-
 kustomize/internal/commands/edit/add/all.go   |  2 +-
 .../internal/commands/edit/add/configmap.go   |  2 +-
 .../commands/edit/add/configmap_test.go       |  2 +-
 .../commands/edit/add/flagsandargs.go         |  2 +-
 .../commands/edit/add/flagsandargs_test.go    |  2 +-
 .../internal/commands/edit/add/secret.go      |  2 +-
 .../internal/commands/edit/add/secret_test.go |  2 +-
 kustomize/internal/commands/edit/all.go       |  2 +-
 kustomize/internal/commands/edit/fix/fix.go   |  2 +-
 .../internal/commands/edit/fix/fix_test.go    |  2 +-
 .../internal/commands/edit/remove/all.go      |  2 +-
 .../commands/edit/remove/removemetadata.go    |  2 +-
 .../edit/remove/removemetadata_test.go        |  2 +-
 .../commands/edit/remove/removepatch.go       |  2 +-
 .../commands/edit/remove/removepatch_test.go  |  2 +-
 .../commands/edit/remove/removeresource.go    |  2 +-
 .../edit/remove/removeresource_test.go        |  2 +-
 kustomize/internal/commands/edit/set/all.go   |  2 +-
 .../commands/edit/set/set_name_prefix.go      |  2 +-
 .../commands/edit/set/set_name_prefix_test.go |  2 +-
 .../commands/edit/set/set_name_suffix.go      |  2 +-
 .../commands/edit/set/set_name_suffix_test.go |  2 +-
 .../internal/commands/edit/set/setimage.go    |  2 +-
 .../commands/edit/set/setimage_test.go        |  2 +-
 .../commands/edit/set/setnamespace.go         |  2 +-
 .../commands/edit/set/setnamespace_test.go    |  2 +-
 .../commands/kustfile/kustomizationfile.go    |  2 +-
 .../kustfile/kustomizationfile_test.go        |  2 +-
 .../internal/commands/testutils/testutils.go  |  2 +-
 kustomize/internal/commands/util/util.go      |  2 +-
 pkg/git/cloner.go                             |  2 +-
 pkg/git/repospec.go                           |  2 +-
 pkg/loader/fileloader.go                      |  2 +-
 pkg/loader/fileloader_test.go                 |  2 +-
 pkg/loader/kv_test.go                         |  2 +-
 pkg/loader/loader.go                          |  2 +-
 pkg/loader/loadrestrictions.go                |  2 +-
 pkg/loader/loadrestrictions_test.go           |  2 +-
 pkg/resmap/factory_test.go                    |  2 +-
 pkg/target/plugindir_test.go                  |  2 +-
 68 files changed, 136 insertions(+), 137 deletions(-)
 rename {pkg/filesys => filesys}/confirmeddir.go (100%)
 rename {pkg/filesys => filesys}/confirmeddir_test.go (100%)
 rename pkg/filesys/fileinfo.go => filesys/file.go (87%)
 rename {pkg/filesys => filesys}/fileinmemory.go (100%)
 rename {pkg/filesys => filesys}/fileondisk.go (100%)
 rename pkg/filesys/fs.go => filesys/filesystem.go (92%)
 rename {pkg/filesys => filesys}/fsinmemory.go (100%)
 rename {pkg/filesys => filesys}/fsinmemory_test.go (51%)
 rename {pkg/filesys => filesys}/fsondisk.go (100%)
 rename {pkg/filesys => filesys}/fsondisk_test.go (76%)
 rename {pkg/filesys => filesys}/rpath.go (57%)

diff --git a/pkg/filesys/confirmeddir.go b/filesys/confirmeddir.go
similarity index 100%
rename from pkg/filesys/confirmeddir.go
rename to filesys/confirmeddir.go
diff --git a/pkg/filesys/confirmeddir_test.go b/filesys/confirmeddir_test.go
similarity index 100%
rename from pkg/filesys/confirmeddir_test.go
rename to filesys/confirmeddir_test.go
diff --git a/pkg/filesys/fileinfo.go b/filesys/file.go
similarity index 87%
rename from pkg/filesys/fileinfo.go
rename to filesys/file.go
index 0508262b7..23a827e02 100644
--- a/pkg/filesys/fileinfo.go
+++ b/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)
+}
diff --git a/pkg/filesys/fileinmemory.go b/filesys/fileinmemory.go
similarity index 100%
rename from pkg/filesys/fileinmemory.go
rename to filesys/fileinmemory.go
diff --git a/pkg/filesys/fileondisk.go b/filesys/fileondisk.go
similarity index 100%
rename from pkg/filesys/fileondisk.go
rename to filesys/fileondisk.go
diff --git a/pkg/filesys/fs.go b/filesys/filesystem.go
similarity index 92%
rename from pkg/filesys/fs.go
rename to filesys/filesystem.go
index fcf12a931..4b41b9a85 100644
--- a/pkg/filesys/fs.go
+++ b/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)
-}
diff --git a/pkg/filesys/fsinmemory.go b/filesys/fsinmemory.go
similarity index 100%
rename from pkg/filesys/fsinmemory.go
rename to filesys/fsinmemory.go
diff --git a/pkg/filesys/fsinmemory_test.go b/filesys/fsinmemory_test.go
similarity index 51%
rename from pkg/filesys/fsinmemory_test.go
rename to filesys/fsinmemory_test.go
index 8714a9773..c99ee577a 100644
--- a/pkg/filesys/fsinmemory_test.go
+++ b/filesys/fsinmemory_test.go
@@ -10,101 +10,101 @@ import (
 )
 
 func TestExists(t *testing.T) {
-	x := MakeFsInMemory()
-	if x.Exists("foo") {
+	fSys := MakeFsInMemory()
+	if fSys.Exists("foo") {
 		t.Fatalf("expected no foo")
 	}
-	x.Mkdir("/")
-	if !x.IsDir("/") {
+	fSys.Mkdir("/")
+	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)
-	if !x.IsDir(expectedName) {
+	shouldExist(t, fSys, expectedName)
+	if !fSys.IsDir(expectedName) {
 		t.Fatalf(expectedName + " should be a dir")
 	}
 }
 
-func shouldExist(t *testing.T, fs FileSystem, name string) {
-	if !fs.Exists(name) {
+func shouldExist(t *testing.T, fSys FileSystem, name string) {
+	if !fSys.Exists(name) {
 		t.Fatalf(name + " should exist")
 	}
 }
 
-func shouldNotExist(t *testing.T, fs FileSystem, name string) {
-	if fs.Exists(name) {
+func shouldNotExist(t *testing.T, fSys FileSystem, name string) {
+	if fSys.Exists(name) {
 		t.Fatalf(name + " should not exist")
 	}
 }
 
 func TestRemoveAll(t *testing.T) {
-	x := MakeFsInMemory()
-	x.WriteFile("/foo/project/file.yaml", []byte("Unused"))
-	x.WriteFile("/foo/project/subdir/file.yaml", []byte("Unused"))
-	x.WriteFile("/foo/apple/subdir/file.yaml", []byte("Unused"))
-	shouldExist(t, x, "/foo/project/file.yaml")
-	shouldExist(t, x, "/foo/project/subdir/file.yaml")
-	shouldExist(t, x, "/foo/apple/subdir/file.yaml")
-	err := x.RemoveAll("/foo/project")
+	fSys := MakeFsInMemory()
+	fSys.WriteFile("/foo/project/file.yaml", []byte("Unused"))
+	fSys.WriteFile("/foo/project/subdir/file.yaml", []byte("Unused"))
+	fSys.WriteFile("/foo/apple/subdir/file.yaml", []byte("Unused"))
+	shouldExist(t, fSys, "/foo/project/file.yaml")
+	shouldExist(t, fSys, "/foo/project/subdir/file.yaml")
+	shouldExist(t, fSys, "/foo/apple/subdir/file.yaml")
+	err := fSys.RemoveAll("/foo/project")
 	if err != nil {
 		t.Fatalf("Unexpected error: %v", err)
 	}
-	shouldNotExist(t, x, "/foo/project/file.yaml")
-	shouldNotExist(t, x, "/foo/project/subdir/file.yaml")
-	shouldExist(t, x, "/foo/apple/subdir/file.yaml")
+	shouldNotExist(t, fSys, "/foo/project/file.yaml")
+	shouldNotExist(t, fSys, "/foo/project/subdir/file.yaml")
+	shouldExist(t, fSys, "/foo/apple/subdir/file.yaml")
 }
 
 func TestIsDirDeeper(t *testing.T) {
-	x := MakeFsInMemory()
-	x.WriteFile("/foo/project/file.yaml", []byte("Unused"))
-	x.WriteFile("/foo/project/subdir/file.yaml", []byte("Unused"))
-	if !x.IsDir("/") {
+	fSys := MakeFsInMemory()
+	fSys.WriteFile("/foo/project/file.yaml", []byte("Unused"))
+	fSys.WriteFile("/foo/project/subdir/file.yaml", []byte("Unused"))
+	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()
-	f, err := x.Create("foo")
+	fSys := MakeFsInMemory()
+	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()
-	f, err := x.Create("foo")
+	fSys := MakeFsInMemory()
+	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()
-	x.Create("dir/foo")
-	x.Create("dir/bar")
-	files, err := x.Glob("dir/*")
+	fSys := MakeFsInMemory()
+	fSys.Create("dir/foo")
+	fSys.Create("dir/bar")
+	files, err := fSys.Glob("dir/*")
 	if err != nil {
 		t.Fatalf("expected no error")
 	}
diff --git a/pkg/filesys/fsondisk.go b/filesys/fsondisk.go
similarity index 100%
rename from pkg/filesys/fsondisk.go
rename to filesys/fsondisk.go
diff --git a/pkg/filesys/fsondisk_test.go b/filesys/fsondisk_test.go
similarity index 76%
rename from pkg/filesys/fsondisk_test.go
rename to filesys/fsondisk_test.go
index 9cc0fe689..1db88c218 100644
--- a/pkg/filesys/fsondisk_test.go
+++ b/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"),
diff --git a/pkg/filesys/rpath.go b/filesys/rpath.go
similarity index 57%
rename from pkg/filesys/rpath.go
rename to filesys/rpath.go
index 2293ed178..9d7712646 100644
--- a/pkg/filesys/rpath.go
+++ b/filesys/rpath.go
@@ -5,8 +5,8 @@ package filesys
 
 import "path/filepath"
 
-// RPath returns a rooted path, e.g. "/hey/foo" as
-// opposed to "hey/foo".
-func RPath(elem ...string) string {
+// RootedPath returns a rooted path, e.g. "/foo/bar" as
+// opposed to "foo/bar".
+func RootedPath(elem ...string) string {
 	return separator + filepath.Join(elem...)
 }
diff --git a/internal/loadertest/fakeloader.go b/internal/loadertest/fakeloader.go
index cdbff2f27..df2507dd4 100644
--- a/internal/loadertest/fakeloader.go
+++ b/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"
diff --git a/k8sdeps/configmapandsecret/configmapfactory_test.go b/k8sdeps/configmapandsecret/configmapfactory_test.go
index 13f144d6d..c7d5559e9 100644
--- a/k8sdeps/configmapandsecret/configmapfactory_test.go
+++ b/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 {
diff --git a/k8sdeps/configmapandsecret/secretfactory_test.go b/k8sdeps/configmapandsecret/secretfactory_test.go
index 4919dfd2a..2c51dd49d 100644
--- a/k8sdeps/configmapandsecret/secretfactory_test.go
+++ b/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"
diff --git a/kustomize/internal/commands/build/build.go b/kustomize/internal/commands/build/build.go
index 219acada6..c2eba9a3f 100644
--- a/kustomize/internal/commands/build/build.go
+++ b/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"
diff --git a/kustomize/internal/commands/commands.go b/kustomize/internal/commands/commands.go
index ba669d3fd..af57e397c 100644
--- a/kustomize/internal/commands/commands.go
+++ b/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"
diff --git a/kustomize/internal/commands/config/config.go b/kustomize/internal/commands/config/config.go
index c565ea532..c1a4284d2 100644
--- a/kustomize/internal/commands/config/config.go
+++ b/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"
 )
 
diff --git a/kustomize/internal/commands/config/config_test.go b/kustomize/internal/commands/config/config_test.go
index 06fe87534..bf5939949 100644
--- a/kustomize/internal/commands/config/config_test.go
+++ b/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) {
diff --git a/kustomize/internal/commands/create/create.go b/kustomize/internal/commands/create/create.go
index 70583f5ba..25452e8b5 100644
--- a/kustomize/internal/commands/create/create.go
+++ b/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"
 )
diff --git a/kustomize/internal/commands/create/create_test.go b/kustomize/internal/commands/create/create_test.go
index dbd2f1d26..f13bd8113 100644
--- a/kustomize/internal/commands/create/create_test.go
+++ b/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"
 )
 
diff --git a/kustomize/internal/commands/edit/add/addbase.go b/kustomize/internal/commands/edit/add/addbase.go
index 89db77e1c..fc69e91a6 100644
--- a/kustomize/internal/commands/edit/add/addbase.go
+++ b/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 {
diff --git a/kustomize/internal/commands/edit/add/addbase_test.go b/kustomize/internal/commands/edit/add/addbase_test.go
index 1bebe2947..672557976 100644
--- a/kustomize/internal/commands/edit/add/addbase_test.go
+++ b/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 (
diff --git a/kustomize/internal/commands/edit/add/addmetadata.go b/kustomize/internal/commands/edit/add/addmetadata.go
index 0699da076..1a695916b 100644
--- a/kustomize/internal/commands/edit/add/addmetadata.go
+++ b/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"
 )
diff --git a/kustomize/internal/commands/edit/add/addmetadata_test.go b/kustomize/internal/commands/edit/add/addmetadata_test.go
index 46a8d90c1..86325e8b2 100644
--- a/kustomize/internal/commands/edit/add/addmetadata_test.go
+++ b/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"
 )
diff --git a/kustomize/internal/commands/edit/add/addpatch.go b/kustomize/internal/commands/edit/add/addpatch.go
index d9cf55f68..00c8667f3 100644
--- a/kustomize/internal/commands/edit/add/addpatch.go
+++ b/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"
 )
 
diff --git a/kustomize/internal/commands/edit/add/addpatch_test.go b/kustomize/internal/commands/edit/add/addpatch_test.go
index 3fdeba501..3e58aba01 100644
--- a/kustomize/internal/commands/edit/add/addpatch_test.go
+++ b/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 (
diff --git a/kustomize/internal/commands/edit/add/addresource.go b/kustomize/internal/commands/edit/add/addresource.go
index fd54a5a30..abdaa9ece 100644
--- a/kustomize/internal/commands/edit/add/addresource.go
+++ b/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 {
diff --git a/kustomize/internal/commands/edit/add/addresource_test.go b/kustomize/internal/commands/edit/add/addresource_test.go
index 55e3ab624..b5edf7093 100644
--- a/kustomize/internal/commands/edit/add/addresource_test.go
+++ b/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 (
diff --git a/kustomize/internal/commands/edit/add/all.go b/kustomize/internal/commands/edit/add/all.go
index c90d836f1..d83081f99 100644
--- a/kustomize/internal/commands/edit/add/all.go
+++ b/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"
 )
 
diff --git a/kustomize/internal/commands/edit/add/configmap.go b/kustomize/internal/commands/edit/add/configmap.go
index eacb8c5da..62d40c5b9 100644
--- a/kustomize/internal/commands/edit/add/configmap.go
+++ b/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"
 )
diff --git a/kustomize/internal/commands/edit/add/configmap_test.go b/kustomize/internal/commands/edit/add/configmap_test.go
index 446787275..649ded0db 100644
--- a/kustomize/internal/commands/edit/add/configmap_test.go
+++ b/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"
diff --git a/kustomize/internal/commands/edit/add/flagsandargs.go b/kustomize/internal/commands/edit/add/flagsandargs.go
index f4db47a50..941ba1cd5 100644
--- a/kustomize/internal/commands/edit/add/flagsandargs.go
+++ b/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.
diff --git a/kustomize/internal/commands/edit/add/flagsandargs_test.go b/kustomize/internal/commands/edit/add/flagsandargs_test.go
index c83bbb44d..369bc8d27 100644
--- a/kustomize/internal/commands/edit/add/flagsandargs_test.go
+++ b/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) {
diff --git a/kustomize/internal/commands/edit/add/secret.go b/kustomize/internal/commands/edit/add/secret.go
index 580ccc6f7..5ec01b4d3 100644
--- a/kustomize/internal/commands/edit/add/secret.go
+++ b/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"
 )
diff --git a/kustomize/internal/commands/edit/add/secret_test.go b/kustomize/internal/commands/edit/add/secret_test.go
index e14114134..d8ded3a64 100644
--- a/kustomize/internal/commands/edit/add/secret_test.go
+++ b/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"
diff --git a/kustomize/internal/commands/edit/all.go b/kustomize/internal/commands/edit/all.go
index 036dcb826..b0efb0e43 100644
--- a/kustomize/internal/commands/edit/all.go
+++ b/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"
 )
diff --git a/kustomize/internal/commands/edit/fix/fix.go b/kustomize/internal/commands/edit/fix/fix.go
index d6462b138..d80eeb583 100644
--- a/kustomize/internal/commands/edit/fix/fix.go
+++ b/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.
diff --git a/kustomize/internal/commands/edit/fix/fix_test.go b/kustomize/internal/commands/edit/fix/fix_test.go
index 6d1b589f2..fca7cb87d 100644
--- a/kustomize/internal/commands/edit/fix/fix_test.go
+++ b/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) {
diff --git a/kustomize/internal/commands/edit/remove/all.go b/kustomize/internal/commands/edit/remove/all.go
index 294cae0f4..4b25fd209 100644
--- a/kustomize/internal/commands/edit/remove/all.go
+++ b/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"
 )
 
diff --git a/kustomize/internal/commands/edit/remove/removemetadata.go b/kustomize/internal/commands/edit/remove/removemetadata.go
index 99cc0207a..77d6cfaa2 100644
--- a/kustomize/internal/commands/edit/remove/removemetadata.go
+++ b/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"
 )
diff --git a/kustomize/internal/commands/edit/remove/removemetadata_test.go b/kustomize/internal/commands/edit/remove/removemetadata_test.go
index 0b8357df7..2aa528902 100644
--- a/kustomize/internal/commands/edit/remove/removemetadata_test.go
+++ b/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"
 )
diff --git a/kustomize/internal/commands/edit/remove/removepatch.go b/kustomize/internal/commands/edit/remove/removepatch.go
index 339192f7e..925c7569c 100644
--- a/kustomize/internal/commands/edit/remove/removepatch.go
+++ b/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"
 )
diff --git a/kustomize/internal/commands/edit/remove/removepatch_test.go b/kustomize/internal/commands/edit/remove/removepatch_test.go
index f5504de29..60c095d76 100644
--- a/kustomize/internal/commands/edit/remove/removepatch_test.go
+++ b/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"
 )
 
diff --git a/kustomize/internal/commands/edit/remove/removeresource.go b/kustomize/internal/commands/edit/remove/removeresource.go
index 6f9995cfa..67c6be1d4 100644
--- a/kustomize/internal/commands/edit/remove/removeresource.go
+++ b/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"
 )
 
diff --git a/kustomize/internal/commands/edit/remove/removeresource_test.go b/kustomize/internal/commands/edit/remove/removeresource_test.go
index 0591aa1c9..8af4df273 100644
--- a/kustomize/internal/commands/edit/remove/removeresource_test.go
+++ b/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) {
diff --git a/kustomize/internal/commands/edit/set/all.go b/kustomize/internal/commands/edit/set/all.go
index 26060e7ab..43f79a33a 100644
--- a/kustomize/internal/commands/edit/set/all.go
+++ b/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"
 )
 
diff --git a/kustomize/internal/commands/edit/set/set_name_prefix.go b/kustomize/internal/commands/edit/set/set_name_prefix.go
index dc2630e14..bbed17bd2 100644
--- a/kustomize/internal/commands/edit/set/set_name_prefix.go
+++ b/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 {
diff --git a/kustomize/internal/commands/edit/set/set_name_prefix_test.go b/kustomize/internal/commands/edit/set/set_name_prefix_test.go
index 664f533e2..9f9cfb263 100644
--- a/kustomize/internal/commands/edit/set/set_name_prefix_test.go
+++ b/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 (
diff --git a/kustomize/internal/commands/edit/set/set_name_suffix.go b/kustomize/internal/commands/edit/set/set_name_suffix.go
index 79a8f2e4a..865397d65 100644
--- a/kustomize/internal/commands/edit/set/set_name_suffix.go
+++ b/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 {
diff --git a/kustomize/internal/commands/edit/set/set_name_suffix_test.go b/kustomize/internal/commands/edit/set/set_name_suffix_test.go
index adfb24028..24bfe1616 100644
--- a/kustomize/internal/commands/edit/set/set_name_suffix_test.go
+++ b/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 (
diff --git a/kustomize/internal/commands/edit/set/setimage.go b/kustomize/internal/commands/edit/set/setimage.go
index d1e1f8215..ada83085a 100644
--- a/kustomize/internal/commands/edit/set/setimage.go
+++ b/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"
 )
 
diff --git a/kustomize/internal/commands/edit/set/setimage_test.go b/kustomize/internal/commands/edit/set/setimage_test.go
index 0e96c50ca..bda7f995c 100644
--- a/kustomize/internal/commands/edit/set/setimage_test.go
+++ b/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) {
diff --git a/kustomize/internal/commands/edit/set/setnamespace.go b/kustomize/internal/commands/edit/set/setnamespace.go
index 77527a8dc..5ee96be4b 100644
--- a/kustomize/internal/commands/edit/set/setnamespace.go
+++ b/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"
 )
 
diff --git a/kustomize/internal/commands/edit/set/setnamespace_test.go b/kustomize/internal/commands/edit/set/setnamespace_test.go
index 4faa92c97..b2aacc36d 100644
--- a/kustomize/internal/commands/edit/set/setnamespace_test.go
+++ b/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"
 )
 
diff --git a/kustomize/internal/commands/kustfile/kustomizationfile.go b/kustomize/internal/commands/kustfile/kustomizationfile.go
index 8aecabf83..e101244b0 100644
--- a/kustomize/internal/commands/kustfile/kustomizationfile.go
+++ b/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"
diff --git a/kustomize/internal/commands/kustfile/kustomizationfile_test.go b/kustomize/internal/commands/kustfile/kustomizationfile_test.go
index b3057f6fc..f3e68e9f9 100644
--- a/kustomize/internal/commands/kustfile/kustomizationfile_test.go
+++ b/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"
 )
diff --git a/kustomize/internal/commands/testutils/testutils.go b/kustomize/internal/commands/testutils/testutils.go
index 121b4b31e..8965eb1f8 100644
--- a/kustomize/internal/commands/testutils/testutils.go
+++ b/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"
 )
 
diff --git a/kustomize/internal/commands/util/util.go b/kustomize/internal/commands/util/util.go
index 6fd45dfe2..5732a9add 100644
--- a/kustomize/internal/commands/util/util.go
+++ b/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
diff --git a/pkg/git/cloner.go b/pkg/git/cloner.go
index 312b68ba6..23586ab83 100644
--- a/pkg/git/cloner.go
+++ b/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.
diff --git a/pkg/git/repospec.go b/pkg/git/repospec.go
index 7b0981dc2..69a26e325 100644
--- a/pkg/git/repospec.go
+++ b/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
diff --git a/pkg/loader/fileloader.go b/pkg/loader/fileloader.go
index 47c7262d9..d9e10c478 100644
--- a/pkg/loader/fileloader.go
+++ b/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"
 )
diff --git a/pkg/loader/fileloader_test.go b/pkg/loader/fileloader_test.go
index 3c248b089..1d6ec3a0d 100644
--- a/pkg/loader/fileloader_test.go
+++ b/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"
diff --git a/pkg/loader/kv_test.go b/pkg/loader/kv_test.go
index 8aef15cc6..0c3fe4cae 100644
--- a/pkg/loader/kv_test.go
+++ b/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"
 )
diff --git a/pkg/loader/loader.go b/pkg/loader/loader.go
index 79434f5ea..cd51c85c5 100644
--- a/pkg/loader/loader.go
+++ b/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"
 )
diff --git a/pkg/loader/loadrestrictions.go b/pkg/loader/loadrestrictions.go
index 9e0ec4eb4..9794a15a4 100644
--- a/pkg/loader/loadrestrictions.go
+++ b/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
diff --git a/pkg/loader/loadrestrictions_test.go b/pkg/loader/loadrestrictions_test.go
index 8343ef51e..502a2ed5d 100644
--- a/pkg/loader/loadrestrictions_test.go
+++ b/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) {
diff --git a/pkg/resmap/factory_test.go b/pkg/resmap/factory_test.go
index 44d78cdac..03fafd258 100644
--- a/pkg/resmap/factory_test.go
+++ b/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"
diff --git a/pkg/target/plugindir_test.go b/pkg/target/plugindir_test.go
index 7b1982ff5..96f4cfea3 100644
--- a/pkg/target/plugindir_test.go
+++ b/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"