Replace deprecated ioutil usage with the equivalent replacements (#198

)

* Replace deprecated `ioutil` usage with the equivalent replacements

* Leave MD changes for another PR

build/git_revision.go

@@ -6,7 +6,7 @@ package build
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"time"
@@ -23,7 +23,7 @@ var (
 	defaultCloneTimeout         = 5 * time.Minute
 	defaultBuildTimeout         = 25 * time.Minute
 
-	discardLogger = log.New(ioutil.Discard, "", 0)
+	discardLogger = log.New(io.Discard, "", 0)
 )
 
 // GitRevision installs a particular git revision by cloning
@@ -101,7 +101,7 @@ func (gr *GitRevision) Build(ctx context.Context) (string, error) {
 		gr.pathsToRemove = make([]string, 0)
 	}
 
-	repoDir, err := ioutil.TempDir("",
+	repoDir, err := os.MkdirTemp("",
 		fmt.Sprintf("hc-install-build-%s", gr.Product.Name))
 	if err != nil {
 		return "", err
@@ -160,7 +160,7 @@ func (gr *GitRevision) Build(ctx context.Context) (string, error) {
 	}
 	installDir := gr.InstallDir
 	if installDir == "" {
-		tmpDir, err := ioutil.TempDir("",
+		tmpDir, err := os.MkdirTemp("",
 			fmt.Sprintf("hc-install-%s-%s", gr.Product.Name, head.Hash()))
 		if err != nil {
 			return "", err

checkpoint/latest_version.go

@@ -6,7 +6,7 @@ package checkpoint
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"path/filepath"
@@ -24,7 +24,7 @@ import (
 
 var (
 	defaultTimeout = 30 * time.Second
-	discardLogger  = log.New(ioutil.Discard, "", 0)
+	discardLogger  = log.New(io.Discard, "", 0)
 )
 
 // LatestVersion installs the latest version known to Checkpoint
@@ -101,7 +101,7 @@ func (lv *LatestVersion) Install(ctx context.Context) (string, error) {
 	if dstDir == "" {
 		var err error
 		dirName := fmt.Sprintf("%s_*", lv.Product.Name)
-		dstDir, err = ioutil.TempDir("", dirName)
+		dstDir, err = os.MkdirTemp("", dirName)
 		if err != nil {
 			return "", err
 		}

fs/fs.go

@@ -4,14 +4,14 @@
 package fs
 
 import (
-	"io/ioutil"
+	"io"
 	"log"
 	"time"
 )
 
 var (
 	defaultTimeout = 10 * time.Second
-	discardLogger  = log.New(ioutil.Discard, "", 0)
+	discardLogger  = log.New(io.Discard, "", 0)
 )
 
 type fileCheckFunc func(path string) error

installer.go

@@ -6,7 +6,7 @@ package install
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 
 	"github.com/hashicorp/go-multierror"
@@ -23,7 +23,7 @@ type Installer struct {
 type RemoveFunc func(ctx context.Context) error
 
 func NewInstaller() *Installer {
-	discardLogger := log.New(ioutil.Discard, "", 0)
+	discardLogger := log.New(io.Discard, "", 0)
 	return &Installer{
 		logger: discardLogger,
 	}

internal/build/go_build.go

@@ -7,7 +7,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"os/exec"
@@ -17,7 +17,7 @@ import (
 	"golang.org/x/mod/modfile"
 )
 
-var discardLogger = log.New(ioutil.Discard, "", 0)
+var discardLogger = log.New(io.Discard, "", 0)
 
 // GoBuild represents a Go builder (to run "go build")
 type GoBuild struct {
@@ -161,7 +161,7 @@ type CleanupFunc func(context.Context)
 func guessRequiredGoVersion(repoDir string) (*version.Version, bool) {
 	goEnvFile := filepath.Join(repoDir, ".go-version")
 	if fi, err := os.Stat(goEnvFile); err == nil && !fi.IsDir() {
-		b, err := ioutil.ReadFile(goEnvFile)
+		b, err := os.ReadFile(goEnvFile)
 		if err != nil {
 			return nil, false
 		}
@@ -174,7 +174,7 @@ func guessRequiredGoVersion(repoDir string) (*version.Version, bool) {
 
 	goModFile := filepath.Join(repoDir, "go.mod")
 	if fi, err := os.Stat(goModFile); err == nil && !fi.IsDir() {
-		b, err := ioutil.ReadFile(goModFile)
+		b, err := os.ReadFile(goModFile)
 		if err != nil {
 			return nil, false
 		}

internal/releasesjson/downloader.go

@@ -10,7 +10,6 @@ import (
 	"crypto/sha256"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"net/url"
@@ -106,7 +105,7 @@ func (d *Downloader) DownloadAndUnpack(ctx context.Context, pv *ProductVersion,
 
 	expectedSize := resp.ContentLength
 
-	pkgFile, err := ioutil.TempFile("", pb.Filename)
+	pkgFile, err := os.CreateTemp("", pb.Filename)
 	if err != nil {
 		return "", err
 	}

internal/releasesjson/releases.go

@@ -7,7 +7,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"net/url"
@@ -55,7 +55,7 @@ type Releases struct {
 
 func NewReleases() *Releases {
 	return &Releases{
-		logger:  log.New(ioutil.Discard, "", 0),
+		logger:  log.New(io.Discard, "", 0),
 		BaseURL: defaultBaseURL,
 	}
 }
@@ -95,7 +95,7 @@ func (r *Releases) ListProductVersions(ctx context.Context, productName string)
 
 	r.logger.Printf("received %s", resp.Status)
 
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}
@@ -153,7 +153,7 @@ func (r *Releases) GetProductVersion(ctx context.Context, product string, versio
 
 	r.logger.Printf("received %s", resp.Status)
 
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}

internal/testutil/logger.go

@@ -4,7 +4,7 @@
 package testutil
 
 import (
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"testing"
@@ -14,5 +14,5 @@ func TestLogger() *log.Logger {
 	if testing.Verbose() {
 		return log.New(os.Stdout, "", log.LstdFlags|log.Lshortfile)
 	}
-	return log.New(ioutil.Discard, "", 0)
+	return log.New(io.Discard, "", 0)
 }

releases/exact_version.go

@@ -6,7 +6,6 @@ package releases
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -93,7 +92,7 @@ func (ev *ExactVersion) Install(ctx context.Context) (string, error) {
 	if dstDir == "" {
 		var err error
 		dirName := fmt.Sprintf("%s_*", ev.Product.Name)
-		dstDir, err = ioutil.TempDir("", dirName)
+		dstDir, err = os.MkdirTemp("", dirName)
 		if err != nil {
 			return "", err
 		}

releases/latest_version.go

@@ -6,7 +6,6 @@ package releases
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -89,7 +88,7 @@ func (lv *LatestVersion) Install(ctx context.Context) (string, error) {
 	if dstDir == "" {
 		var err error
 		dirName := fmt.Sprintf("%s_*", lv.Product.Name)
-		dstDir, err = ioutil.TempDir("", dirName)
+		dstDir, err = os.MkdirTemp("", dirName)
 		if err != nil {
 			return "", err
 		}

releases/releases.go

@@ -4,13 +4,13 @@
 package releases
 
 import (
-	"io/ioutil"
+	"io"
 	"log"
 	"time"
 )
 
 var (
 	defaultInstallTimeout = 30 * time.Second
 	defaultListTimeout    = 10 * time.Second
-	discardLogger         = log.New(ioutil.Discard, "", 0)
+	discardLogger         = log.New(io.Discard, "", 0)
 )

releases/releases_test.go

@@ -6,7 +6,7 @@ package releases
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"
 	"testing"
@@ -158,7 +158,7 @@ func BenchmarkExactVersion(b *testing.B) {
 	mockApiRoot := filepath.Join("testdata", "mock_api_tf_0_14_with_prereleases")
 
 	for i := 0; i < b.N; i++ {
-		installDir, err := ioutil.TempDir("", fmt.Sprintf("%s_%d", "terraform", i))
+		installDir, err := os.MkdirTemp("", fmt.Sprintf("%s_%d", "terraform", i))
 		if err != nil {
 			b.Fatal(err)
 		}
@@ -183,7 +183,7 @@ func BenchmarkExactVersion(b *testing.B) {
 
 func getTestPubKey(t testing.TB) string {
 	f, err := os.Open(filepath.Join("testdata", "2FCA0A85.pub"))
-	b, err := ioutil.ReadAll(f)
+	b, err := io.ReadAll(f)
 	if err != nil {
 		t.Fatal(err)
 	}

releases/testdata/terraform/main.go

@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"runtime"
@@ -98,7 +98,7 @@ func (c *VersionCommand) Run(args []string) int {
 
 func defaultFlagSet(name string) *flag.FlagSet {
 	f := flag.NewFlagSet(name, flag.ContinueOnError)
-	f.SetOutput(ioutil.Discard)
+	f.SetOutput(io.Discard)
 	f.Usage = func() {}
 	return f
 }