kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-05-17 18:25:26 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Enable more linters for new code

Browse Source
This commit is contained in:
Katrina Verey
2022-03-30 17:34:38 -04:00
parent 71bf0d5d14
commit b0d2e4bdcd
7 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/config/internal/commands/run-fns.go
View File

@@ -140,13 +140,13 @@ func (r *RunFnRunner) getContainerFunctions(dataItems []string) (
// set the function annotation on the function config, so that it is parsed by RunFns
value, err := fnAnnotation.String()
if err != nil {
return nil, err
return nil, errors.Wrap(err)
}
err = res.PipeE(
yaml.LookupCreate(yaml.MappingNode, "metadata", "annotations"),
yaml.SetField(runtimeutil.FunctionAnnotationKey, yaml.NewScalarRNode(value)))
if err != nil {
return nil, err
return nil, errors.Wrap(err)
}
return []*yaml.RNode{res}, nil
@@ -206,14 +206,14 @@ data: {}
func fnAnnotationForExec(path string) (*yaml.RNode, error) {
fn, err := yaml.Parse(`exec: {}`)
if err != nil {
return nil, err
return nil, errors.Wrap(err)
}
err = fn.PipeE(
yaml.Lookup("exec"),
yaml.SetField("path", yaml.NewScalarRNode(path)))
if err != nil {
return nil, err
return nil, errors.Wrap(err)
}
return fn, nil
}
@@ -221,7 +221,7 @@ func fnAnnotationForExec(path string) (*yaml.RNode, error) {
func fnAnnotationForStar(path string, url string, name string) (*yaml.RNode, error) {
fn, err := yaml.Parse(`starlark: {}`)
if err != nil {
return nil, err
return nil, errors.Wrap(err)
}
if path != "" {
@@ -229,7 +229,7 @@ func fnAnnotationForStar(path string, url string, name string) (*yaml.RNode, err
yaml.Lookup("starlark"),
yaml.SetField("path", yaml.NewScalarRNode(path)))
if err != nil {
return nil, err
return nil, errors.Wrap(err)
}
}
if url != "" {
@@ -237,14 +237,14 @@ func fnAnnotationForStar(path string, url string, name string) (*yaml.RNode, err
yaml.Lookup("starlark"),
yaml.SetField("url", yaml.NewScalarRNode(url)))
if err != nil {
return nil, err
return nil, errors.Wrap(err)
}
}
err = fn.PipeE(
yaml.Lookup("starlark"),
yaml.SetField("name", yaml.NewScalarRNode(name)))
if err != nil {
return nil, err
return nil, errors.Wrap(err)
}
return fn, nil
}
@@ -252,14 +252,14 @@ func fnAnnotationForStar(path string, url string, name string) (*yaml.RNode, err
func fnAnnotationForImage(image string, enableNetwork bool) (*yaml.RNode, error) {
fn, err := yaml.Parse(`container: {}`)
if err != nil {
return nil, err
return nil, errors.Wrap(err)
}
// TODO: add support network, volumes, etc based on flag values
err = fn.PipeE(
yaml.Lookup("container"),
yaml.SetField("image", yaml.NewScalarRNode(image)))
if err != nil {
return nil, err
return nil, errors.Wrap(err)
}
if enableNetwork {
n := &yaml.Node{
@@ -271,7 +271,7 @@ func fnAnnotationForImage(image string, enableNetwork bool) (*yaml.RNode, error)
yaml.Lookup("container"),
yaml.SetField("network", yaml.NewRNode(n)))
if err != nil {
return nil, err
return nil, errors.Wrap(err)
}
}
return fn, nil

2
cmd/pluginator/internal/krmfunction/converter.go
View File

@@ -156,7 +156,7 @@ func (c *Converter) mkDstDir() error {
func (c *Converter) write(m map[string]string) error {
for k, v := range m {
p := filepath.Join(c.outputDir, k)
err := ioutil.WriteFile(p, []byte(v), 0644) //nolint:gosec
err := ioutil.WriteFile(p, []byte(v), 0644)
if err != nil {
return err
}

11
cmd/pluginator/internal/krmfunction/converter_test.go
View File

@@ -9,6 +9,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func makeTempDir(t *testing.T) string {
@@ -120,13 +121,14 @@ func TestTransformerConverter(t *testing.T) {
dir := makeTempDir(t)
defer os.RemoveAll(dir)
ioutil.WriteFile(filepath.Join(dir, "Plugin.go"), // nolint: gosec
err := ioutil.WriteFile(filepath.Join(dir, "Plugin.go"),
getTransformerCode(), 0644)
require.NoError(t, err)
c := NewConverter(filepath.Join(dir, "output"),
filepath.Join(dir, "Plugin.go"))
err := c.Convert()
err = c.Convert()
assert.NoError(t, err)
output := runKrmFunction(t, getTransformerInputResource(), filepath.Join(dir, "output"))
@@ -217,13 +219,14 @@ func TestGeneratorConverter(t *testing.T) {
dir := makeTempDir(t)
defer os.RemoveAll(dir)
ioutil.WriteFile(filepath.Join(dir, "Plugin.go"), // nolint: gosec
err := ioutil.WriteFile(filepath.Join(dir, "Plugin.go"),
getGeneratorCode(), 0644)
require.NoError(t, err)
c := NewConverter(filepath.Join(dir, "output"),
filepath.Join(dir, "Plugin.go"))
err := c.Convert()
err = c.Convert()
assert.NoError(t, err)
output := runKrmFunction(t, getGeneratorInputResource(), filepath.Join(dir, "output"))
assert.Equal(t, `apiVersion: config.kubernetes.io/v1