Merge pull request #4754 from KnVerey/ioutil

Stop using deprecated ioutil functions

.golangci.yml

@@ -102,14 +102,14 @@ linters-settings:
       arguments:
       - [ "ID", "API", "JSON" ] # AllowList
       - [ ] # DenyList
+  gomnd:
+    ignored-functions:
+    - os.WriteFile
   gomoddirectives:
     replace-local: true
   gosec:
     config:
       G306: "0644"
-  gomnd:
-     ignored-functions:
-     - ioutil.WriteFile
   wrapcheck:
     ignoreSigs:
       # defaults

api/internal/plugins/execplugin/execplugin.go

@@ -6,7 +6,6 @@ package execplugin
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"runtime"
@@ -150,7 +149,7 @@ func (p *ExecPlugin) Transform(rm resmap.ResMap) error {
 // passes the full temp file path as the first arg to a process
 // running the plugin binary.  Process output is returned.
 func (p *ExecPlugin) invokePlugin(input []byte) ([]byte, error) {
-	f, err := ioutil.TempFile("", tmpConfigFilePrefix)
+	f, err := os.CreateTemp("", tmpConfigFilePrefix)
 	if err != nil {
 		return nil, errors.Wrap(
 			err, "creating tmp plugin config file")

api/krusty/openapitests/openapicustomschema_test.go

@@ -7,7 +7,6 @@ package openapitests //nolint
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -18,12 +17,12 @@ import (
 )
 
 func writeTestSchema(th kusttest_test.Harness, filepath string) {
-	bytes, _ := ioutil.ReadFile("../testdata/customschema.json")
+	bytes, _ := os.ReadFile("../testdata/customschema.json")
 	th.WriteF(filepath+"mycrd_schema.json", string(bytes))
 }
 
 func writeTestSchemaYaml(th kusttest_test.Harness, filepath string) {
-	bytes, _ := ioutil.ReadFile("../testdata/customschema.yaml")
+	bytes, _ := os.ReadFile("../testdata/customschema.yaml")
 	th.WriteF(filepath+"mycrd_schema.yaml", string(bytes))
 }
 
@@ -486,7 +485,7 @@ spec:
 `)
 
 		// openapi schema referred to by the component
-		bytes, _ := ioutil.ReadFile("../testdata/openshiftschema.json")
+		bytes, _ := os.ReadFile("../testdata/openshiftschema.json")
 		th.WriteF("components/dc-openapi/openapi.json", string(bytes))
 
 		// patch referred to by the component

api/loader/fileloader.go

@@ -5,7 +5,7 @@ package loader
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"net/url"
@@ -302,7 +302,7 @@ func (fl *fileLoader) Load(path string) ([]byte, error) {
 			}
 			return nil, fmt.Errorf("%w: status code %d (%s)", ErrHTTP, resp.StatusCode, http.StatusText(resp.StatusCode))
 		}
-		body, err := ioutil.ReadAll(resp.Body)
+		body, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return nil, err
 		}

api/loader/fileloader_test.go

@@ -5,7 +5,7 @@ package loader
 
 import (
 	"bytes"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"path"
@@ -518,7 +518,7 @@ func TestLoaderHTTP(t *testing.T) {
 			require.Equal(x.path, u)
 			return &http.Response{
 				StatusCode: 200,
-				Body:       ioutil.NopCloser(bytes.NewBufferString(x.expectedContent)),
+				Body:       io.NopCloser(bytes.NewBufferString(x.expectedContent)),
 				Header:     make(http.Header),
 			}
 		})

api/testutils/kusttest/harnessenhanced.go

@@ -4,7 +4,6 @@
 package kusttest_test
 
 import (
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -61,7 +60,7 @@ func MakeEnhancedHarnessWithTmpRoot(t *testing.T) *HarnessEnhanced {
 	r := makeBaseEnhancedHarness(t)
 	fSys := filesys.MakeFsOnDisk()
 	r.Harness = MakeHarnessWithFs(t, fSys)
-	tmpDir, err := ioutil.TempDir("", "kust-testing-")
+	tmpDir, err := os.MkdirTemp("", "kust-testing-")
 	if err != nil {
 		panic("test harness cannot make tmp dir: " + err.Error())
 	}

cmd/config/internal/commands/annotate_test.go

@@ -5,7 +5,7 @@ package commands
 
 import (
 	"bytes"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -88,11 +88,11 @@ func TestAnnotateCommand(t *testing.T) {
 func initTestDir(t *testing.T) string {
 	t.Helper()
 	d := t.TempDir()
-	err := ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(f1Input), 0600)
+	err := os.WriteFile(filepath.Join(d, "f1.yaml"), []byte(f1Input), 0600)
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
-	err = ioutil.WriteFile(filepath.Join(d, "f2.yaml"), []byte(f2Input), 0600)
+	err = os.WriteFile(filepath.Join(d, "f2.yaml"), []byte(f2Input), 0600)
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}

cmd/config/internal/commands/cat_test.go

@@ -5,7 +5,6 @@ package commands_test
 
 import (
 	"bytes"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -22,7 +21,7 @@ import (
 func TestCmd_files(t *testing.T) {
 	d := t.TempDir()
 
-	err := ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
+	err := os.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
 kind: Deployment
 metadata:
   labels:
@@ -45,7 +44,7 @@ spec:
 	if !assert.NoError(t, err) {
 		return
 	}
-	err = ioutil.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`
+	err = os.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`
 apiVersion: v1
 kind: Abstraction
 metadata:
@@ -119,7 +118,7 @@ spec:
 func TestCmd_filesWithReconcilers(t *testing.T) {
 	d := t.TempDir()
 
-	err := ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
+	err := os.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
 kind: Deployment
 metadata:
   labels:
@@ -142,7 +141,7 @@ spec:
 	if !assert.NoError(t, err) {
 		return
 	}
-	err = ioutil.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`
+	err = os.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`
 apiVersion: v1
 kind: Abstraction
 metadata:
@@ -225,7 +224,7 @@ spec:
 func TestCmd_filesWithoutNonReconcilers(t *testing.T) {
 	d := t.TempDir()
 
-	err := ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
+	err := os.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
 kind: Deployment
 metadata:
   labels:
@@ -248,7 +247,7 @@ spec:
 	if !assert.NoError(t, err) {
 		return
 	}
-	err = ioutil.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`
+	err = os.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`
 apiVersion: v1
 kind: Abstraction
 metadata:
@@ -303,7 +302,7 @@ spec:
 func TestCmd_outputTruncateFile(t *testing.T) {
 	d := t.TempDir()
 
-	err := ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
+	err := os.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
 kind: Deployment
 metadata:
   labels:
@@ -326,7 +325,7 @@ spec:
 	if !assert.NoError(t, err) {
 		return
 	}
-	err = ioutil.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`
+	err = os.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`
 apiVersion: v1
 kind: Abstraction
 metadata:
@@ -353,7 +352,7 @@ spec:
 		return
 	}
 
-	f, err := ioutil.TempFile("", "kustomize-cat-test-dest")
+	f, err := os.CreateTemp("", "kustomize-cat-test-dest")
 	if !assert.NoError(t, err) {
 		return
 	}
@@ -372,7 +371,7 @@ spec:
 		return
 	}
 
-	actual, err := ioutil.ReadFile(f.Name())
+	actual, err := os.ReadFile(f.Name())
 	if !assert.NoError(t, err) {
 		return
 	}
@@ -413,7 +412,7 @@ spec:
 func TestCmd_outputCreateFile(t *testing.T) {
 	d := t.TempDir()
 
-	err := ioutil.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
+	err := os.WriteFile(filepath.Join(d, "f1.yaml"), []byte(`
 kind: Deployment
 metadata:
   labels:
@@ -436,7 +435,7 @@ spec:
 	if !assert.NoError(t, err) {
 		return
 	}
-	err = ioutil.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`
+	err = os.WriteFile(filepath.Join(d, "f2.yaml"), []byte(`
 apiVersion: v1
 kind: Abstraction
 metadata:
@@ -479,7 +478,7 @@ spec:
 		return
 	}
 
-	actual, err := ioutil.ReadFile(f)
+	actual, err := os.ReadFile(f)
 	if !assert.NoError(t, err) {
 		return
 	}

cmd/config/internal/commands/cmdcreatesetter.go

@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -213,7 +213,7 @@ func schemaFromFile(schemaPath string) (*spec.Schema, error) {
 	if schemaPath == "" {
 		return sc, nil
 	}
-	sch, err := ioutil.ReadFile(schemaPath)
+	sch, err := os.ReadFile(schemaPath)
 	if err != nil {
 		return sc, err
 	}

cmd/config/internal/commands/cmdcreatesetter_test.go

@@ -5,7 +5,6 @@ package commands_test
 
 import (
 	"bytes"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -702,13 +701,13 @@ spec:
 			baseDir := t.TempDir()
 
 			f := filepath.Join(baseDir, "Krmfile")
-			err := ioutil.WriteFile(f, []byte(test.inputOpenAPI), 0600)
+			err := os.WriteFile(f, []byte(test.inputOpenAPI), 0600)
 			if !assert.NoError(t, err) {
 				t.FailNow()
 			}
 
 			if test.schema != "" {
-				sch, err := ioutil.TempFile("", "schema.json")
+				sch, err := os.CreateTemp("", "schema.json")
 				if !assert.NoError(t, err) {
 					t.FailNow()
 				}
@@ -717,20 +716,20 @@ spec:
 					os.Remove(sch.Name())
 				})
 
-				err = ioutil.WriteFile(sch.Name(), []byte(test.schema), 0600)
+				err = os.WriteFile(sch.Name(), []byte(test.schema), 0600)
 				if !assert.NoError(t, err) {
 					t.FailNow()
 				}
 
 				test.args = append(test.args, "--schema-path", sch.Name())
 			}
 
-			r, err := ioutil.TempFile(baseDir, "k8s-cli-*.yaml")
+			r, err := os.CreateTemp(baseDir, "k8s-cli-*.yaml")
 			if !assert.NoError(t, err) {
 				t.FailNow()
 			}
 			t.Cleanup(func() { r.Close() })
-			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()
 			}
@@ -763,7 +762,7 @@ spec:
 				t.FailNow()
 			}
 
-			actualResources, err := ioutil.ReadFile(r.Name())
+			actualResources, err := os.ReadFile(r.Name())
 			if !assert.NoError(t, err) {
 				t.FailNow()
 			}
@@ -773,7 +772,7 @@ spec:
 				t.FailNow()
 			}
 
-			actualOpenAPI, err := ioutil.ReadFile(f)
+			actualOpenAPI, err := os.ReadFile(f)
 			if !assert.NoError(t, err) {
 				t.FailNow()
 			}