diff --git a/api/filesys/filesys.go b/api/filesys/filesys.go new file mode 100644 index 0000000000..171f7306bc --- /dev/null +++ b/api/filesys/filesys.go @@ -0,0 +1,61 @@ +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +// Package filesys provides a file system abstraction, +// a subset of that provided by golang.org/pkg/os, +// with an on-disk and in-memory representation. +// +// Deprecated: use sigs.k8s.io/kustomize/kyaml/filesys instead. +package filesys + +import "sigs.k8s.io/kustomize/kyaml/filesys" + +const ( + // Separator is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.Separator. + Separator = filesys.Separator + // SelfDir is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.SelfDir. + SelfDir = filesys.SelfDir + // ParentDir is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.ParentDir. + ParentDir = filesys.ParentDir +) + +type ( + // FileSystem is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.FileSystem. + FileSystem = filesys.FileSystem + // FileSystemOrOnDisk is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.FileSystemOrOnDisk. + FileSystemOrOnDisk = filesys.FileSystemOrOnDisk + // ConfirmedDir is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.ConfirmedDir. + ConfirmedDir = filesys.ConfirmedDir +) + +// MakeEmptyDirInMemory is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.MakeEmptyDirInMemory. +func MakeEmptyDirInMemory() FileSystem { return filesys.MakeEmptyDirInMemory() } + +// MakeFsInMemory is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.MakeFsInMemory. +func MakeFsInMemory() FileSystem { return filesys.MakeFsInMemory() } + +// MakeFsOnDisk is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.MakeFsOnDisk. +func MakeFsOnDisk() FileSystem { return filesys.MakeFsOnDisk() } + +// NewTmpConfirmedDir is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.NewTmpConfirmedDir. +func NewTmpConfirmedDir() (filesys.ConfirmedDir, error) { return filesys.NewTmpConfirmedDir() } + +// RootedPath is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.RootedPath. +func RootedPath(elem ...string) string { return filesys.RootedPath(elem...) } + +// StripTrailingSeps is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.StripTrailingSeps. +func StripTrailingSeps(s string) string { return filesys.StripTrailingSeps(s) } + +// StripLeadingSeps is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.StripLeadingSeps. +func StripLeadingSeps(s string) string { return filesys.StripLeadingSeps(s) } + +// PathSplit is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.PathSplit. +func PathSplit(incoming string) []string { return filesys.PathSplit(incoming) } + +// PathJoin is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.PathJoin. +func PathJoin(incoming []string) string { return filesys.PathJoin(incoming) } + +// InsertPathPart is deprecated, use sigs.k8s.io/kustomize/kyaml/filesys.InsertPathPart. +func InsertPathPart(path string, pos int, part string) string { + return filesys.InsertPathPart(path, pos, part) +} diff --git a/api/filters/valueadd/valueadd.go b/api/filters/valueadd/valueadd.go index 326466a45d..f8e6b2f826 100644 --- a/api/filters/valueadd/valueadd.go +++ b/api/filters/valueadd/valueadd.go @@ -6,7 +6,7 @@ package valueadd import ( "strings" - "sigs.k8s.io/kustomize/api/filesys" + "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/kustomize/kyaml/kio" "sigs.k8s.io/kustomize/kyaml/yaml" ) diff --git a/api/internal/accumulator/loadconfigfromcrds.go b/api/internal/accumulator/loadconfigfromcrds.go index 0a79d483d0..cac47c0de6 100644 --- a/api/internal/accumulator/loadconfigfromcrds.go +++ b/api/internal/accumulator/loadconfigfromcrds.go @@ -9,10 +9,10 @@ import ( "github.com/pkg/errors" "k8s.io/kube-openapi/pkg/validation/spec" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/kustomize/kyaml/resid" "sigs.k8s.io/yaml" ) diff --git a/api/internal/accumulator/loadconfigfromcrds_test.go b/api/internal/accumulator/loadconfigfromcrds_test.go index 9544717e6b..9c180cbf92 100644 --- a/api/internal/accumulator/loadconfigfromcrds_test.go +++ b/api/internal/accumulator/loadconfigfromcrds_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "sigs.k8s.io/kustomize/api/filesys" . "sigs.k8s.io/kustomize/api/internal/accumulator" "sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig" "sigs.k8s.io/kustomize/api/loader" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/kustomize/kyaml/resid" ) diff --git a/api/internal/generators/configmap_test.go b/api/internal/generators/configmap_test.go index ef208d1945..f42ba8f70c 100644 --- a/api/internal/generators/configmap_test.go +++ b/api/internal/generators/configmap_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/assert" - "sigs.k8s.io/kustomize/api/filesys" . "sigs.k8s.io/kustomize/api/internal/generators" "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" ) var binaryHello = []byte{ diff --git a/api/internal/generators/secret_test.go b/api/internal/generators/secret_test.go index 53458fe19f..04829531eb 100644 --- a/api/internal/generators/secret_test.go +++ b/api/internal/generators/secret_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/assert" - "sigs.k8s.io/kustomize/api/filesys" . "sigs.k8s.io/kustomize/api/internal/generators" "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 TestMakeSecret(t *testing.T) { diff --git a/api/internal/git/cloner.go b/api/internal/git/cloner.go index 0851feb78d..78f4f32cbb 100644 --- a/api/internal/git/cloner.go +++ b/api/internal/git/cloner.go @@ -4,7 +4,7 @@ package git import ( - "sigs.k8s.io/kustomize/api/filesys" + "sigs.k8s.io/kustomize/kyaml/filesys" ) // Cloner is a function that can clone a git repo. diff --git a/api/internal/git/gitrunner.go b/api/internal/git/gitrunner.go index f778c97e1f..fcc7130cdf 100644 --- a/api/internal/git/gitrunner.go +++ b/api/internal/git/gitrunner.go @@ -8,8 +8,8 @@ import ( "time" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/internal/utils" + "sigs.k8s.io/kustomize/kyaml/filesys" ) // gitRunner runs the external git binary. diff --git a/api/internal/git/repospec.go b/api/internal/git/repospec.go index 7560fa92f1..5a935f510a 100644 --- a/api/internal/git/repospec.go +++ b/api/internal/git/repospec.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "sigs.k8s.io/kustomize/api/filesys" + "sigs.k8s.io/kustomize/kyaml/filesys" ) // Used as a temporary non-empty occupant of the cloneDir diff --git a/api/internal/plugins/builtinconfig/loaddefaultconfig_test.go b/api/internal/plugins/builtinconfig/loaddefaultconfig_test.go index 863a1ad38a..7b2172608d 100644 --- a/api/internal/plugins/builtinconfig/loaddefaultconfig_test.go +++ b/api/internal/plugins/builtinconfig/loaddefaultconfig_test.go @@ -7,9 +7,9 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/loader" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/kustomize/kyaml/resid" ) diff --git a/api/internal/plugins/compiler/compiler_test.go b/api/internal/plugins/compiler/compiler_test.go index e4cd5b2a29..cc32323338 100644 --- a/api/internal/plugins/compiler/compiler_test.go +++ b/api/internal/plugins/compiler/compiler_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "sigs.k8s.io/kustomize/api/filesys" . "sigs.k8s.io/kustomize/api/internal/plugins/compiler" "sigs.k8s.io/kustomize/api/internal/plugins/utils" + "sigs.k8s.io/kustomize/kyaml/filesys" ) // Regression coverage over compiler behavior. diff --git a/api/internal/plugins/execplugin/execplugin_test.go b/api/internal/plugins/execplugin/execplugin_test.go index 77b657b9ef..5cc637f3b0 100644 --- a/api/internal/plugins/execplugin/execplugin_test.go +++ b/api/internal/plugins/execplugin/execplugin_test.go @@ -10,7 +10,6 @@ import ( "testing" "github.com/stretchr/testify/require" - "sigs.k8s.io/kustomize/api/filesys" . "sigs.k8s.io/kustomize/api/internal/plugins/execplugin" pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader" "sigs.k8s.io/kustomize/api/internal/plugins/utils" @@ -18,6 +17,7 @@ import ( "sigs.k8s.io/kustomize/api/provider" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" ) func TestExecPluginConfig(t *testing.T) { diff --git a/api/internal/plugins/loader/loader.go b/api/internal/plugins/loader/loader.go index a52271256b..7bcce43152 100644 --- a/api/internal/plugins/loader/loader.go +++ b/api/internal/plugins/loader/loader.go @@ -13,7 +13,6 @@ import ( "strings" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/internal/plugins/builtinhelpers" "sigs.k8s.io/kustomize/api/internal/plugins/execplugin" @@ -23,6 +22,7 @@ import ( "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/kustomize/kyaml/resid" ) diff --git a/api/internal/plugins/loader/loader_test.go b/api/internal/plugins/loader/loader_test.go index b31f4245c6..c5e30b808b 100644 --- a/api/internal/plugins/loader/loader_test.go +++ b/api/internal/plugins/loader/loader_test.go @@ -6,7 +6,6 @@ package loader_test import ( "testing" - "sigs.k8s.io/kustomize/api/filesys" . "sigs.k8s.io/kustomize/api/internal/plugins/loader" "sigs.k8s.io/kustomize/api/loader" "sigs.k8s.io/kustomize/api/provider" @@ -14,6 +13,7 @@ import ( kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" ) const ( diff --git a/api/internal/plugins/utils/utils.go b/api/internal/plugins/utils/utils.go index 02e163b740..d1c2af7661 100644 --- a/api/internal/plugins/utils/utils.go +++ b/api/internal/plugins/utils/utils.go @@ -12,11 +12,11 @@ import ( "strconv" "time" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/yaml" ) diff --git a/api/internal/plugins/utils/utils_test.go b/api/internal/plugins/utils/utils_test.go index 1959135907..9aa0184ed6 100644 --- a/api/internal/plugins/utils/utils_test.go +++ b/api/internal/plugins/utils/utils_test.go @@ -11,12 +11,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/provider" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" ) func TestDeterminePluginSrcRoot(t *testing.T) { diff --git a/api/internal/target/maker_test.go b/api/internal/target/maker_test.go index e59c4cce79..9d4f9b1ef6 100644 --- a/api/internal/target/maker_test.go +++ b/api/internal/target/maker_test.go @@ -6,7 +6,6 @@ package target_test import ( "testing" - "sigs.k8s.io/kustomize/api/filesys" pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader" "sigs.k8s.io/kustomize/api/internal/target" fLdr "sigs.k8s.io/kustomize/api/loader" @@ -14,6 +13,7 @@ import ( "sigs.k8s.io/kustomize/api/resmap" valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" ) func makeAndLoadKustTarget( diff --git a/api/konfig/plugins.go b/api/konfig/plugins.go index 0615f1768f..30bd3b6e38 100644 --- a/api/konfig/plugins.go +++ b/api/konfig/plugins.go @@ -8,8 +8,8 @@ import ( "path/filepath" "runtime" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" ) const ( diff --git a/api/konfig/plugins_test.go b/api/konfig/plugins_test.go index d06b8c5c20..f3ed8e828b 100644 --- a/api/konfig/plugins_test.go +++ b/api/konfig/plugins_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" ) func TestDefaultAbsPluginHome_NoKustomizePluginHomeEnv(t *testing.T) { diff --git a/api/krusty/kustomizer.go b/api/krusty/kustomizer.go index 88fb8d9879..b06a8221cc 100644 --- a/api/krusty/kustomizer.go +++ b/api/krusty/kustomizer.go @@ -8,7 +8,6 @@ import ( "path/filepath" "sigs.k8s.io/kustomize/api/builtins" - "sigs.k8s.io/kustomize/api/filesys" pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader" "sigs.k8s.io/kustomize/api/internal/target" "sigs.k8s.io/kustomize/api/konfig" @@ -17,6 +16,7 @@ import ( "sigs.k8s.io/kustomize/api/provider" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/kustomize/kyaml/openapi" ) diff --git a/api/krusty/kustomizer_test.go b/api/krusty/kustomizer_test.go index 997ce24da9..928d0a6109 100644 --- a/api/krusty/kustomizer_test.go +++ b/api/krusty/kustomizer_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/krusty" + "sigs.k8s.io/kustomize/kyaml/filesys" ) // A simple usage example to shows what happens when diff --git a/api/krusty/pluginenv_test.go b/api/krusty/pluginenv_test.go index 868c4a5fbe..a4d8c230c6 100644 --- a/api/krusty/pluginenv_test.go +++ b/api/krusty/pluginenv_test.go @@ -9,9 +9,9 @@ import ( "path/filepath" "testing" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/konfig" kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest" + "sigs.k8s.io/kustomize/kyaml/filesys" ) // The PrintPluginEnv plugin is a toy plugin that emits diff --git a/api/krusty/remoteload_test.go b/api/krusty/remoteload_test.go index 73dae91091..1f40d8a8c0 100644 --- a/api/krusty/remoteload_test.go +++ b/api/krusty/remoteload_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/internal/utils" "sigs.k8s.io/kustomize/api/krusty" + "sigs.k8s.io/kustomize/kyaml/filesys" ) func TestRemoteLoad(t *testing.T) { diff --git a/api/kv/kv_test.go b/api/kv/kv_test.go index 8eb60ad165..5f9631c650 100644 --- a/api/kv/kv_test.go +++ b/api/kv/kv_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "sigs.k8s.io/kustomize/api/filesys" ldr "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 makeKvLoader(fSys filesys.FileSystem) *loader { diff --git a/api/loader/fileloader.go b/api/loader/fileloader.go index e0fa2807f5..92bfc3f699 100644 --- a/api/loader/fileloader.go +++ b/api/loader/fileloader.go @@ -12,9 +12,9 @@ import ( "path/filepath" "strings" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/internal/git" + "sigs.k8s.io/kustomize/kyaml/filesys" ) // fileLoader is a kustomization's interface to files. diff --git a/api/loader/fileloader_test.go b/api/loader/fileloader_test.go index 73b66f0cb9..aedfd1693d 100644 --- a/api/loader/fileloader_test.go +++ b/api/loader/fileloader_test.go @@ -14,10 +14,10 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/internal/git" "sigs.k8s.io/kustomize/api/konfig" + "sigs.k8s.io/kustomize/kyaml/filesys" ) type testData struct { diff --git a/api/loader/loader.go b/api/loader/loader.go index c72a959654..7a2b75f20a 100644 --- a/api/loader/loader.go +++ b/api/loader/loader.go @@ -5,9 +5,9 @@ package loader import ( - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/internal/git" + "sigs.k8s.io/kustomize/kyaml/filesys" ) // NewLoader returns a Loader pointed at the given target. diff --git a/api/loader/loadrestrictions.go b/api/loader/loadrestrictions.go index 99b5562fbf..a016a96254 100644 --- a/api/loader/loadrestrictions.go +++ b/api/loader/loadrestrictions.go @@ -6,7 +6,7 @@ package loader import ( "fmt" - "sigs.k8s.io/kustomize/api/filesys" + "sigs.k8s.io/kustomize/kyaml/filesys" ) type LoadRestrictorFunc func( diff --git a/api/loader/loadrestrictions_test.go b/api/loader/loadrestrictions_test.go index 35210fe83b..de9ded6f42 100644 --- a/api/loader/loadrestrictions_test.go +++ b/api/loader/loadrestrictions_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/api/filesys" + "sigs.k8s.io/kustomize/kyaml/filesys" ) func TestRestrictionNone(t *testing.T) { diff --git a/api/resmap/factory_test.go b/api/resmap/factory_test.go index 515b2fee8a..4f82597d78 100644 --- a/api/resmap/factory_test.go +++ b/api/resmap/factory_test.go @@ -8,7 +8,6 @@ import ( "testing" "github.com/stretchr/testify/assert" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/ifc" "sigs.k8s.io/kustomize/api/kv" "sigs.k8s.io/kustomize/api/loader" @@ -16,6 +15,7 @@ import ( resmaptest_test "sigs.k8s.io/kustomize/api/testutils/resmaptest" valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/kustomize/kyaml/yaml" ) diff --git a/api/resource/factory_test.go b/api/resource/factory_test.go index f40286210d..7d01eb695b 100644 --- a/api/resource/factory_test.go +++ b/api/resource/factory_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/loader" . "sigs.k8s.io/kustomize/api/resource" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" ) func TestSliceFromBytes(t *testing.T) { diff --git a/api/testutils/kusttest/harness.go b/api/testutils/kusttest/harness.go index 694c7ba9ec..412502a501 100644 --- a/api/testutils/kusttest/harness.go +++ b/api/testutils/kusttest/harness.go @@ -7,12 +7,12 @@ import ( "path/filepath" "testing" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/konfig/builtinpluginconsts" "sigs.k8s.io/kustomize/api/krusty" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" ) // Harness manages a test environment. diff --git a/api/testutils/kusttest/harnessenhanced.go b/api/testutils/kusttest/harnessenhanced.go index 8a9c44b477..2d4318a67a 100644 --- a/api/testutils/kusttest/harnessenhanced.go +++ b/api/testutils/kusttest/harnessenhanced.go @@ -11,7 +11,6 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/ifc" pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader" "sigs.k8s.io/kustomize/api/konfig" @@ -20,6 +19,7 @@ import ( "sigs.k8s.io/kustomize/api/resmap" valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filesys" ) // HarnessEnhanced manages a full plugin environment for tests. diff --git a/api/testutils/kusttest/plugintestenv.go b/api/testutils/kusttest/plugintestenv.go index 4e9dbde260..0bc5bd183f 100644 --- a/api/testutils/kusttest/plugintestenv.go +++ b/api/testutils/kusttest/plugintestenv.go @@ -7,10 +7,10 @@ import ( "os" "testing" - "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/internal/plugins/compiler" "sigs.k8s.io/kustomize/api/internal/plugins/utils" "sigs.k8s.io/kustomize/api/konfig" + "sigs.k8s.io/kustomize/kyaml/filesys" ) // pluginTestEnv manages compiling plugins for tests. diff --git a/kustomize/commands/build/build.go b/kustomize/commands/build/build.go index eea6401557..90981d74bb 100644 --- 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 { diff --git a/kustomize/commands/build/build_test.go b/kustomize/commands/build/build_test.go index 43d6149b0d..ef90f2cd74 100644 --- 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) { diff --git a/kustomize/commands/build/writer.go b/kustomize/commands/build/writer.go index 44a2e4ebb1..aef2a6a254 100644 --- 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" ) diff --git a/kustomize/commands/commands.go b/kustomize/commands/commands.go index 85e117e391..3f5e197cd6 100644 --- 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 { diff --git a/kustomize/commands/create/create.go b/kustomize/commands/create/create.go index 83bffbafbe..ad0b8e8919 100644 --- 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 { diff --git a/kustomize/commands/create/create_test.go b/kustomize/commands/create/create_test.go index 728125e1b5..3d0624f746 100644 --- 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() diff --git a/kustomize/commands/edit/add/addbase.go b/kustomize/commands/edit/add/addbase.go index 3560dab9e8..4f8b433d58 100644 --- 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 { diff --git a/kustomize/commands/edit/add/addbase_test.go b/kustomize/commands/edit/add/addbase_test.go index 6a667df4e8..ecad29173e 100644 --- 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 ( diff --git a/kustomize/commands/edit/add/addcomponent.go b/kustomize/commands/edit/add/addcomponent.go index beb78c40c1..1aff39332c 100644 --- 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 { diff --git a/kustomize/commands/edit/add/addcomponent_test.go b/kustomize/commands/edit/add/addcomponent_test.go index 74f2003b21..fedd4d7dae 100644 --- 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 ( diff --git a/kustomize/commands/edit/add/addmetadata.go b/kustomize/commands/edit/add/addmetadata.go index 1c7f95cf81..a7483b48d1 100644 --- 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 diff --git a/kustomize/commands/edit/add/addmetadata_test.go b/kustomize/commands/edit/add/addmetadata_test.go index 6244a4b5a3..c3c5ca55cb 100644 --- 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 { diff --git a/kustomize/commands/edit/add/addpatch.go b/kustomize/commands/edit/add/addpatch.go index 76732779cb..7284222d36 100644 --- 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 { diff --git a/kustomize/commands/edit/add/addpatch_test.go b/kustomize/commands/edit/add/addpatch_test.go index 670f73982a..5d9823b721 100644 --- 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 ( diff --git a/kustomize/commands/edit/add/addresource.go b/kustomize/commands/edit/add/addresource.go index f38bdc35a1..ff570f6065 100644 --- 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 { diff --git a/kustomize/commands/edit/add/addresource_test.go b/kustomize/commands/edit/add/addresource_test.go index 9b926ad2a8..efc1442240 100644 --- 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 ( diff --git a/kustomize/commands/edit/add/addtransformer.go b/kustomize/commands/edit/add/addtransformer.go index 605f2f41a0..c37004e9d2 100644 --- 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 { diff --git a/kustomize/commands/edit/add/addtransformer_test.go b/kustomize/commands/edit/add/addtransformer_test.go index 113eb69995..1b9ecb3f87 100644 --- 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 ( diff --git a/kustomize/commands/edit/add/all.go b/kustomize/commands/edit/add/all.go index 89a55e850b..08e0587509 100644 --- 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. diff --git a/kustomize/commands/edit/add/configmap.go b/kustomize/commands/edit/add/configmap.go index f8c7a6b8f0..c538a79590 100644 --- 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. diff --git a/kustomize/commands/edit/add/configmap_test.go b/kustomize/commands/edit/add/configmap_test.go index b43df3add0..42ce274f29 100644 --- 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) { diff --git a/kustomize/commands/edit/add/flagsandargs.go b/kustomize/commands/edit/add/flagsandargs.go index bd22666baa..58b7b30072 100644 --- 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. diff --git a/kustomize/commands/edit/add/flagsandargs_test.go b/kustomize/commands/edit/add/flagsandargs_test.go index 173a965e3b..c3bb9d0dbe 100644 --- 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) { diff --git a/kustomize/commands/edit/add/secret.go b/kustomize/commands/edit/add/secret.go index 7c24193f24..95cb258aa4 100644 --- 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. diff --git a/kustomize/commands/edit/add/secret_test.go b/kustomize/commands/edit/add/secret_test.go index 232e9688de..6005c5e8b9 100644 --- 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) { diff --git a/kustomize/commands/edit/all.go b/kustomize/commands/edit/all.go index ed595efed1..56c4ebe677 100644 --- 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. diff --git a/kustomize/commands/edit/fix/convert.go b/kustomize/commands/edit/fix/convert.go index bb8a898e72..2e551173a9 100644 --- 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" diff --git a/kustomize/commands/edit/fix/convert_test.go b/kustomize/commands/edit/fix/convert_test.go index c803a3c5f8..60d725ffb6 100644 --- 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) { diff --git a/kustomize/commands/edit/fix/fix.go b/kustomize/commands/edit/fix/fix.go index 0fa64b1a21..fd547b5adf 100644 --- 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 { diff --git a/kustomize/commands/edit/fix/fix_test.go b/kustomize/commands/edit/fix/fix_test.go index 7b745ebf6b..163d03baad 100644 --- 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) { diff --git a/kustomize/commands/edit/remove/all.go b/kustomize/commands/edit/remove/all.go index 56701c6e08..4629b48903 100644 --- 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. diff --git a/kustomize/commands/edit/remove/removemetadata.go b/kustomize/commands/edit/remove/removemetadata.go index 8a4eb463e4..6e1f6617ab 100644 --- 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 diff --git a/kustomize/commands/edit/remove/removemetadata_test.go b/kustomize/commands/edit/remove/removemetadata_test.go index ff029ed7f4..54ad78fff7 100644 --- 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 { diff --git a/kustomize/commands/edit/remove/removepatch.go b/kustomize/commands/edit/remove/removepatch.go index 52b9921929..103cb34638 100644 --- 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 { diff --git a/kustomize/commands/edit/remove/removepatch_test.go b/kustomize/commands/edit/remove/removepatch_test.go index 3c63edb2f2..7c2094220f 100644 --- 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 ( diff --git a/kustomize/commands/edit/remove/removeresource.go b/kustomize/commands/edit/remove/removeresource.go index 033445bb3f..ae04657bcb 100644 --- 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 { diff --git a/kustomize/commands/edit/remove/removetransformer.go b/kustomize/commands/edit/remove/removetransformer.go index 4327a86aaf..9f63dbd87b 100644 --- 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 { diff --git a/kustomize/commands/edit/remove_test/removetest.go b/kustomize/commands/edit/remove_test/removetest.go index 8773db682c..2fdced459a 100644 --- 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. diff --git a/kustomize/commands/edit/set/all.go b/kustomize/commands/edit/set/all.go index 4a92c10c4b..6fc373bc6b 100644 --- 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. diff --git a/kustomize/commands/edit/set/set_name_prefix.go b/kustomize/commands/edit/set/set_name_prefix.go index 5920df0fd5..268ce133bf 100644 --- 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 { diff --git a/kustomize/commands/edit/set/set_name_prefix_test.go b/kustomize/commands/edit/set/set_name_prefix_test.go index d17209fbe9..1721334f27 100644 --- 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 ( diff --git a/kustomize/commands/edit/set/set_name_suffix.go b/kustomize/commands/edit/set/set_name_suffix.go index ac92acf943..1eb00e2b97 100644 --- 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 { diff --git a/kustomize/commands/edit/set/set_name_suffix_test.go b/kustomize/commands/edit/set/set_name_suffix_test.go index 64fab4f799..f47dc24646 100644 --- 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 ( diff --git a/kustomize/commands/edit/set/setimage.go b/kustomize/commands/edit/set/setimage.go index 0aaf17aeff..94f02f57c3 100644 --- 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 { diff --git a/kustomize/commands/edit/set/setimage_test.go b/kustomize/commands/edit/set/setimage_test.go index ea9ef599ca..9dce4e45de 100644 --- 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) { diff --git a/kustomize/commands/edit/set/setlabel.go b/kustomize/commands/edit/set/setlabel.go index 6ad8d52023..3fa41ee666 100644 --- 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 { diff --git a/kustomize/commands/edit/set/setlabel_test.go b/kustomize/commands/edit/set/setlabel_test.go index e0615e626f..749dccf30e 100644 --- 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 { diff --git a/kustomize/commands/edit/set/setnamespace.go b/kustomize/commands/edit/set/setnamespace.go index 756a9e3d0a..0da231429f 100644 --- 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 { diff --git a/kustomize/commands/edit/set/setnamespace_test.go b/kustomize/commands/edit/set/setnamespace_test.go index cda1e7a7ad..5dccbab29f 100644 --- 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 ( diff --git a/kustomize/commands/edit/set/setreplicas.go b/kustomize/commands/edit/set/setreplicas.go index 1710f8b164..ab32900aa4 100644 --- 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 { diff --git a/kustomize/commands/edit/set/setreplicas_test.go b/kustomize/commands/edit/set/setreplicas_test.go index 67d6e24d05..a7d00fdb08 100644 --- 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) { diff --git a/kustomize/commands/internal/kustfile/kustomizationfile.go b/kustomize/commands/internal/kustfile/kustomizationfile.go index 3daedb42be..023caae388 100644 --- 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" ) diff --git a/kustomize/commands/internal/kustfile/kustomizationfile_test.go b/kustomize/commands/internal/kustfile/kustomizationfile_test.go index f2bca33c02..dc4801ac43 100644 --- 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) { diff --git a/kustomize/commands/internal/testutils/testutils.go b/kustomize/commands/internal/testutils/testutils.go index fe14b57f26..d25c03b979 100644 --- 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 ( diff --git a/kustomize/commands/internal/util/util.go b/kustomize/commands/internal/util/util.go index a9c837e659..943c4d4d62 100644 --- 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 diff --git a/kustomize/commands/internal/util/util_test.go b/kustomize/commands/internal/util/util_test.go index d39c38f571..6fab551039 100644 --- 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) { diff --git a/kustomize/go.mod b/kustomize/go.mod index 1db303232d..630041c5fb 100644 --- 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 diff --git a/api/filesys/confirmeddir.go b/kyaml/filesys/confirmeddir.go similarity index 100% rename from api/filesys/confirmeddir.go rename to kyaml/filesys/confirmeddir.go diff --git a/api/filesys/confirmeddir_test.go b/kyaml/filesys/confirmeddir_test.go similarity index 97% rename from api/filesys/confirmeddir_test.go rename to kyaml/filesys/confirmeddir_test.go index a354e8ee5b..20dfe6b907 100644 --- a/api/filesys/confirmeddir_test.go +++ b/kyaml/filesys/confirmeddir_test.go @@ -1,14 +1,14 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -package filesys_test +// +build !windows + +package filesys import ( "os" "path/filepath" "testing" - - . "sigs.k8s.io/kustomize/api/filesys" ) func TestJoin(t *testing.T) { diff --git a/api/filesys/doc.go b/kyaml/filesys/doc.go similarity index 100% rename from api/filesys/doc.go rename to kyaml/filesys/doc.go diff --git a/api/filesys/file.go b/kyaml/filesys/file.go similarity index 100% rename from api/filesys/file.go rename to kyaml/filesys/file.go diff --git a/api/filesys/fileinfo.go b/kyaml/filesys/fileinfo.go similarity index 100% rename from api/filesys/fileinfo.go rename to kyaml/filesys/fileinfo.go diff --git a/api/filesys/fileondisk.go b/kyaml/filesys/fileondisk.go similarity index 100% rename from api/filesys/fileondisk.go rename to kyaml/filesys/fileondisk.go diff --git a/api/filesys/filesystem.go b/kyaml/filesys/filesystem.go similarity index 100% rename from api/filesys/filesystem.go rename to kyaml/filesys/filesystem.go diff --git a/api/filesys/filesystem_test.go b/kyaml/filesys/filesystem_test.go similarity index 100% rename from api/filesys/filesystem_test.go rename to kyaml/filesys/filesystem_test.go diff --git a/api/filesys/fsnode.go b/kyaml/filesys/fsnode.go similarity index 100% rename from api/filesys/fsnode.go rename to kyaml/filesys/fsnode.go diff --git a/api/filesys/fsnode_test.go b/kyaml/filesys/fsnode_test.go similarity index 99% rename from api/filesys/fsnode_test.go rename to kyaml/filesys/fsnode_test.go index 4bb361ee38..019a220df9 100644 --- a/api/filesys/fsnode_test.go +++ b/kyaml/filesys/fsnode_test.go @@ -1,6 +1,8 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 +// +build !windows + package filesys import ( diff --git a/api/filesys/fsondisk.go b/kyaml/filesys/fsondisk.go similarity index 100% rename from api/filesys/fsondisk.go rename to kyaml/filesys/fsondisk.go diff --git a/api/filesys/fsondisk_test.go b/kyaml/filesys/fsondisk_test.go similarity index 98% rename from api/filesys/fsondisk_test.go rename to kyaml/filesys/fsondisk_test.go index 3a782b8a91..22c930c08b 100644 --- a/api/filesys/fsondisk_test.go +++ b/kyaml/filesys/fsondisk_test.go @@ -1,7 +1,9 @@ // Copyright 2019 The Kubernetes Authors. // SPDX-License-Identifier: Apache-2.0 -package filesys_test +// +build !windows + +package filesys import ( "io/ioutil" @@ -10,8 +12,6 @@ import ( "path/filepath" "reflect" "testing" - - . "sigs.k8s.io/kustomize/api/filesys" ) func makeTestDir(t *testing.T) (FileSystem, string) { diff --git a/api/filesys/util.go b/kyaml/filesys/util.go similarity index 100% rename from api/filesys/util.go rename to kyaml/filesys/util.go diff --git a/api/filesys/util_test.go b/kyaml/filesys/util_test.go similarity index 98% rename from api/filesys/util_test.go rename to kyaml/filesys/util_test.go index 44d741a144..3c510bf1f2 100644 --- a/api/filesys/util_test.go +++ b/kyaml/filesys/util_test.go @@ -1,11 +1,14 @@ -package filesys_test +// Copyright 2021 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 + +// +build !windows + +package filesys import ( "os" "path/filepath" "testing" - - . "sigs.k8s.io/kustomize/api/filesys" ) // Confirm behavior of filepath.Match