Move ks8deps to api for now.

This commit is contained in:
jregan
2019-10-20 16:30:52 -07:00
parent 22d07ed37d
commit fddde81f9c
32 changed files with 23 additions and 25 deletions

View File

@@ -9,6 +9,7 @@ import (
"testing"
"sigs.k8s.io/kustomize/v3/api/internal/loadertest"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/api/plugins/config"
. "sigs.k8s.io/kustomize/v3/api/plugins/execplugin"
"sigs.k8s.io/kustomize/v3/api/plugins/loader"
@@ -16,7 +17,6 @@ import (
"sigs.k8s.io/kustomize/v3/api/resource"
"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
)
func TestExecPluginConfig(t *testing.T) {

View File

@@ -10,17 +10,15 @@ import (
"reflect"
"strings"
"sigs.k8s.io/kustomize/v3/api/plugins/builtins"
"github.com/pkg/errors"
"sigs.k8s.io/kustomize/v3/api/ifc"
"sigs.k8s.io/kustomize/v3/api/plugins/builtins"
"sigs.k8s.io/kustomize/v3/api/plugins/config"
"sigs.k8s.io/kustomize/v3/api/plugins/execplugin"
"sigs.k8s.io/kustomize/v3/api/resid"
"sigs.k8s.io/kustomize/v3/api/resmap"
"sigs.k8s.io/kustomize/v3/api/resource"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/plugins"
)
type Loader struct {
@@ -176,11 +174,11 @@ func (l *Loader) loadGoPlugin(id resid.ResId) (resmap.Configurable, error) {
if err != nil {
return nil, errors.Wrapf(err, "plugin %s fails to load", absPath)
}
symbol, err := p.Lookup(plugins.PluginSymbol)
symbol, err := p.Lookup(config.PluginSymbol)
if err != nil {
return nil, errors.Wrapf(
err, "plugin %s doesn't have symbol %s",
regId, plugins.PluginSymbol)
regId, config.PluginSymbol)
}
c, ok := symbol.(resmap.Configurable)
if !ok {

View File

@@ -7,13 +7,13 @@ import (
"testing"
"sigs.k8s.io/kustomize/v3/api/internal/loadertest"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/api/plugins/config"
. "sigs.k8s.io/kustomize/v3/api/plugins/loader"
"sigs.k8s.io/kustomize/v3/api/resmap"
"sigs.k8s.io/kustomize/v3/api/resource"
"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
)
const (