kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-09-15 12:18:57 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix other linters on modified lines

Browse Source
This commit is contained in:
Katrina Verey
2022-08-10 18:50:28 -04:00
parent f6b72077c8
commit 55a37de686
10 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kyaml/filesys/fsondisk.go
View File

@@ -125,7 +125,10 @@ func (fsOnDisk) ReadDir(name string) ([]string, error) {
}
// ReadFile delegates to os.ReadFile.
func (fsOnDisk) ReadFile(name string) ([]byte, error) { return os.ReadFile(name) }
func (fsOnDisk) ReadFile(name string) ([]byte, error) {
//nolint:wrapcheck
return os.ReadFile(name)
}
// WriteFile delegates to os.WriteFile with read/write permissions.
func (fsOnDisk) WriteFile(name string, c []byte) error {

3
kyaml/fn/framework/parser/parser.go
View File

@@ -100,5 +100,6 @@ func (l parser) readFile(path string) ([]byte, error) {
}
defer f.Close()
return io.ReadAll(f)
content, err := io.ReadAll(f)
return content, errors.Wrap(err)
}

4
kyaml/setters2/add_test.go
View File

@@ -281,7 +281,7 @@ func TestAdd_Filter2(t *testing.T) {
path := filepath.Join(os.TempDir(), "resourcefile")
// write initial resourcefile to temp path
err := os.WriteFile(path, []byte(resourcefile), 0666)
err := os.WriteFile(path, []byte(resourcefile), 0644)
if !assert.NoError(t, err) {
t.FailNow()
}
@@ -342,7 +342,7 @@ func TestAddUpdateSubstitution(t *testing.T) {
path := filepath.Join(os.TempDir(), "resourcefile")
// write initial resourcefile to temp path
err := os.WriteFile(path, []byte(resourcefile), 0666)
err := os.WriteFile(path, []byte(resourcefile), 0644)
if !assert.NoError(t, err) {
t.FailNow()
}

2
kyaml/setters2/delete_test.go
View File

@@ -42,7 +42,7 @@ func TestDelete_Filter2(t *testing.T) {
path := filepath.Join(os.TempDir(), "resourcefile2")
// write initial resourcefile to temp path
err := os.WriteFile(path, []byte(resourcefile2), 0666)
err := os.WriteFile(path, []byte(resourcefile2), 0644)
if !assert.NoError(t, err) {
t.FailNow()
}

4
kyaml/setters2/settersutil/deletecreator_test.go
View File

@@ -48,7 +48,7 @@ func TestDeleterCreator_Delete(t *testing.T) {
}
defer os.Remove(openAPI.Name())
// write openapi to temp dir
err = os.WriteFile(openAPI.Name(), []byte(openAPIFile), 0666)
err = os.WriteFile(openAPI.Name(), []byte(openAPIFile), 0644)
if !assert.NoError(t, err) {
t.FailNow()
}
@@ -59,7 +59,7 @@ func TestDeleterCreator_Delete(t *testing.T) {
t.FailNow()
}
defer os.Remove(resource.Name())
err = os.WriteFile(resource.Name(), []byte(resourceFile), 0666)
err = os.WriteFile(resource.Name(), []byte(resourceFile), 0644)
if !assert.NoError(t, err) {
t.FailNow()
}

2
kyaml/yaml/rnode.go
View File

@@ -66,7 +66,7 @@ func WriteFile(node *RNode, path string) error {
if err != nil {
return err
}
return os.WriteFile(path, []byte(out), 0600)
return errors.WrapPrefixf(os.WriteFile(path, []byte(out), 0600), "writing RNode to file")
}
// UpdateFile reads the file at path, applies the filter to it, and write the result back.