Get rid of the fake loader.

2026-06-29 01:30:51 +00:00 · 2019-12-03 16:57:55 -08:00
parent 7c1b477ff6
commit caa71a73fe
9 changed files with 116 additions and 166 deletions
--- a/api/internal/accumulator/loadconfigfromcrds_test.go
+++ b/api/internal/accumulator/loadconfigfromcrds_test.go
@@ -7,9 +7,10 @@ import (
 	"reflect"
 	"testing"

-	"sigs.k8s.io/kustomize/api/ifc"
+	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/api/loader"
+
 	. "sigs.k8s.io/kustomize/api/internal/accumulator"
-	"sigs.k8s.io/kustomize/api/internal/loadertest"
 	"sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig"
 	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/types"
@@ -135,15 +136,6 @@ If it is not set we generate a secret dynamically",
 `
 )

-func makeLoader(t *testing.T) ifc.Loader {
-	ldr := loadertest.NewFakeLoader("/testpath")
-	err := ldr.AddFile("/testpath/crd.json", []byte(crdContent))
-	if err != nil {
-		t.Fatalf("Failed to setup fake ldr.")
-	}
-	return ldr
-}
-
 func TestLoadCRDs(t *testing.T) {
 	nbrs := []builtinconfig.NameBackReferences{
 		{
@@ -172,7 +164,14 @@ func TestLoadCRDs(t *testing.T) {
 		NameReference: nbrs,
 	}

-	actualTc, err := LoadConfigFromCRDs(makeLoader(t), []string{"crd.json"})
+	fSys := filesys.MakeFsInMemory()
+	fSys.WriteFile("/testpath/crd.json", []byte(crdContent))
+	ldr, err := loader.NewLoader(loader.RestrictionRootOnly, "/testpath", fSys)
+	if err != nil {
+		t.Fatalf("unexpected error:%v", err)
+	}
+
+	actualTc, err := LoadConfigFromCRDs(ldr, []string{"crd.json"})
 	if err != nil {
 		t.Fatalf("unexpected error:%v", err)
 	}
--- a/api/internal/loadertest/fakeloader.go
+++ b/api/internal/loadertest/fakeloader.go
@@ -1,76 +0,0 @@
-// Copyright 2019 The Kubernetes Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package loadertest holds a fake for the Loader interface.
-package loadertest
-
-import (
-	"log"
-
-	"sigs.k8s.io/kustomize/api/filesys"
-	"sigs.k8s.io/kustomize/api/ifc"
-	"sigs.k8s.io/kustomize/api/loader"
-)
-
-// FakeLoader encapsulates the delegate Loader and the fake file system.
-type FakeLoader struct {
-	fs       filesys.FileSystem
-	delegate ifc.Loader
-}
-
-// NewFakeLoader returns a Loader that uses a fake filesystem.
-// The loader will be restricted to root only.
-// The root argument should be an absolute file path.
-func NewFakeLoader(root string) FakeLoader {
-	return NewFakeLoaderWithRestrictor(
-		loader.RestrictionRootOnly, filesys.MakeFsInMemory(), root)
-}
-
-// NewFakeLoaderWithRestrictor returns a Loader that
-// uses a fake filesystem.
-// The initialDir argument should be an absolute file path.
-func NewFakeLoaderWithRestrictor(
-	lr loader.LoadRestrictorFunc,
-	fSys filesys.FileSystem,
-	initialDir string) FakeLoader {
-	fSys.Mkdir(initialDir)
-	ldr, err := loader.NewLoader(lr, initialDir, fSys)
-	if err != nil {
-		log.Fatalf("Unable to make loader: %v", err)
-	}
-	return FakeLoader{fs: fSys, delegate: ldr}
-}
-
-// AddFile adds a fake file to the file system.
-func (f FakeLoader) AddFile(fullFilePath string, content []byte) error {
-	return f.fs.WriteFile(fullFilePath, content)
-}
-
-// AddDirectory adds a fake directory to the file system.
-func (f FakeLoader) AddDirectory(fullDirPath string) error {
-	return f.fs.Mkdir(fullDirPath)
-}
-
-// Root delegates.
-func (f FakeLoader) Root() string {
-	return f.delegate.Root()
-}
-
-// New creates a new loader from a new root.
-func (f FakeLoader) New(newRoot string) (ifc.Loader, error) {
-	l, err := f.delegate.New(newRoot)
-	if err != nil {
-		return nil, err
-	}
-	return FakeLoader{fs: f.fs, delegate: l}, nil
-}
-
-// Load delegates.
-func (f FakeLoader) Load(location string) ([]byte, error) {
-	return f.delegate.Load(location)
-}
-
-// Cleanup delegates.
-func (f FakeLoader) Cleanup() error {
-	return f.delegate.Cleanup()
-}
--- a/api/internal/plugins/builtinconfig/loaddefaultconfig_test.go
+++ b/api/internal/plugins/builtinconfig/loaddefaultconfig_test.go
@@ -7,21 +7,30 @@ import (
 	"reflect"
 	"testing"

-	"sigs.k8s.io/kustomize/api/internal/loadertest"
+	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/api/loader"
 	"sigs.k8s.io/kustomize/api/resid"
 	"sigs.k8s.io/kustomize/api/types"
 )

 func TestLoadDefaultConfigsFromFiles(t *testing.T) {
-	ldr := loadertest.NewFakeLoader("/app")
-	ldr.AddFile("/app/config.yaml", []byte(`
+	fSys := filesys.MakeFsInMemory()
+	err := fSys.WriteFile("config.yaml", []byte(`
 namePrefix:
 - path: nameprefix/path
  kind: SomeKind
 `))
-	tcfg, err := loadDefaultConfig(ldr, []string{"/app/config.yaml"})
 	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
+		t.Fatal(err)
+	}
+	ldr, err := loader.NewLoader(
+		loader.RestrictionRootOnly, filesys.Separator, fSys)
+	if err != nil {
+		t.Fatal(err)
+	}
+	tCfg, err := loadDefaultConfig(ldr, []string{"config.yaml"})
+	if err != nil {
+		t.Fatal(err)
 	}
 	expected := &TransformerConfig{
 		NamePrefix: []types.FieldSpec{
@@ -31,7 +40,7 @@ namePrefix:
 			},
 		},
 	}
