Refactoring to get rid of duplicated code

This commit is contained in:
Alexey Odinokov
2020-06-17 05:26:30 +00:00
parent 178f4e21f0
commit 919bdb84c9
6 changed files with 252 additions and 313 deletions

View File

@@ -16,7 +16,6 @@ import (
"sigs.k8s.io/kustomize/api/ifc"
"sigs.k8s.io/kustomize/api/internal/plugins/builtinhelpers"
"sigs.k8s.io/kustomize/api/internal/plugins/execplugin"
"sigs.k8s.io/kustomize/api/internal/plugins/fnplugin"
"sigs.k8s.io/kustomize/api/internal/plugins/utils"
"sigs.k8s.io/kustomize/api/konfig"
"sigs.k8s.io/kustomize/api/resid"
@@ -168,9 +167,9 @@ func (l *Loader) makeBuiltinPlugin(r resid.Gvk) (resmap.Configurable, error) {
}
func (l *Loader) loadPlugin(res *resource.Resource) (resmap.Configurable, error) {
_, err := fnplugin.GetFunctionSpec(res)
_, err := execplugin.GetFunctionSpec(res)
if err == nil {
return fnplugin.NewFnPlugin(&l.pc.FnpLoadingOptions), nil
return execplugin.NewFnPlugin(&l.pc.FnpLoadingOptions), nil
}
return l.loadExecOrGoPlugin(res.OrgId())
}