Merge pull request #282 from atoato88/change-deprecated-ioutil-funcs

k8s-ci-robot · web-flow · commit 3c5b71ba28f4 · 2022-11-29T08:53:24.000-08:00
Replace deprecated funcs on ioutil package
diff --git a/applylib/testutils/harness.go b/applylib/testutils/harness.go
@@ -21,7 +21,6 @@ import (
 	"context"
 	"flag"
 	"io"
-	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
@@ -205,12 +204,12 @@ func (h *Harness) RESTMapper() *restmapper.DeferredDiscoveryRESTMapper {
 func (h *Harness) AssertMatchesFile(p string, got string) {
 	if os.Getenv("WRITE_GOLDEN_OUTPUT") != "" {
 		// Short-circuit when the output is correct
-		b, err := ioutil.ReadFile(p)
+		b, err := os.ReadFile(p)
 		if err == nil && bytes.Equal(b, []byte(got)) {
 			return
 		}
 
-		if err := ioutil.WriteFile(p, []byte(got), 0644); err != nil {
+		if err := os.WriteFile(p, []byte(got), 0644); err != nil {
 			h.Fatalf("failed to write golden output %s: %v", p, err)
 		}
 		h.Errorf("wrote output to %s", p)
diff --git a/mockkubeapiserver/patchresource.go b/mockkubeapiserver/patchresource.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strconv"
 
@@ -53,7 +53,7 @@ func (req *patchResource) Run(ctx context.Context, s *MockKubeAPIServer) error {
 		existingObj = nil
 	}
 
-	bodyBytes, err := ioutil.ReadAll(req.r.Body)
+	bodyBytes, err := io.ReadAll(req.r.Body)
 	if err != nil {
 		return err
 	}
diff --git a/mockkubeapiserver/postresource.go b/mockkubeapiserver/postresource.go
@@ -19,7 +19,7 @@ package mockkubeapiserver
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -48,7 +48,7 @@ func (req *postResource) Run(ctx context.Context, s *MockKubeAPIServer) error {
 		return req.writeErrorResponse(http.StatusNotFound)
 	}
 
-	bodyBytes, err := ioutil.ReadAll(req.r.Body)
+	bodyBytes, err := io.ReadAll(req.r.Body)
 	if err != nil {
 		return err
 	}
diff --git a/mockkubeapiserver/putresource.go b/mockkubeapiserver/putresource.go
@@ -19,7 +19,7 @@ package mockkubeapiserver
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"reflect"
 
@@ -52,7 +52,7 @@ func (req *putResource) Run(ctx context.Context, s *MockKubeAPIServer) error {
 		return req.writeErrorResponse(http.StatusNotFound)
 	}
 
-	bodyBytes, err := ioutil.ReadAll(req.r.Body)
+	bodyBytes, err := io.ReadAll(req.r.Body)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/patterns/declarative/pkg/applier/applylib_test.go b/pkg/patterns/declarative/pkg/applier/applylib_test.go
@@ -3,7 +3,7 @@ package applier
 import (
 	"bytes"
 	"context"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"path/filepath"
 	"testing"
@@ -125,12 +125,12 @@ func (h *logKubeRequestsHook) BeforeHTTPOperation(op *mockkubeapiserver.HTTPOper
 	}
 
 	if req.Body != nil {
-		requestBody, err := ioutil.ReadAll(req.Body)
+		requestBody, err := io.ReadAll(req.Body)
 		if err != nil {
 			panic("failed to read request body")
 		}
 		entry.Request.Body = string(requestBody)
-		req.Body = ioutil.NopCloser(bytes.NewReader(requestBody))
+		req.Body = io.NopCloser(bytes.NewReader(requestBody))
 	}
 	h.log.Entries = append(h.log.Entries, entry)
 }
diff --git a/pkg/patterns/declarative/pkg/applier/exec.go b/pkg/patterns/declarative/pkg/applier/exec.go
@@ -20,7 +20,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"strconv"
@@ -117,7 +116,7 @@ func (c *ExecKubectl) Apply(ctx context.Context, opt ApplierOptions) error {
 			return fmt.Errorf("error building kubeconfig: %w", err)
 		}
 
-		f, err := ioutil.TempFile("", "kubeconfig")
+		f, err := os.CreateTemp("", "kubeconfig")
 		if err != nil {
 			return fmt.Errorf("error creating temp file: %w", err)
 		}
diff --git a/pkg/test/httprecorder/http_recorder.go b/pkg/test/httprecorder/http_recorder.go
@@ -3,7 +3,7 @@ package httprecorder
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 )
@@ -27,12 +27,12 @@ func (m *HTTPRecorder) RoundTrip(request *http.Request) (*http.Response, error)
 	}
 
 	if request.Body != nil {
-		requestBody, err := ioutil.ReadAll(request.Body)
+		requestBody, err := io.ReadAll(request.Body)
 		if err != nil {
 			panic("failed to read request body")
 		}
 		entry.Request.Body = string(requestBody)
-		request.Body = ioutil.NopCloser(bytes.NewReader(requestBody))
+		request.Body = io.NopCloser(bytes.NewReader(requestBody))
 	}
 
 	response, err := m.inner.RoundTrip(request)
@@ -54,12 +54,12 @@ func (m *HTTPRecorder) RoundTrip(request *http.Request) (*http.Response, error)
 		}
 
 		if response.Body != nil {
-			requestBody, err := ioutil.ReadAll(response.Body)
+			requestBody, err := io.ReadAll(response.Body)
 			if err != nil {
 				entry.Response.Body = fmt.Sprintf("<error reading response:%v>", err)
 			} else {
 				entry.Response.Body = string(requestBody)
-				response.Body = ioutil.NopCloser(bytes.NewReader(requestBody))
+				response.Body = io.NopCloser(bytes.NewReader(requestBody))
 			}
 		}
 	}
diff --git a/pkg/test/testharness/golden.go b/pkg/test/testharness/golden.go
@@ -2,7 +2,7 @@ package testharness
 
 import (
 	"bytes"
-	"io/ioutil"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"testing"
@@ -11,10 +11,18 @@ import (
 )
 
 func RunGoldenTests(t *testing.T, basedir string, fn func(h *Harness, dir string)) {
-	files, err := ioutil.ReadDir(basedir)
+	entries, err := os.ReadDir(basedir)
 	if err != nil {
 		t.Fatalf("ReadDir(%q) failed: %v", basedir, err)
 	}
+	files := make([]fs.FileInfo, 0, len(entries))
+	for _, entry := range entries {
+		info, err := entry.Info()
+		if err != nil {
+			t.Fatalf("failed to get FileInfo %v: %v", info, err)
+		}
+		files = append(files, info)
+	}
 	count := 0
 	for _, file := range files {
 		name := file.Name()
@@ -34,12 +42,12 @@ func RunGoldenTests(t *testing.T, basedir string, fn func(h *Harness, dir string
 func (h *Harness) CompareGoldenFile(p string, got string) {
 	if os.Getenv("WRITE_GOLDEN_OUTPUT") != "" {
 		// Short-circuit when the output is correct
-		b, err := ioutil.ReadFile(p)
+		b, err := os.ReadFile(p)
 		if err == nil && bytes.Equal(b, []byte(got)) {
 			return
 		}
 
-		if err := ioutil.WriteFile(p, []byte(got), 0644); err != nil {
+		if err := os.WriteFile(p, []byte(got), 0644); err != nil {
 			h.Fatalf("failed to write golden output %s: %v", p, err)
 		}
 		h.Errorf("wrote output to %s", p)

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package applier`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"context"`
`6`		`- "io/ioutil"`
	`6`	`+ "io"`
`7`	`7`	`"net/http"`
`8`	`8`	`"path/filepath"`
`9`	`9`	`"testing"`
`@@ -125,12 +125,12 @@ func (h logKubeRequestsHook) BeforeHTTPOperation(op mockkubeapiserver.HTTPOper`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`if req.Body != nil {`
`128`		`- requestBody, err := ioutil.ReadAll(req.Body)`
	`128`	`+ requestBody, err := io.ReadAll(req.Body)`
`129`	`129`	`if err != nil {`
`130`	`130`	`panic("failed to read request body")`
`131`	`131`	`}`
`132`	`132`	`entry.Request.Body = string(requestBody)`
`133`		`- req.Body = ioutil.NopCloser(bytes.NewReader(requestBody))`
	`133`	`+ req.Body = io.NopCloser(bytes.NewReader(requestBody))`
`134`	`134`	`}`
`135`	`135`	`h.log.Entries = append(h.log.Entries, entry)`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package httprecorder`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"fmt"`
`6`		`- "io/ioutil"`
	`6`	`+ "io"`
`7`	`7`	`"net/http"`
`8`	`8`	`"strings"`
`9`	`9`	`)`
`@@ -27,12 +27,12 @@ func (m HTTPRecorder) RoundTrip(request http.Request) (*http.Response, error)`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`if request.Body != nil {`
`30`		`- requestBody, err := ioutil.ReadAll(request.Body)`
	`30`	`+ requestBody, err := io.ReadAll(request.Body)`
`31`	`31`	`if err != nil {`
`32`	`32`	`panic("failed to read request body")`
`33`	`33`	`}`
`34`	`34`	`entry.Request.Body = string(requestBody)`
`35`		`- request.Body = ioutil.NopCloser(bytes.NewReader(requestBody))`
	`35`	`+ request.Body = io.NopCloser(bytes.NewReader(requestBody))`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`response, err := m.inner.RoundTrip(request)`
`@@ -54,12 +54,12 @@ func (m HTTPRecorder) RoundTrip(request http.Request) (*http.Response, error)`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`if response.Body != nil {`
`57`		`- requestBody, err := ioutil.ReadAll(response.Body)`
	`57`	`+ requestBody, err := io.ReadAll(response.Body)`
`58`	`58`	`if err != nil {`
`59`	`59`	`entry.Response.Body = fmt.Sprintf("<error reading response:%v>", err)`
`60`	`60`	`} else {`
`61`	`61`	`entry.Response.Body = string(requestBody)`
`62`		`- response.Body = ioutil.NopCloser(bytes.NewReader(requestBody))`
	`62`	`+ response.Body = io.NopCloser(bytes.NewReader(requestBody))`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`}`