From f7c34ccb5273c46f7dcf7bcda2690aff5a222bb0 Mon Sep 17 00:00:00 2001 From: Jingfang Liu Date: Wed, 16 Jan 2019 13:33:06 -0800 Subject: [PATCH] Remove filesystem from ConfigMapGenerator and SecretGenerator --- k8sdeps/configmapandsecret/configmapfactory.go | 9 +++------ k8sdeps/configmapandsecret/configmapfactory_test.go | 2 +- k8sdeps/configmapandsecret/secretfactory.go | 8 +++----- k8sdeps/configmapandsecret/secretfactory_test.go | 2 +- k8sdeps/kunstruct/factory.go | 9 ++++----- pkg/commands/edit/add/configmap.go | 2 +- pkg/ifc/ifc.go | 3 +-- pkg/resmap/factory.go | 7 +++---- pkg/resmap/factory_test.go | 4 ++-- pkg/resource/factory.go | 7 +++---- pkg/target/kusttarget.go | 2 +- 11 files changed, 23 insertions(+), 32 deletions(-) diff --git a/k8sdeps/configmapandsecret/configmapfactory.go b/k8sdeps/configmapandsecret/configmapfactory.go index 71e932f8e..10be41a71 100644 --- a/k8sdeps/configmapandsecret/configmapfactory.go +++ b/k8sdeps/configmapandsecret/configmapfactory.go @@ -26,21 +26,18 @@ import ( "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/validation" - "sigs.k8s.io/kustomize/pkg/fs" "sigs.k8s.io/kustomize/pkg/ifc" "sigs.k8s.io/kustomize/pkg/types" ) // ConfigMapFactory makes ConfigMaps. type ConfigMapFactory struct { - fSys fs.FileSystem - ldr ifc.Loader + ldr ifc.Loader } // NewConfigMapFactory returns a new ConfigMapFactory. -func NewConfigMapFactory( - fSys fs.FileSystem, l ifc.Loader) *ConfigMapFactory { - return &ConfigMapFactory{fSys: fSys, ldr: l} +func NewConfigMapFactory(l ifc.Loader) *ConfigMapFactory { + return &ConfigMapFactory{ldr: l} } func (f *ConfigMapFactory) makeFreshConfigMap( diff --git a/k8sdeps/configmapandsecret/configmapfactory_test.go b/k8sdeps/configmapandsecret/configmapfactory_test.go index b3914f5ad..d34a190ab 100644 --- a/k8sdeps/configmapandsecret/configmapfactory_test.go +++ b/k8sdeps/configmapandsecret/configmapfactory_test.go @@ -131,7 +131,7 @@ func TestConstructConfigMap(t *testing.T) { fSys := fs.MakeFakeFS() fSys.WriteFile("/configmap/app.env", []byte("DB_USERNAME=admin\nDB_PASSWORD=somepw\n")) fSys.WriteFile("/configmap/app-init.ini", []byte("FOO=bar\nBAR=baz\n")) - f := NewConfigMapFactory(fSys, loader.NewFileLoaderAtRoot(fSys)) + f := NewConfigMapFactory(loader.NewFileLoaderAtRoot(fSys)) for _, tc := range testCases { cm, err := f.MakeConfigMap(&tc.input, tc.options) if err != nil { diff --git a/k8sdeps/configmapandsecret/secretfactory.go b/k8sdeps/configmapandsecret/secretfactory.go index ab6c67d1c..1303c812c 100644 --- a/k8sdeps/configmapandsecret/secretfactory.go +++ b/k8sdeps/configmapandsecret/secretfactory.go @@ -23,20 +23,18 @@ import ( "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/validation" - "sigs.k8s.io/kustomize/pkg/fs" "sigs.k8s.io/kustomize/pkg/ifc" "sigs.k8s.io/kustomize/pkg/types" ) // SecretFactory makes Secrets. type SecretFactory struct { - fSys fs.FileSystem - ldr ifc.Loader + ldr ifc.Loader } // NewSecretFactory returns a new SecretFactory. -func NewSecretFactory(fSys fs.FileSystem, ldr ifc.Loader) *SecretFactory { - return &SecretFactory{fSys: fSys, ldr: ldr} +func NewSecretFactory(ldr ifc.Loader) *SecretFactory { + return &SecretFactory{ldr: ldr} } func (f *SecretFactory) makeFreshSecret(args *types.SecretArgs) *corev1.Secret { diff --git a/k8sdeps/configmapandsecret/secretfactory_test.go b/k8sdeps/configmapandsecret/secretfactory_test.go index c299a960d..e62ea04c4 100644 --- a/k8sdeps/configmapandsecret/secretfactory_test.go +++ b/k8sdeps/configmapandsecret/secretfactory_test.go @@ -132,7 +132,7 @@ func TestConstructSecret(t *testing.T) { fSys := fs.MakeFakeFS() fSys.WriteFile("/secret/app.env", []byte("DB_USERNAME=admin\nDB_PASSWORD=somepw\n")) fSys.WriteFile("/secret/app-init.ini", []byte("FOO=bar\nBAR=baz\n")) - f := NewSecretFactory(fSys, loader.NewFileLoaderAtRoot(fSys)) + f := NewSecretFactory(loader.NewFileLoaderAtRoot(fSys)) for _, tc := range testCases { cm, err := f.MakeSecret(&tc.input, tc.options) if err != nil { diff --git a/k8sdeps/kunstruct/factory.go b/k8sdeps/kunstruct/factory.go index 432bf4ee5..44222408f 100644 --- a/k8sdeps/kunstruct/factory.go +++ b/k8sdeps/kunstruct/factory.go @@ -25,7 +25,6 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/util/yaml" "sigs.k8s.io/kustomize/k8sdeps/configmapandsecret" - "sigs.k8s.io/kustomize/pkg/fs" "sigs.k8s.io/kustomize/pkg/ifc" "sigs.k8s.io/kustomize/pkg/types" ) @@ -94,10 +93,10 @@ func (kf *KunstructuredFactoryImpl) MakeSecret(args *types.SecretArgs, options * return NewKunstructuredFromObject(sec) } -// Set sets loader, filesystem and workdirectory -func (kf *KunstructuredFactoryImpl) Set(fs fs.FileSystem, ldr ifc.Loader) { - kf.cmFactory = configmapandsecret.NewConfigMapFactory(fs, ldr) - kf.secretFactory = configmapandsecret.NewSecretFactory(fs, ldr) +// Set sets loader +func (kf *KunstructuredFactoryImpl) Set(ldr ifc.Loader) { + kf.cmFactory = configmapandsecret.NewConfigMapFactory(ldr) + kf.secretFactory = configmapandsecret.NewSecretFactory(ldr) } // validate validates that u has kind and name diff --git a/pkg/commands/edit/add/configmap.go b/pkg/commands/edit/add/configmap.go index 7fc93518f..013967fd4 100644 --- a/pkg/commands/edit/add/configmap.go +++ b/pkg/commands/edit/add/configmap.go @@ -67,7 +67,7 @@ func newCmdAddConfigMap(fSys fs.FileSystem, kf ifc.KunstructuredFactory) *cobra. } // Add the flagsAndArgs map to the kustomization file. - kf.Set(fSys, loader.NewFileLoaderAtCwd(fSys)) + kf.Set(loader.NewFileLoaderAtCwd(fSys)) err = addConfigMap(kustomization, flagsAndArgs, kf) if err != nil { return err diff --git a/pkg/ifc/ifc.go b/pkg/ifc/ifc.go index c4f3dbb26..e6267cae2 100644 --- a/pkg/ifc/ifc.go +++ b/pkg/ifc/ifc.go @@ -18,7 +18,6 @@ limitations under the License. package ifc import ( - "sigs.k8s.io/kustomize/pkg/fs" "sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/types" ) @@ -67,7 +66,7 @@ type KunstructuredFactory interface { FromMap(m map[string]interface{}) Kunstructured MakeConfigMap(args *types.ConfigMapArgs, options *types.GeneratorOptions) (Kunstructured, error) MakeSecret(args *types.SecretArgs, options *types.GeneratorOptions) (Kunstructured, error) - Set(fs fs.FileSystem, ldr Loader) + Set(ldr Loader) } // See core.v1.SecretTypeOpaque diff --git a/pkg/resmap/factory.go b/pkg/resmap/factory.go index e3d1a6878..9e64dbee4 100644 --- a/pkg/resmap/factory.go +++ b/pkg/resmap/factory.go @@ -20,7 +20,6 @@ import ( "fmt" "github.com/pkg/errors" - "sigs.k8s.io/kustomize/pkg/fs" "sigs.k8s.io/kustomize/pkg/ifc" internal "sigs.k8s.io/kustomize/pkg/internal/error" "sigs.k8s.io/kustomize/pkg/resource" @@ -106,9 +105,9 @@ func (rmF *Factory) NewResMapFromSecretArgs(argsList []types.SecretArgs, options return newResMapFromResourceSlice(resources) } -// Set sets the filesystem and loader for the underlying factory -func (rmF *Factory) Set(fs fs.FileSystem, ldr ifc.Loader) { - rmF.resF.Set(fs, ldr) +// Set sets the loader for the underlying factory +func (rmF *Factory) Set(ldr ifc.Loader) { + rmF.resF.Set(ldr) } func newResMapFromResourceSlice(resources []*resource.Resource) (ResMap, error) { diff --git a/pkg/resmap/factory_test.go b/pkg/resmap/factory_test.go index 16daccfc4..ec6af7661 100644 --- a/pkg/resmap/factory_test.go +++ b/pkg/resmap/factory_test.go @@ -231,7 +231,7 @@ BAR=baz // TODO: add testcase for data coming from multiple sources like // files/literal/env etc. } - rmF.Set(fs.MakeFakeFS(), l) + rmF.Set(l) for _, tc := range testCases { if ferr := l.AddFile(tc.filepath, []byte(tc.content)); ferr != nil { t.Fatalf("Error adding fake file: %v\n", ferr) @@ -263,7 +263,7 @@ func TestNewResMapFromSecretArgs(t *testing.T) { } fakeFs := fs.MakeFakeFS() fakeFs.Mkdir(".") - rmF.Set(fakeFs, loader.NewFileLoaderAtRoot(fakeFs)) + rmF.Set(loader.NewFileLoaderAtRoot(fakeFs)) actual, err := rmF.NewResMapFromSecretArgs(secrets, nil) if err != nil { diff --git a/pkg/resource/factory.go b/pkg/resource/factory.go index 2f287ecbd..789b4cafd 100644 --- a/pkg/resource/factory.go +++ b/pkg/resource/factory.go @@ -21,7 +21,6 @@ import ( "fmt" "log" - "sigs.k8s.io/kustomize/pkg/fs" "sigs.k8s.io/kustomize/pkg/ifc" internal "sigs.k8s.io/kustomize/pkg/internal/error" "sigs.k8s.io/kustomize/pkg/patch" @@ -108,9 +107,9 @@ func (rf *Factory) SliceFromBytes(in []byte) ([]*Resource, error) { return result, nil } -// Set sets the filesystem and loader for the underlying factory -func (rf *Factory) Set(fs fs.FileSystem, ldr ifc.Loader) { - rf.kf.Set(fs, ldr) +// Set sets the loader for the underlying factory +func (rf *Factory) Set(ldr ifc.Loader) { + rf.kf.Set(ldr) } // MakeConfigMap makes an instance of Resource for ConfigMap diff --git a/pkg/target/kusttarget.go b/pkg/target/kusttarget.go index b362737f2..d26ccd865 100644 --- a/pkg/target/kusttarget.go +++ b/pkg/target/kusttarget.go @@ -211,7 +211,7 @@ func (kt *KustTarget) accumulateTarget() ( func (kt *KustTarget) generateConfigMapsAndSecrets( errs *interror.KustomizationErrors) (resmap.ResMap, error) { - kt.rFactory.Set(kt.fSys, kt.ldr) + kt.rFactory.Set(kt.ldr) cms, err := kt.rFactory.NewResMapFromConfigMapArgs( kt.kustomization.ConfigMapGenerator, kt.kustomization.GeneratorOptions) if err != nil {