Update unpinned pluginator to new framework

This commit is contained in:
Katrina Verey
2021-03-02 09:01:00 -08:00
parent 5c4b5b1bf0
commit a7000dd9c6
2 changed files with 4 additions and 22 deletions

View File

@@ -8,7 +8,6 @@ require (
github.com/stretchr/testify v1.4.0 github.com/stretchr/testify v1.4.0
sigs.k8s.io/kustomize/api v0.8.4 sigs.k8s.io/kustomize/api v0.8.4
sigs.k8s.io/kustomize/kyaml v0.10.13 sigs.k8s.io/kustomize/kyaml v0.10.13
sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api => ../../api replace sigs.k8s.io/kustomize/api => ../../api

View File

@@ -9,7 +9,6 @@ import (
"sigs.k8s.io/kustomize/api/provider" "sigs.k8s.io/kustomize/api/provider"
"sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resmap"
"sigs.k8s.io/kustomize/kyaml/fn/framework" "sigs.k8s.io/kustomize/kyaml/fn/framework"
"sigs.k8s.io/yaml"
) )
//nolint //nolint
@@ -21,24 +20,17 @@ func main() {
pluginHelpers := resmap.NewPluginHelpers( pluginHelpers := resmap.NewPluginHelpers(
nil, p.GetFieldValidator(), resmapFactory) nil, p.GetFieldValidator(), resmapFactory)
resourceList := &framework.ResourceList{} processor := framework.ResourceListProcessorFunc(func(resourceList *framework.ResourceList) error {
resourceList.FunctionConfig = map[string]interface{}{}
cmd := framework.Command(resourceList, func() error {
resMap, err := resmapFactory.NewResMapFromRNodeSlice(resourceList.Items) resMap, err := resmapFactory.NewResMapFromRNodeSlice(resourceList.Items)
if err != nil { if err != nil {
return err return err
} }
dataField, err := getDataFromFunctionConfig(resourceList.FunctionConfig) dataValue, err := resourceList.FunctionConfig.Field("data").Value.String()
if err != nil {
return err
}
dataValue, err := yaml.Marshal(dataField)
if err != nil { if err != nil {
return err return err
} }
err = plugin.Config(pluginHelpers, dataValue) err = plugin.Config(pluginHelpers, []byte(dataValue))
if err != nil { if err != nil {
return err return err
} }
@@ -60,17 +52,8 @@ func main() {
} }
return nil return nil
}) })
if err := cmd.Execute(); err != nil { if err := framework.Execute(&processor, nil); err != nil {
fmt.Println(err) fmt.Println(err)
os.Exit(1) os.Exit(1)
} }
} }
//nolint
func getDataFromFunctionConfig(fc interface{}) (interface{}, error) {
f, ok := fc.(map[string]interface{})
if !ok {
return nil, fmt.Errorf("function config %#v is not valid", fc)
}
return f["data"], nil
}