Do no require exec/go plugin home to use fn plugins

This commit is contained in:
Katrina Verey
2021-03-22 15:51:29 -07:00
parent 710db98dbf
commit e77c284924
11 changed files with 80 additions and 83 deletions

View File

@@ -5,7 +5,6 @@ package kusttest_test
import (
"path/filepath"
"strings"
"testing"
"sigs.k8s.io/kustomize/api/filesys"
@@ -77,15 +76,7 @@ func (th Harness) MakeOptionsPluginsDisabled() krusty.Options {
// Enables use of non-builtin plugins.
func (th Harness) MakeOptionsPluginsEnabled() krusty.Options {
pc, err := konfig.EnabledPluginConfig(types.BploLoadFromFileSys)
if err != nil {
if strings.Contains(err.Error(), "unable to find plugin root") {
th.t.Log(
"Tests that want to run with plugins enabled must be " +
"bookended by calls to MakeEnhancedHarness(), Reset().")
}
th.t.Fatal(err)
}
pc := konfig.EnabledPluginConfig(types.BploLoadFromFileSys)
o := *krusty.MakeDefaultOptions()
o.PluginConfig = pc
return o

View File

@@ -40,11 +40,8 @@ type HarnessEnhanced struct {
func MakeEnhancedHarness(t *testing.T) *HarnessEnhanced {
pte := newPluginTestEnv(t).set()
pc, err := konfig.EnabledPluginConfig(types.BploLoadFromFileSys)
pc := konfig.EnabledPluginConfig(types.BploLoadFromFileSys)
pc.FnpLoadingOptions.EnableStar = true
if err != nil {
t.Fatal(err)
}
p := provider.NewDefaultDepProvider()
resourceFactory := p.GetResourceFactory()
resmapFactory := resmap.NewFactory(resourceFactory)