-	if !reflect.DeepEqual(tcfg, expected) {
-		t.Fatalf("expected %v\n but go6t %v\n", expected, tcfg)
+	if !reflect.DeepEqual(tCfg, expected) {
+		t.Fatalf("expected %v\n but go6t %v\n", expected, tCfg)
 	}
 }
--- a/api/internal/plugins/execplugin/execplugin_test.go
+++ b/api/internal/plugins/execplugin/execplugin_test.go
@@ -8,11 +8,12 @@ import (
 	"strings"
 	"testing"

-	"sigs.k8s.io/kustomize/api/internal/loadertest"
+	"sigs.k8s.io/kustomize/api/filesys"
 	. "sigs.k8s.io/kustomize/api/internal/plugins/execplugin"
-	"sigs.k8s.io/kustomize/api/internal/plugins/loader"
+	pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader"
 	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/api/konfig"
+	fLdr "sigs.k8s.io/kustomize/api/loader"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
@@ -20,11 +21,20 @@ import (
 )

 func TestExecPluginConfig(t *testing.T) {
-	path := "/app"
+	fSys := filesys.MakeFsInMemory()
+	fSys.WriteFile("sed-input.txt", []byte(`
+s/$FOO/foo/g
+s/$BAR/bar/g
+ \ \ \ 
+`))
+	ldr, err := fLdr.NewLoader(
+		fLdr.RestrictionRootOnly, filesys.Separator, fSys)
+	if err != nil {
+		t.Fatal(err)
+	}
 	rf := resmap.NewFactory(
 		resource.NewFactory(
 			kunstruct.NewKunstructuredFactoryImpl()), nil)
-	ldr := loadertest.NewFakeLoader(path)
 	v := valtest_test.MakeFakeValidator()
 	pluginConfig := rf.RF().FromMap(
 		map[string]interface{}{
@@ -36,15 +46,8 @@ func TestExecPluginConfig(t *testing.T) {
 			"argsOneLiner": "one two",
 			"argsFromFile": "sed-input.txt",
 		})
-
-	ldr.AddFile("/app/sed-input.txt", []byte(`
-s/$FOO/foo/g
-s/$BAR/bar/g
- \ \ \ 
-`))
-
 	p := NewExecPlugin(
-		loader.AbsolutePluginPath(
+		pLdr.AbsolutePluginPath(
 			konfig.DisabledPluginConfig(),
 			pluginConfig.OrgId()))
 	// Not checking to see if the plugin is executable,
--- a/api/internal/plugins/loader/loader_test.go
+++ b/api/internal/plugins/loader/loader_test.go
@@ -6,10 +6,11 @@ package loader_test
 import (
 	"testing"

-	"sigs.k8s.io/kustomize/api/internal/loadertest"
+	"sigs.k8s.io/kustomize/api/filesys"
 	. "sigs.k8s.io/kustomize/api/internal/plugins/loader"
 	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/api/konfig"
+	"sigs.k8s.io/kustomize/api/loader"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
 	kusttest_test "sigs.k8s.io/kustomize/api/testutils/kusttest"
@@ -49,29 +50,29 @@ func TestLoader(t *testing.T) {
 		BuildGoPlugin("builtin", "", "SecretGenerator").
 		BuildGoPlugin("someteam.example.com", "v1", "SomeServiceGenerator")
 	defer th.Reset()
-
 	rmF := resmap.NewFactory(resource.NewFactory(
 		kunstruct.NewKunstructuredFactoryImpl()), nil)
-
-	ldr := loadertest.NewFakeLoader("/foo")
-
+	fLdr, err := loader.NewLoader(
+		loader.RestrictionRootOnly,
+		filesys.Separator, filesys.MakeFsInMemory())
+	if err != nil {
+		t.Fatal(err)
+	}
 	c, err := konfig.EnabledPluginConfig()
 	if err != nil {
 		t.Fatal(err)
 	}
-
 	pLdr := NewLoader(c, rmF)
 	if pLdr == nil {
 		t.Fatal("expect non-nil loader")
 	}
-
 	m, err := rmF.NewResMapFromBytes([]byte(
 		someServiceGenerator + "---\n" + secretGenerator))
 	if err != nil {
 		t.Fatal(err)
 	}
-
-	_, err = pLdr.LoadGenerators(ldr, valtest_test.MakeFakeValidator(), m)
+	_, err = pLdr.LoadGenerators(
+		fLdr, valtest_test.MakeFakeValidator(), m)
 	if err != nil {
 		t.Fatal(err)
 	}
--- a/api/internal/target/maker_test.go
+++ b/api/internal/target/maker_test.go
@@ -8,12 +8,11 @@ import (

 	"sigs.k8s.io/kustomize/api/filesys"
 	"sigs.k8s.io/kustomize/api/internal/k8sdeps/transformer"
-	"sigs.k8s.io/kustomize/api/internal/loadertest"
 	pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader"
 	"sigs.k8s.io/kustomize/api/internal/target"
 	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/api/konfig"
-	"sigs.k8s.io/kustomize/api/loader"
+	fLdr "sigs.k8s.io/kustomize/api/loader"
 	"sigs.k8s.io/kustomize/api/resmap"
 	"sigs.k8s.io/kustomize/api/resource"
 	valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
@@ -35,15 +34,17 @@ func makeKustTargetWithRf(
 	resFact *resource.Factory) *target.KustTarget {
 	rf := resmap.NewFactory(resFact, transformer.NewFactoryImpl())
 	pc := konfig.DisabledPluginConfig()
+	ldr, err := fLdr.NewLoader(fLdr.RestrictionRootOnly, root, fSys)
+	if err != nil {
+		t.Fatal(err)
+	}
 	kt := target.NewKustTarget(
-		loadertest.NewFakeLoaderWithRestrictor(
-			loader.RestrictionRootOnly, fSys, root),
+		ldr,
 		valtest_test.MakeFakeValidator(),
 		rf,
 		transformer.NewFactoryImpl(),
 		pLdr.NewLoader(pc, rf))
-	err := kt.Load()
-	if err != nil {
+	if err = kt.Load(); err != nil {
 		t.Fatalf("Unexpected construction error %v", err)
 	}
 	return kt