Merge pull request #411 from testwill/ioutil

chore: remove refs to deprecated io/ioutil

cmd/kbld/kbld.go

@@ -4,7 +4,7 @@
 package main
 
 import (
-	"io/ioutil"
+	"io"
 	"log"
 	"math/rand"
 	"os"
@@ -18,7 +18,7 @@ import (
 func main() {
 	rand.Seed(time.Now().UTC().UnixNano())
 
-	log.SetOutput(ioutil.Discard)
+	log.SetOutput(io.Discard)
 
 	// TODO logs
 	// TODO log flags used

pkg/kbld/cmd/resolve.go

@@ -6,7 +6,6 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 
@@ -235,7 +234,7 @@ func (o *ResolveOptions) withImageMapConf(conf ctlconf.Conf) (ctlconf.Conf, erro
 		return conf, nil
 	}
 
-	bs, err := ioutil.ReadFile(o.ImageMapFile)
+	bs, err := os.ReadFile(o.ImageMapFile)
 	if err != nil {
 		return ctlconf.Conf{}, err
 	}

pkg/kbld/config/config.go

@@ -5,7 +5,7 @@ package config
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	"carvel.dev/imgpkg/pkg/imgpkg/lockconfig"
 	versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
@@ -328,7 +328,7 @@ func (d Config) WriteToFile(path string) error {
 		return err
 	}
 
-	err = ioutil.WriteFile(path, bs, 0600)
+	err = os.WriteFile(path, bs, 0600)
 	if err != nil {
 		return fmt.Errorf("Writing lock config: %s", err)
 	}

pkg/kbld/image/git_test.go

@@ -6,7 +6,6 @@ package image_test
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -59,7 +58,7 @@ func TestGitRepoValidNonEmptyRepo(t *testing.T) {
 }
 
 func TestGitRepoValidNoCommit(t *testing.T) {
-	dir, err := ioutil.TempDir("", "kbld-git-repo")
+	dir, err := os.MkdirTemp("", "kbld-git-repo")
 	if err != nil {
 		t.Fatalf("Making tmp dir: %s", err)
 	}
@@ -91,7 +90,7 @@ func TestGitRepoValidNoCommit(t *testing.T) {
 }
 
 func TestGitRepoValidNotOnBranch(t *testing.T) {
-	dir, err := ioutil.TempDir("", "kbld-git-repo")
+	dir, err := os.MkdirTemp("", "kbld-git-repo")
 	if err != nil {
 		t.Fatalf("Making tmp dir: %s", err)
 	}
@@ -126,7 +125,7 @@ func TestGitRepoValidNotOnBranch(t *testing.T) {
 }
 
 func TestGitRepoValidSubDir(t *testing.T) {
-	dir, err := ioutil.TempDir("", "kbld-git-repo")
+	dir, err := os.MkdirTemp("", "kbld-git-repo")
 	if err != nil {
 		t.Fatalf("Making tmp dir: %s", err)
 	}
@@ -165,7 +164,7 @@ func TestGitRepoValidSubDir(t *testing.T) {
 }
 
 func TestGitRepoValidNonGit(t *testing.T) {
-	dir, err := ioutil.TempDir("", "kbld-git-repo")
+	dir, err := os.MkdirTemp("", "kbld-git-repo")
 	if err != nil {
 		t.Fatalf("Making tmp dir: %s", err)
 	}
@@ -195,7 +194,7 @@ func TestGitRepoValidNonGit(t *testing.T) {
 }
 
 func TestGitRepoRemoteURL(t *testing.T) {
-	dir, err := ioutil.TempDir("", "kbld-git-repo")
+	dir, err := os.MkdirTemp("", "kbld-git-repo")
 	if err != nil {
 		t.Fatalf("Making tmp dir: %s", err)
 	}
@@ -226,7 +225,7 @@ func TestGitRepoRemoteURL(t *testing.T) {
 }
 
 func TestGitRepoHeadSHA(t *testing.T) {
-	dir, err := ioutil.TempDir("", "kbld-git-repo")
+	dir, err := os.MkdirTemp("", "kbld-git-repo")
 	if err != nil {
 		t.Fatalf("Making tmp dir: %s", err)
 	}
@@ -258,7 +257,7 @@ func TestGitRepoHeadSHA(t *testing.T) {
 }
 
 func TestGitRepoIsDirty(t *testing.T) {
-	dir, err := ioutil.TempDir("", "kbld-git-repo")
+	dir, err := os.MkdirTemp("", "kbld-git-repo")
 	if err != nil {
 		t.Fatalf("Making tmp dir: %s", err)
 	}

pkg/kbld/imagetar/tar_reader.go

@@ -4,7 +4,7 @@
 package imagetar
 
 import (
-	"io/ioutil"
+	"io"
 
 	"github.com/vmware-tanzu/carvel-kbld/pkg/kbld/imagedesc"
 )
@@ -25,7 +25,7 @@ func (r TarReader) Read() ([]imagedesc.ImageOrIndex, error) {
 		return nil, err
 	}
 
-	manifestBytes, err := ioutil.ReadAll(manifestFile)
+	manifestBytes, err := io.ReadAll(manifestFile)
 	if err != nil {
 		return nil, err
 	}

pkg/kbld/imageutils/and/and_closer_test.go

@@ -21,7 +21,7 @@ package and
 
 import (
 	"bytes"
-	"io/ioutil"
+	"io"
 	"testing"
 )
 
@@ -38,7 +38,7 @@ func TestRead(t *testing.T) {
 		},
 	}
 
-	data, err := ioutil.ReadAll(rac)
+	data, err := io.ReadAll(rac)
 	if err != nil {
 		t.Errorf("ReadAll(rac) = %v", err)
 	}

pkg/kbld/imageutils/gzip/zip_test.go

@@ -22,21 +22,21 @@ package gzip
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"strings"
 	"testing"
 )
 
 func TestReader(t *testing.T) {
 	want := "This is the input string."
 	buf := bytes.NewBufferString(want)
-	zipped := ReadCloser(ioutil.NopCloser(buf))
+	zipped := ReadCloser(io.NopCloser(buf))
 	unzipped, err := UnzipReadCloser(zipped)
 	if err != nil {
 		t.Error("UnzipReadCloser() =", err)
 	}
 
-	b, err := ioutil.ReadAll(unzipped)
+	b, err := io.ReadAll(unzipped)
 	if err != nil {
 		t.Error("ReadAll() =", err)
 	}
@@ -86,17 +86,17 @@ func TestReadErrors(t *testing.T) {
 		t.Error("Is: expected errRead, got", err)
 	}
 
-	frc := ioutil.NopCloser(fr)
+	frc := io.NopCloser(fr)
 	if _, err := UnzipReadCloser(frc); err != errRead {
 		t.Error("UnzipReadCloser: expected errRead, got", err)
 	}
 
-	zr := ReadCloser(ioutil.NopCloser(fr))
+	zr := ReadCloser(io.NopCloser(fr))
 	if _, err := zr.Read(nil); err != errRead {
 		t.Error("ReadCloser: expected errRead, got", err)
 	}
 
-	zr = ReadCloserLevel(ioutil.NopCloser(strings.NewReader("zip me")), -10)
+	zr = ReadCloserLevel(io.NopCloser(strings.NewReader("zip me")), -10)
 	if _, err := zr.Read(nil); err == nil {
 		t.Error("Expected invalid level error, got:", err)
 	}

pkg/kbld/imageutils/verify/verify_test.go

@@ -21,7 +21,7 @@ package verify
 
 import (
 	"bytes"
-	"io/ioutil"
+	"io"
 	"strings"
 	"testing"
 
@@ -40,11 +40,11 @@ func TestVerificationFailure(t *testing.T) {
 	want := "This is the input string."
 	buf := bytes.NewBufferString(want)
 
-	verified, err := ReadCloser(ioutil.NopCloser(buf), mustHash("not the same", t))
+	verified, err := ReadCloser(io.NopCloser(buf), mustHash("not the same", t))
 	if err != nil {
 		t.Fatal("ReadCloser() =", err)
 	}
-	if b, err := ioutil.ReadAll(verified); err == nil {
+	if b, err := io.ReadAll(verified); err == nil {
 		t.Errorf("ReadAll() = %q; want verification error", string(b))
 	}
 }
@@ -53,11 +53,11 @@ func TestVerification(t *testing.T) {
 	want := "This is the input string."
 	buf := bytes.NewBufferString(want)
 
-	verified, err := ReadCloser(ioutil.NopCloser(buf), mustHash(want, t))
+	verified, err := ReadCloser(io.NopCloser(buf), mustHash(want, t))
 	if err != nil {
 		t.Fatal("ReadCloser() =", err)
 	}
-	if _, err := ioutil.ReadAll(verified); err != nil {
+	if _, err := io.ReadAll(verified); err != nil {
 		t.Error("ReadAll() =", err)
 	}
 }
@@ -67,7 +67,7 @@ func TestBadHash(t *testing.T) {
 		Algorithm: "fake256",
 		Hex:       "whatever",
 	}
-	_, err := ReadCloser(ioutil.NopCloser(strings.NewReader("hi")), h)
+	_, err := ReadCloser(io.NopCloser(strings.NewReader("hi")), h)
 	if err == nil {
 		t.Errorf("ReadCloser() = %v, wanted err", err)
 	}

pkg/kbld/registry/registry.go

@@ -7,9 +7,9 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"net/http"
+	"os"
 	"time"
 
 	regauthn "github.com/google/go-containerregistry/pkg/authn"
@@ -158,7 +158,7 @@ func newHTTPTransport(opts Opts) (*http.Transport, error) {
 
 	if len(opts.CACertPaths) > 0 {
 		for _, path := range opts.CACertPaths {
-			if certs, err := ioutil.ReadFile(path); err != nil {
+			if certs, err := os.ReadFile(path); err != nil {
 				return nil, fmt.Errorf("Reading CA certificates from '%s': %s", path, err)
 			} else if ok := pool.AppendCertsFromPEM(certs); !ok {
 				return nil, fmt.Errorf("Adding CA certificates from '%s': failed", path)

pkg/kbld/resources/file_sources.go

@@ -5,7 +5,7 @@ package resources
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 )
@@ -24,7 +24,7 @@ func NewStdinSource() StdinSource { return StdinSource{} }
 func (s StdinSource) Description() string { return "stdin" }
 
 func (s StdinSource) Bytes() ([]byte, error) {
-	return ioutil.ReadAll(os.Stdin)
+	return io.ReadAll(os.Stdin)
 }
 
 type LocalFileSource struct {
@@ -40,7 +40,7 @@ func (s LocalFileSource) Description() string {
 }
 
 func (s LocalFileSource) Bytes() ([]byte, error) {
-	return ioutil.ReadFile(s.path)
+	return os.ReadFile(s.path)
 }
 
 type HTTPFileSource struct {
@@ -63,7 +63,7 @@ func (s HTTPFileSource) Bytes() ([]byte, error) {
 
 	defer resp.Body.Close()
 
-	result, err := ioutil.ReadAll(resp.Body)
+	result, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, fmt.Errorf("Reading URL '%s': %s", s.url, err)
 	}