Move api/filesys to kyaml/filesys (#3997)

* Move api/filesys to kyaml/filesys * Add deprecated version of api/filesys with aliases to new code * Use new kyaml/filesys package and update dependencies * Migrate to kyaml/filesys and update dependencies * Skip tests that break on Windows
2026-07-01 18:30:15 +00:00 · 2021-06-16 11:42:00 -07:00
parent d39d7db9ed
commit 7fae7d1bd6
105 changed files with 164 additions and 99 deletions
--- a/kustomize/commands/build/build.go
+++ b/kustomize/commands/build/build.go
@@ -8,10 +8,10 @@ import (
 	"io"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/krusty"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 var theArgs struct {
--- a/kustomize/commands/build/build_test.go
+++ b/kustomize/commands/build/build_test.go
@@ -9,10 +9,10 @@ import (
 	"strings"
 	"testing"

-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/provenance"
 	. "sigs.k8s.io/kustomize/kustomize/v4/commands/build"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 func loadFileSystem(fSys filesys.FileSystem) {
--- a/kustomize/commands/build/writer.go
+++ b/kustomize/commands/build/writer.go
@@ -7,9 +7,9 @@ import (
 	"path/filepath"
 	"strings"

-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 	"sigs.k8s.io/yaml"
 )

--- a/kustomize/commands/commands.go
+++ b/kustomize/commands/commands.go
@@ -10,7 +10,6 @@ import (
 	"os"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/provider"
 	"sigs.k8s.io/kustomize/cmd/config/completion"
@@ -20,6 +19,7 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/edit"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/openapi"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/version"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 func makeBuildCommand(fSys filesys.FileSystem, w io.Writer) *cobra.Command {
--- a/kustomize/commands/create/create.go
+++ b/kustomize/commands/create/create.go
@@ -10,12 +10,12 @@ import (
 	"strings"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/loader"
 	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 type createFlags struct {
--- a/kustomize/commands/create/create_test.go
+++ b/kustomize/commands/create/create_test.go
@@ -7,10 +7,10 @@ import (
 	"reflect"
 	"testing"

-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/provider"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 var factory = provider.NewDefaultDepProvider().GetResourceFactory()
--- a/kustomize/commands/edit/add/addbase.go
+++ b/kustomize/commands/edit/add/addbase.go
@@ -9,8 +9,8 @@ import (
 	"strings"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 type addBaseOptions struct {
--- a/kustomize/commands/edit/add/addbase_test.go
+++ b/kustomize/commands/edit/add/addbase_test.go
@@ -9,9 +9,9 @@ import (

 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 const (
--- a/kustomize/commands/edit/add/addcomponent.go
+++ b/kustomize/commands/edit/add/addcomponent.go
@@ -8,10 +8,10 @@ import (
 	"log"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/loader"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 type addComponentOptions struct {
--- a/kustomize/commands/edit/add/addcomponent_test.go
+++ b/kustomize/commands/edit/add/addcomponent_test.go
@@ -8,8 +8,8 @@ import (

 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"sigs.k8s.io/kustomize/api/filesys"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 const (
--- a/kustomize/commands/edit/add/addmetadata.go
+++ b/kustomize/commands/edit/add/addmetadata.go
@@ -7,11 +7,11 @@ import (
 	"fmt"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 // kindOfAdd is the kind of metadata being added: label or annotation
--- a/kustomize/commands/edit/add/addmetadata_test.go
+++ b/kustomize/commands/edit/add/addmetadata_test.go
@@ -8,11 +8,11 @@ import (

 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"sigs.k8s.io/kustomize/api/filesys"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 func makeKustomization(t *testing.T) *types.Kustomization {
--- a/kustomize/commands/edit/add/addpatch.go
+++ b/kustomize/commands/edit/add/addpatch.go
@@ -8,9 +8,9 @@ import (
 	"log"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 type addPatchOptions struct {
--- a/kustomize/commands/edit/add/addpatch_test.go
+++ b/kustomize/commands/edit/add/addpatch_test.go
@@ -9,8 +9,8 @@ import (

 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"sigs.k8s.io/kustomize/api/filesys"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 const (
--- a/kustomize/commands/edit/add/addresource.go
+++ b/kustomize/commands/edit/add/addresource.go
@@ -8,10 +8,10 @@ import (
 	"log"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/loader"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 type addResourceOptions struct {
--- a/kustomize/commands/edit/add/addresource_test.go
+++ b/kustomize/commands/edit/add/addresource_test.go
@@ -8,8 +8,8 @@ import (

 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"sigs.k8s.io/kustomize/api/filesys"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 const (
--- a/kustomize/commands/edit/add/addtransformer.go
+++ b/kustomize/commands/edit/add/addtransformer.go
@@ -8,9 +8,9 @@ import (
 	"log"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 type addTransformerOptions struct {
--- a/kustomize/commands/edit/add/addtransformer_test.go
+++ b/kustomize/commands/edit/add/addtransformer_test.go
@@ -8,9 +8,9 @@ import (

 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 const (
--- a/kustomize/commands/edit/add/all.go
+++ b/kustomize/commands/edit/add/all.go
@@ -5,9 +5,9 @@ package add

 import (
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/resource"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 // NewCmdAdd returns an instance of 'add' subcommand.
--- a/kustomize/commands/edit/add/configmap.go
+++ b/kustomize/commands/edit/add/configmap.go
@@ -5,11 +5,11 @@ package add

 import (
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 // newCmdAddConfigMap returns a new command.
--- a/kustomize/commands/edit/add/configmap_test.go
+++ b/kustomize/commands/edit/add/configmap_test.go
@@ -7,11 +7,11 @@ import (
 	"testing"

 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/kv"
 	"sigs.k8s.io/kustomize/api/loader"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 func TestNewAddConfigMapIsNotNil(t *testing.T) {
--- a/kustomize/commands/edit/add/flagsandargs.go
+++ b/kustomize/commands/edit/add/flagsandargs.go
@@ -9,8 +9,8 @@ import (

 	"sigs.k8s.io/kustomize/api/types"

-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 // flagsAndArgs encapsulates the options for add secret/configmap commands.
--- a/kustomize/commands/edit/add/flagsandargs_test.go
+++ b/kustomize/commands/edit/add/flagsandargs_test.go
@@ -9,7 +9,7 @@ import (

 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 func TestDataValidation_NoName(t *testing.T) {
--- a/kustomize/commands/edit/add/secret.go
+++ b/kustomize/commands/edit/add/secret.go
@@ -5,11 +5,11 @@ package add

 import (
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/resource"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 // newCmdAddSecret returns a new command.
--- a/kustomize/commands/edit/add/secret_test.go
+++ b/kustomize/commands/edit/add/secret_test.go
@@ -7,11 +7,11 @@ import (
 	"testing"

 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/kv"
 	"sigs.k8s.io/kustomize/api/loader"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 func TestNewCmdAddSecretIsNotNil(t *testing.T) {
--- a/kustomize/commands/edit/all.go
+++ b/kustomize/commands/edit/all.go
@@ -7,7 +7,6 @@ import (
 	"io"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/api/kv"
 	"sigs.k8s.io/kustomize/api/loader"
@@ -17,6 +16,7 @@ import (
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/edit/listbuiltin"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/edit/remove"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/edit/set"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 // NewCmdEdit returns an instance of 'edit' subcommand.
--- a/kustomize/commands/edit/fix/convert.go
+++ b/kustomize/commands/edit/fix/convert.go
@@ -10,8 +10,8 @@ import (
 	"strconv"
 	"strings"

-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/resid"
 	kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
--- a/kustomize/commands/edit/fix/convert_test.go
+++ b/kustomize/commands/edit/fix/convert_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"

 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/filesys"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 func TestFixVarsSimple(t *testing.T) {
--- a/kustomize/commands/edit/fix/fix.go
+++ b/kustomize/commands/edit/fix/fix.go
@@ -10,10 +10,10 @@ import (

 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/build"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 var flags struct {
--- a/kustomize/commands/edit/fix/fix_test.go
+++ b/kustomize/commands/edit/fix/fix_test.go
@@ -9,8 +9,8 @@ import (

 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/kustomize/api/filesys"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 func TestFix(t *testing.T) {
--- a/kustomize/commands/edit/remove/all.go
+++ b/kustomize/commands/edit/remove/all.go
@@ -5,8 +5,8 @@ package remove

 import (
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 // NewCmdRemove returns an instance of 'remove' subcommand.
--- a/kustomize/commands/edit/remove/removemetadata.go
+++ b/kustomize/commands/edit/remove/removemetadata.go
@@ -8,10 +8,10 @@ import (
 	"strings"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 // kindOfAdd is the kind of metadata being added: label or annotation
--- a/kustomize/commands/edit/remove/removemetadata_test.go
+++ b/kustomize/commands/edit/remove/removemetadata_test.go
@@ -8,11 +8,11 @@ import (
 	"strings"
 	"testing"

-	"sigs.k8s.io/kustomize/api/filesys"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 func makeKustomizationFS() filesys.FileSystem {
--- a/kustomize/commands/edit/remove/removepatch.go
+++ b/kustomize/commands/edit/remove/removepatch.go
@@ -8,10 +8,10 @@ import (

 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 type removePatchOptions struct {
--- a/kustomize/commands/edit/remove/removepatch_test.go
+++ b/kustomize/commands/edit/remove/removepatch_test.go
@@ -6,8 +6,8 @@ package remove
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/api/filesys"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 const (
--- a/kustomize/commands/edit/remove/removeresource.go
+++ b/kustomize/commands/edit/remove/removeresource.go
@@ -8,9 +8,9 @@ import (
 	"path/filepath"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 type removeResourceOptions struct {
--- a/kustomize/commands/edit/remove/removetransformer.go
+++ b/kustomize/commands/edit/remove/removetransformer.go
@@ -7,9 +7,9 @@ import (
 	"errors"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 type removeTransformerOptions struct {
--- a/kustomize/commands/edit/remove_test/removetest.go
+++ b/kustomize/commands/edit/remove_test/removetest.go
@@ -6,8 +6,8 @@ import (
 	"testing"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 // Given represents the provided inputs for the test case.
--- a/kustomize/commands/edit/set/all.go
+++ b/kustomize/commands/edit/set/all.go
@@ -5,8 +5,8 @@ package set

 import (
 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 // NewCmdSet returns an instance of 'set' subcommand.
--- a/kustomize/commands/edit/set/set_name_prefix.go
+++ b/kustomize/commands/edit/set/set_name_prefix.go
@@ -7,8 +7,8 @@ import (
 	"errors"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 type setNamePrefixOptions struct {
--- a/kustomize/commands/edit/set/set_name_prefix_test.go
+++ b/kustomize/commands/edit/set/set_name_prefix_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"

-	"sigs.k8s.io/kustomize/api/filesys"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 const (
--- a/kustomize/commands/edit/set/set_name_suffix.go
+++ b/kustomize/commands/edit/set/set_name_suffix.go
@@ -7,8 +7,8 @@ import (
 	"errors"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 type setNameSuffixOptions struct {
--- a/kustomize/commands/edit/set/set_name_suffix_test.go
+++ b/kustomize/commands/edit/set/set_name_suffix_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"

-	"sigs.k8s.io/kustomize/api/filesys"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 const (
--- a/kustomize/commands/edit/set/setimage.go
+++ b/kustomize/commands/edit/set/setimage.go
@@ -12,8 +12,8 @@ import (
 	"sigs.k8s.io/kustomize/api/types"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 type setImageOptions struct {
--- a/kustomize/commands/edit/set/setimage_test.go
+++ b/kustomize/commands/edit/set/setimage_test.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"

-	"sigs.k8s.io/kustomize/api/filesys"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 func TestSetImage(t *testing.T) {
--- a/kustomize/commands/edit/set/setlabel.go
+++ b/kustomize/commands/edit/set/setlabel.go
@@ -7,11 +7,11 @@ import (
 	"fmt"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 type setLabelOptions struct {
--- a/kustomize/commands/edit/set/setlabel_test.go
+++ b/kustomize/commands/edit/set/setlabel_test.go
@@ -6,11 +6,11 @@ package set
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/api/filesys"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 func makeKustomization(t *testing.T) *types.Kustomization {
--- a/kustomize/commands/edit/set/setnamespace.go
+++ b/kustomize/commands/edit/set/setnamespace.go
@@ -9,9 +9,9 @@ import (
 	"strings"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 type setNamespaceOptions struct {
--- a/kustomize/commands/edit/set/setnamespace_test.go
+++ b/kustomize/commands/edit/set/setnamespace_test.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"testing"

-	"sigs.k8s.io/kustomize/api/filesys"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 const (
--- a/kustomize/commands/edit/set/setreplicas.go
+++ b/kustomize/commands/edit/set/setreplicas.go
@@ -10,9 +10,9 @@ import (
 	"strings"

 	"github.com/spf13/cobra"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 type setReplicasOptions struct {
--- a/kustomize/commands/edit/set/setreplicas_test.go
+++ b/kustomize/commands/edit/set/setreplicas_test.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"

-	"sigs.k8s.io/kustomize/api/filesys"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 func TestSetReplicas(t *testing.T) {
--- a/kustomize/commands/internal/kustfile/kustomizationfile.go
+++ b/kustomize/commands/internal/kustfile/kustomizationfile.go
@@ -13,9 +13,9 @@ import (
 	"regexp"
 	"strings"

-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 	"sigs.k8s.io/yaml"
 )

--- a/kustomize/commands/internal/kustfile/kustomizationfile_test.go
+++ b/kustomize/commands/internal/kustfile/kustomizationfile_test.go
@@ -10,10 +10,10 @@ import (

 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
 	"sigs.k8s.io/kustomize/api/types"
 	testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 func TestFieldOrder(t *testing.T) {
--- a/kustomize/commands/internal/testutils/testutils.go
+++ b/kustomize/commands/internal/testutils/testutils.go
@@ -4,8 +4,8 @@
 package testutils_test

 import (
-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/konfig"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 const (
--- a/kustomize/commands/internal/util/util.go
+++ b/kustomize/commands/internal/util/util.go
@@ -8,8 +8,8 @@ import (
 	"log"
 	"strings"

-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 // GlobPatterns accepts a slice of glob strings and returns the set of
--- a/kustomize/commands/internal/util/util_test.go
+++ b/kustomize/commands/internal/util/util_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"

-	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/ifc"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 )

 func TestConvertToMap(t *testing.T) {
--- a/kustomize/go.mod
+++ b/kustomize/go.mod
@@ -5,7 +5,6 @@ go 1.16
 require (
 	github.com/google/go-cmp v0.5.2
 	github.com/pkg/errors v0.9.1
-	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0