kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-14 02:20:53 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Stop using deprecated ioutil functions

Browse Source
This commit is contained in:
Katrina Verey
2022-08-10 16:59:18 -04:00
parent 416eed97c4
commit f6b72077c8
70 changed files with 322 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kyaml/setters2/add_test.go
View File

@@ -4,7 +4,6 @@
package setters2
import (
"io/ioutil"
"os"
"path/filepath"
"strings"
@@ -282,7 +281,7 @@ func TestAdd_Filter2(t *testing.T) {
path := filepath.Join(os.TempDir(), "resourcefile")
// write initial resourcefile to temp path
err := ioutil.WriteFile(path, []byte(resourcefile), 0666)
err := os.WriteFile(path, []byte(resourcefile), 0666)
if !assert.NoError(t, err) {
t.FailNow()
}
@@ -311,7 +310,7 @@ func TestAdd_Filter2(t *testing.T) {
t.FailNow()
}
b, err := ioutil.ReadFile(path)
b, err := os.ReadFile(path)
if err != nil {
t.FailNow()
}
@@ -343,7 +342,7 @@ func TestAddUpdateSubstitution(t *testing.T) {
path := filepath.Join(os.TempDir(), "resourcefile")
// write initial resourcefile to temp path
err := ioutil.WriteFile(path, []byte(resourcefile), 0666)
err := os.WriteFile(path, []byte(resourcefile), 0666)
if !assert.NoError(t, err) {
t.FailNow()
}
@@ -385,7 +384,7 @@ func TestAddUpdateSubstitution(t *testing.T) {
t.FailNow()
}
b, err := ioutil.ReadFile(path)
b, err := os.ReadFile(path)
if err != nil {
t.FailNow()
}

5
kyaml/setters2/delete_test.go
View File

@@ -4,7 +4,6 @@
package setters2
import (
"io/ioutil"
"os"
"path/filepath"
"testing"
@@ -43,7 +42,7 @@ func TestDelete_Filter2(t *testing.T) {
path := filepath.Join(os.TempDir(), "resourcefile2")
// write initial resourcefile to temp path
err := ioutil.WriteFile(path, []byte(resourcefile2), 0666)
err := os.WriteFile(path, []byte(resourcefile2), 0666)
if !assert.NoError(t, err) {
t.FailNow()
}
@@ -59,7 +58,7 @@ func TestDelete_Filter2(t *testing.T) {
t.FailNow()
}
b, err := ioutil.ReadFile(path)
b, err := os.ReadFile(path)
if err != nil {
t.FailNow()
}

9
kyaml/setters2/list_test.go
View File

@@ -4,7 +4,6 @@
package setters2
import (
"io/ioutil"
"os"
"testing"
@@ -253,22 +252,22 @@ spec:
// reset the openAPI afterward
defer openapi.ResetOpenAPI()
f, err := ioutil.TempFile("", "k8s-cli-")
f, err := os.CreateTemp("", "k8s-cli-")
if !assert.NoError(t, err) {
t.FailNow()
}
defer os.Remove(f.Name())
err = ioutil.WriteFile(f.Name(), []byte(test.openapi), 0600)
err = os.WriteFile(f.Name(), []byte(test.openapi), 0600)
if !assert.NoError(t, err) {
t.FailNow()
}
r, err := ioutil.TempFile("", "k8s-cli-*.yaml")
r, err := os.CreateTemp("", "k8s-cli-*.yaml")
if !assert.NoError(t, err) {
t.FailNow()
}
defer os.Remove(r.Name())
err = ioutil.WriteFile(r.Name(), []byte(test.input), 0600)
err = os.WriteFile(r.Name(), []byte(test.input), 0600)
if !assert.NoError(t, err) {
t.FailNow()
}

4
kyaml/setters2/set_test.go
View File

@@ -4,7 +4,7 @@
package setters2
import (
"io/ioutil"
"os"
"path/filepath"
"strings"
"testing"
@@ -1003,7 +1003,7 @@ spec:
func SettersSchema(t *testing.T, s string) *spec.Schema {
t.Helper()
dir := t.TempDir()
err := ioutil.WriteFile(filepath.Join(dir, "Krmfile"), []byte(s), 0600)
err := os.WriteFile(filepath.Join(dir, "Krmfile"), []byte(s), 0600)
if !assert.NoError(t, err) {
t.FailNow()
}

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

@@ -4,7 +4,6 @@
package settersutil
import (
"io/ioutil"
"os"
"strings"
"testing"
@@ -43,24 +42,24 @@ spec:
func TestDeleterCreator_Delete(t *testing.T) {
openapi.ResetOpenAPI()
defer openapi.ResetOpenAPI()
openAPI, err := ioutil.TempFile("", "openAPI.yaml")
openAPI, err := os.CreateTemp("", "openAPI.yaml")
if !assert.NoError(t, err) {
t.FailNow()
}
defer os.Remove(openAPI.Name())
// write openapi to temp dir
err = ioutil.WriteFile(openAPI.Name(), []byte(openAPIFile), 0666)
err = os.WriteFile(openAPI.Name(), []byte(openAPIFile), 0666)
if !assert.NoError(t, err) {
t.FailNow()
}
// write resource file to temp dir
resource, err := ioutil.TempFile("", "k8s-cli-*.yaml")
resource, err := os.CreateTemp("", "k8s-cli-*.yaml")
if !assert.NoError(t, err) {
t.FailNow()
}
defer os.Remove(resource.Name())
err = ioutil.WriteFile(resource.Name(), []byte(resourceFile), 0666)
err = os.WriteFile(resource.Name(), []byte(resourceFile), 0666)
if !assert.NoError(t, err) {
t.FailNow()
}
@@ -84,12 +83,12 @@ func TestDeleterCreator_Delete(t *testing.T) {
t.FailNow()
}
actualOpenAPI, err := ioutil.ReadFile(openAPI.Name())
actualOpenAPI, err := os.ReadFile(openAPI.Name())
if err != nil {
t.FailNow()
}
actualResource, err := ioutil.ReadFile(resource.Name())
actualResource, err := os.ReadFile(resource.Name())
if err != nil {
t.FailNow()
}

5
kyaml/setters2/settersutil/fieldsetter.go
View File

@@ -4,7 +4,6 @@
package settersutil
import (
"io/ioutil"
"os"
"k8s.io/kube-openapi/pkg/validation/spec"
@@ -70,7 +69,7 @@ func (fs *FieldSetter) Set() (int, error) {
return 0, err
}
curOpenAPI, err := ioutil.ReadFile(fs.OpenAPIPath)
curOpenAPI, err := os.ReadFile(fs.OpenAPIPath)
if err != nil {
return 0, err
}
@@ -100,7 +99,7 @@ func (fs *FieldSetter) Set() (int, error) {
// revert openAPI file if set operation fails
if err != nil {
if writeErr := ioutil.WriteFile(fs.OpenAPIPath, curOpenAPI, stat.Mode().Perm()); writeErr != nil {
if writeErr := os.WriteFile(fs.OpenAPIPath, curOpenAPI, stat.Mode().Perm()); writeErr != nil {
return 0, writeErr
}
}

12
kyaml/setters2/settersutil/fieldsetter_test.go
View File

@@ -4,7 +4,7 @@
package settersutil
import (
"io/ioutil"
"os"
"path/filepath"
"testing"
@@ -85,15 +85,15 @@ spec:
srcDir := t.TempDir()
destDir := t.TempDir()
err := ioutil.WriteFile(filepath.Join(srcDir, "Krmfile"), []byte(test.srcOpenAPIFile), 0600)
err := os.WriteFile(filepath.Join(srcDir, "Krmfile"), []byte(test.srcOpenAPIFile), 0600)
if !assert.NoError(t, err) {
t.FailNow()
}
err = ioutil.WriteFile(filepath.Join(destDir, "destFile.yaml"), []byte(test.destFile), 0600)
err = os.WriteFile(filepath.Join(destDir, "destFile.yaml"), []byte(test.destFile), 0600)
if !assert.NoError(t, err) {
t.FailNow()
}
err = ioutil.WriteFile(filepath.Join(destDir, "Krmfile"), []byte(test.destOpenAPI), 0600)
err = os.WriteFile(filepath.Join(destDir, "Krmfile"), []byte(test.destOpenAPI), 0600)
if !assert.NoError(t, err) {
t.FailNow()
}
@@ -103,7 +103,7 @@ spec:
t.FailNow()
}
actualDestFile1, err := ioutil.ReadFile(filepath.Join(destDir, "destFile.yaml"))
actualDestFile1, err := os.ReadFile(filepath.Join(destDir, "destFile.yaml"))
if !assert.NoError(t, err) {
t.FailNow()
}
@@ -111,7 +111,7 @@ spec:
t.FailNow()
}
actualDestOpenAPIFile1, err := ioutil.ReadFile(filepath.Join(destDir, "Krmfile"))
actualDestOpenAPIFile1, err := os.ReadFile(filepath.Join(destDir, "Krmfile"))
if !assert.NoError(t, err) {
t.FailNow()
}

5
kyaml/setters2/settersutil/substitutioncreator.go
View File

@@ -5,7 +5,6 @@ package settersutil
import (
"fmt"
"io/ioutil"
"os"
"regexp"
"strings"
@@ -85,7 +84,7 @@ func (c SubstitutionCreator) Create() error {
return err
}
curOpenAPI, err := ioutil.ReadFile(c.OpenAPIPath)
curOpenAPI, err := os.ReadFile(c.OpenAPIPath)
if err != nil {
return err
}
@@ -131,7 +130,7 @@ func (c SubstitutionCreator) Create() error {
// revert openAPI file if there are cycles detected in created input substitution
if err := c.checkForCycles(ext, visited); err != nil {
if writeErr := ioutil.WriteFile(c.OpenAPIPath, curOpenAPI, stat.Mode().Perm()); writeErr != nil {
if writeErr := os.WriteFile(c.OpenAPIPath, curOpenAPI, stat.Mode().Perm()); writeErr != nil {
return writeErr
}
return err

4
kyaml/setters2/util_test.go
View File

@@ -5,7 +5,7 @@ package setters2
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"testing"
@@ -141,7 +141,7 @@ openAPI:
openapi.ResetOpenAPI()
defer openapi.ResetOpenAPI()
dir := t.TempDir()
err := ioutil.WriteFile(filepath.Join(dir, "Krmfile"), []byte(test.inputOpenAPIfile), 0600)
err := os.WriteFile(filepath.Join(dir, "Krmfile"), []byte(test.inputOpenAPIfile), 0600)
if !assert.NoError(t, err) {
t.FailNow()
}