Replace deprecated ioutil.

tristanmorgan · tristanmorgan · commit 8c68b8bcd0cb · 2025-01-10T08:55:03.000+11:00
diff --git a/client.go b/client.go
@@ -7,7 +7,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -205,7 +204,7 @@ func (c *Client) Get() error {
 	if decompressor != nil {
 		// Create a temporary directory to store our archive. We delete
 		// this at the end of everything.
-		td, err := ioutil.TempDir("", "getter")
+		td, err := os.MkdirTemp("", "getter")
 		if err != nil {
 			return fmt.Errorf(
 				"Error creating temporary directory for archive: %s", err)
diff --git a/common.go b/common.go
@@ -4,11 +4,11 @@
 package getter
 
 import (
-	"io/ioutil"
+	"os"
 )
 
 func tmpFile(dir, pattern string) (string, error) {
-	f, err := ioutil.TempFile(dir, pattern)
+	f, err := os.CreateTemp(dir, pattern)
 	if err != nil {
 		return "", err
 	}
diff --git a/decompress_tar_test.go b/decompress_tar_test.go
@@ -6,7 +6,6 @@ package getter
 import (
 	"archive/tar"
 	"bytes"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -82,7 +81,7 @@ func TestTarLimits(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	td, err := ioutil.TempDir("", "getter")
+	td, err := os.MkdirTemp("", "getter")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -133,7 +132,7 @@ func TestTarLimits(t *testing.T) {
 
 // testDecompressPermissions decompresses a directory and checks the permissions of the expanded files
 func testDecompressorPermissions(t *testing.T, d Decompressor, input string, expected map[string]int, umask os.FileMode) {
-	td, err := ioutil.TempDir("", "getter")
+	td, err := os.MkdirTemp("", "getter")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
diff --git a/decompress_testing.go b/decompress_testing.go
@@ -7,7 +7,6 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -37,7 +36,7 @@ func TestDecompressor(t testing.T, d Decompressor, cases []TestDecompressCase) {
 		t.Logf("Testing: %s", tc.Input)
 
 		// Temporary dir to store stuff
-		td, err := ioutil.TempDir("", "getter")
+		td, err := os.MkdirTemp("", "getter")
 		if err != nil {
 			t.Fatalf("err: %s", err)
 		}
diff --git a/decompress_zip_test.go b/decompress_zip_test.go
@@ -6,7 +6,6 @@ package getter
 import (
 	"archive/zip"
 	"bytes"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -169,7 +168,7 @@ func TestDecompressZipBomb(t *testing.T) {
 		}
 	}
 
-	td, err := ioutil.TempDir("", "go-getter-zip")
+	td, err := os.MkdirTemp("", "go-getter-zip")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
diff --git a/detect_file_unix_test.go b/detect_file_unix_test.go
@@ -6,7 +6,6 @@
 package getter
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -15,7 +14,7 @@ import (
 // If a relative symlink is passed in as the pwd to Detect, the resulting URL
 // can have an invalid path.
 func TestFileDetector_relativeSymlink(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "go-getter")
+	tmpDir, err := os.MkdirTemp("", "go-getter")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/get_gcs_test.go b/get_gcs_test.go
@@ -4,7 +4,6 @@
 package getter
 
 import (
-	"io/ioutil"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -86,7 +85,7 @@ func TestGCSGetter_GetGenerationFile(t *testing.T) {
 	}
 
 	// Verify contents are valid for this generation
-	content, err := ioutil.ReadFile(dst)
+	content, err := os.ReadFile(dst)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -102,7 +101,7 @@ func TestGCSGetter_GetGenerationFile(t *testing.T) {
 	}
 
 	// Verify contents are valid for this generation
-	content, err = ioutil.ReadFile(dst)
+	content, err = os.ReadFile(dst)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
diff --git a/get_git.go b/get_git.go
@@ -8,7 +8,6 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"io/ioutil"
 	"net/url"
 	"os"
 	"os/exec"
@@ -102,7 +101,7 @@ func (g *GitGetter) Get(dst string, u *url.URL) error {
 		}
 
 		// Create a temp file for the key and ensure it is removed.
-		fh, err := ioutil.TempFile("", "go-getter")
+		fh, err := os.CreateTemp("", "go-getter")
 		if err != nil {
 			return err
 		}
diff --git a/get_git_test.go b/get_git_test.go
@@ -9,7 +9,6 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net/url"
 	"os"
 	"os/exec"
@@ -421,14 +420,14 @@ func TestGitGetter_gitVersion(t *testing.T) {
 	if runtime.GOOS == "windows" {
 		t.Skip("skipping on windows since the test requires sh")
 	}
-	dir, err := ioutil.TempDir("", "go-getter")
+	dir, err := os.MkdirTemp("", "go-getter")
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer os.RemoveAll(dir)
 
 	script := filepath.Join(dir, "git")
-	err = ioutil.WriteFile(
+	err = os.WriteFile(
 		script,
 		[]byte("#!/bin/sh\necho \"git version 2.0 (Some Metadata Here)\n\""),
 		0700)
@@ -734,7 +733,7 @@ func TestGitGetter_subdirectory_symlink(t *testing.T) {
 	g := new(GitGetter)
 	dst := tempDir(t)
 
-	target, err := ioutil.TempFile("", "link-target")
+	target, err := os.CreateTemp("", "link-target")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1028,7 +1027,7 @@ type gitRepo struct {
 
 // testGitRepo creates a new test git repository.
 func testGitRepo(t *testing.T, name string) *gitRepo {
-	dir, err := ioutil.TempDir("", "go-getter")
+	dir, err := os.MkdirTemp("", "go-getter")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1070,7 +1069,7 @@ func (r *gitRepo) git(args ...string) {
 // commitFile writes and commits a text file to the repo.
 func (r *gitRepo) commitFile(file, content string) {
 	path := filepath.Join(r.dir, file)
-	if err := ioutil.WriteFile(path, []byte(content), 0600); err != nil {
+	if err := os.WriteFile(path, []byte(content), 0600); err != nil {
 		r.t.Fatal(err)
 	}
 	r.git("add", file)
diff --git a/get_http_test.go b/get_http_test.go
@@ -9,7 +9,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/http/httputil"
@@ -253,7 +252,7 @@ func TestHttpGetter_resume(t *testing.T) {
 		t.Fatalf("finishing download should not error: %v", err)
 	}
 
-	b, err := ioutil.ReadFile(dst)
+	b, err := os.ReadFile(dst)
 	if err != nil {
 		t.Fatalf("readfile failed: %v", err)
 	}
@@ -309,7 +308,7 @@ func TestHttpGetter_resumeNoRange(t *testing.T) {
 		t.Fatalf("finishing download should not error: %v", err)
 	}
 
-	b, err := ioutil.ReadFile(dst)
+	b, err := os.ReadFile(dst)
 	if err != nil {
 		t.Fatalf("readfile failed: %v", err)
 	}
@@ -761,7 +760,7 @@ func TestHttpGetter_subdirLink(t *testing.T) {
 	defer ln.Close()
 
 	httpGetter := new(HttpGetter)
-	dst, err := ioutil.TempDir("", "tf")
+	dst, err := os.MkdirTemp("", "tf")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -829,7 +828,7 @@ func testHttpServerWithXTerraformGetDetected(t *testing.T) net.Listener {
 		w.Header().Set("X-Terraform-Get", first)
 	})
 	mux.HandleFunc("/archive.tar.gz", func(w http.ResponseWriter, r *http.Request) {
-		f, err := ioutil.ReadFile("testdata/archive.tar.gz")
+		f, err := os.ReadFile("testdata/archive.tar.gz")
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/module_test.go b/module_test.go
@@ -4,7 +4,6 @@
 package getter
 
 import (
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -19,7 +18,7 @@ import (
 const fixtureDir = "./testdata"
 
 func tempDir(t *testing.T) string {
-	dir, err := ioutil.TempDir("", "tf")
+	dir, err := os.MkdirTemp("", "tf")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -81,7 +80,7 @@ func testStorage(t *testing.T) Storage {
 }
 
 func assertContents(t *testing.T, path string, contents string) {
-	data, err := ioutil.ReadFile(path)
+	data, err := os.ReadFile(path)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
diff --git a/source_test.go b/source_test.go
@@ -4,7 +4,6 @@
 package getter
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -57,7 +56,7 @@ func TestSourceDirSubdir(t *testing.T) {
 }
 
 func TestSourceSubdirGlob(t *testing.T) {
-	td, err := ioutil.TempDir("", "subdir-glob")
+	td, err := os.MkdirTemp("", "subdir-glob")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/util_test.go b/util_test.go
@@ -5,7 +5,6 @@ package getter
 
 import (
 	"io"
-	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
@@ -32,7 +31,7 @@ func tempEnv(t *testing.T, k, v string) func() {
 // tempFileContents writes a temporary file and returns the path and a function
 // to clean it up.
 func tempFileContents(t *testing.T, contents string) (string, func()) {
-	tf, err := ioutil.TempFile("", "getter")
+	tf, err := os.CreateTemp("", "getter")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@`
`4`	`4`	`package getter`
`5`	`5`
`6`	`6`	`import (`
`7`		`- "io/ioutil"`
	`7`	`+ "os"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func tmpFile(dir, pattern string) (string, error) {`
`11`		`- f, err := ioutil.TempFile(dir, pattern)`
	`11`	`+ f, err := os.CreateTemp(dir, pattern)`
`12`	`12`	`if err != nil {`
`13`	`13`	`return "", err`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ package getter`
`6`	`6`	`import (`
`7`	`7`	`"archive/zip"`
`8`	`8`	`"bytes"`
`9`		`- "io/ioutil"`
`10`	`9`	`"log"`
`11`	`10`	`"os"`
`12`	`11`	`"path/filepath"`
`@@ -169,7 +168,7 @@ func TestDecompressZipBomb(t *testing.T) {`
`169`	`168`	`}`
`170`	`169`	`}`
`171`	`170`
`172`		`- td, err := ioutil.TempDir("", "go-getter-zip")`
	`171`	`+ td, err := os.MkdirTemp("", "go-getter-zip")`
`173`	`172`	`if err != nil {`
`174`	`173`	`t.Fatalf("err: %s", err)`
`175`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`package getter`
`5`	`5`
`6`	`6`	`import (`
`7`		`- "io/ioutil"`
`8`	`7`	`"net/url"`
`9`	`8`	`"os"`
`10`	`9`	`"path/filepath"`
`@@ -86,7 +85,7 @@ func TestGCSGetter_GetGenerationFile(t *testing.T) {`
`86`	`85`	`}`
`87`	`86`
`88`	`87`	`// Verify contents are valid for this generation`
`89`		`- content, err := ioutil.ReadFile(dst)`
	`88`	`+ content, err := os.ReadFile(dst)`
`90`	`89`	`if err != nil {`
`91`	`90`	`t.Fatalf("err: %s", err)`
`92`	`91`	`}`
`@@ -102,7 +101,7 @@ func TestGCSGetter_GetGenerationFile(t *testing.T) {`
`102`	`101`	`}`
`103`	`102`
`104`	`103`	`// Verify contents are valid for this generation`
`105`		`- content, err = ioutil.ReadFile(dst)`
	`104`	`+ content, err = os.ReadFile(dst)`
`106`	`105`	`if err != nil {`
`107`	`106`	`t.Fatalf("err: %s", err)`
`108`	`107`	`}`