Replace use of ioutil with os/io equivalents.

tfexec/internal/e2etest/fmt_test.go

@@ -6,7 +6,6 @@ package e2etest
 import (
 	"context"
 	"io"
-	"io/ioutil"
 	"path/filepath"
 	"reflect"
 	"strings"
@@ -163,7 +162,7 @@ resource "foo" "bar" {
 			t.Fatal(err)
 		}
 
-		actual, err := ioutil.ReadAll(outR)
+		actual, err := io.ReadAll(outR)
 		if err != nil {
 			t.Fatal(err)
 		}

tfexec/internal/e2etest/main_test.go

@@ -4,7 +4,6 @@
 package e2etest
 
 import (
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -15,7 +14,7 @@ var tfcache *testutil.TFCache
 
 func TestMain(m *testing.M) {
 	os.Exit(func() int {
-		installDir, err := ioutil.TempDir("", "tfinstall")
+		installDir, err := os.MkdirTemp("", "tfinstall")
 		if err != nil {
 			panic(err)
 		}

tfexec/internal/e2etest/show_test.go

@@ -7,7 +7,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -622,7 +622,7 @@ func TestShowPlanFileRaw012_linux(t *testing.T) {
 			t.Fatal(err)
 		}
 		defer f.Close()
-		expected, err := ioutil.ReadAll(f)
+		expected, err := io.ReadAll(f)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -650,7 +650,7 @@ func TestShowPlanFileRaw013(t *testing.T) {
 			t.Fatal(err)
 		}
 		defer f.Close()
-		expected, err := ioutil.ReadAll(f)
+		expected, err := io.ReadAll(f)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -678,7 +678,7 @@ func TestShowPlanFileRaw014(t *testing.T) {
 			t.Fatal(err)
 		}
 		defer f.Close()
-		expected, err := ioutil.ReadAll(f)
+		expected, err := io.ReadAll(f)
 		if err != nil {
 			t.Fatal(err)
 		}

tfexec/internal/e2etest/util_test.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"hash/crc32"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -67,7 +66,7 @@ func runTest(t *testing.T, fixtureName string, cb func(t *testing.T, tfVersion *
 		// prevents any possible confusion that could result from
 		// reusing an os.TempDir() (for example) that already contained
 		// Terraform files.
-		td, err := ioutil.TempDir("", "tf")
+		td, err := os.MkdirTemp("", "tf")
 		if err != nil {
 			t.Fatalf("error creating temporary test directory: %s", err)
 		}
@@ -113,7 +112,7 @@ func runTestWithVersions(t *testing.T, versions []string, fixtureName string, cb
 			}
 			alreadyRunVersions[tfv] = true
 
-			td, err := ioutil.TempDir("", "tf")
+			td, err := os.MkdirTemp("", "tf")
 			if err != nil {
 				t.Fatalf("error creating temporary test directory: %s", err)
 			}
@@ -190,7 +189,7 @@ func (t *testingPrintfer) Printf(format string, v ...interface{}) {
 }
 
 func copyFiles(path string, dstPath string) error {
-	infos, err := ioutil.ReadDir(path)
+	infos, err := os.ReadDir(path)
 	if err != nil {
 		return err
 	}
@@ -199,7 +198,7 @@ func copyFiles(path string, dstPath string) error {
 		srcPath := filepath.Join(path, info.Name())
 		if info.IsDir() {
 			newDir := filepath.Join(dstPath, info.Name())
-			err = os.MkdirAll(newDir, info.Mode())
+			err = os.MkdirAll(newDir, info.Type())
 			if err != nil {
 				return err
 			}
@@ -249,12 +248,12 @@ func copyFile(path string, dstPath string) error {
 
 // filesEqual asserts that two files have the same contents.
 func textFilesEqual(t *testing.T, expected, actual string) {
-	eb, err := ioutil.ReadFile(expected)
+	eb, err := os.ReadFile(expected)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	ab, err := ioutil.ReadFile(actual)
+	ab, err := os.ReadFile(actual)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -271,7 +270,7 @@ func textFilesEqual(t *testing.T, expected, actual string) {
 }
 
 func checkSum(t *testing.T, filename string) uint32 {
-	b, err := ioutil.ReadFile(filename)
+	b, err := os.ReadFile(filename)
 	if err != nil {
 		t.Fatal(err)
 	}

tfexec/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)
 }

tfexec/terraform.go

@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"runtime"
@@ -103,7 +102,7 @@ func NewTerraform(workingDir string, execPath string) (*Terraform, error) {
 		execPath:   execPath,
 		workingDir: workingDir,
 		env:        nil, // explicit nil means copy os.Environ
-		logger:     log.New(ioutil.Discard, "", 0),
+		logger:     log.New(io.Discard, "", 0),
 		waitDelay:  60 * time.Second,
 	}
 

tfexec/terraform_test.go

@@ -6,7 +6,6 @@ package tfexec
 import (
 	"context"
 	"errors"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -27,7 +26,7 @@ func TestMain(m *testing.M) {
 
 	os.Exit(func() int {
 		var err error
-		installDir, err := ioutil.TempDir("", "tfinstall")
+		installDir, err := os.MkdirTemp("", "tfinstall")
 		if err != nil {
 			panic(err)
 		}