Skip to content

Commit 365ec0a

Browse files
committed
Replace deprecated ioutil.
1 parent 3d5770f commit 365ec0a

13 files changed

+24
-36
lines changed

client.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"errors"
66
"fmt"
7-
"io/ioutil"
87
"os"
98
"path/filepath"
109
"strconv"
@@ -202,7 +201,7 @@ func (c *Client) Get() error {
202201
if decompressor != nil {
203202
// Create a temporary directory to store our archive. We delete
204203
// this at the end of everything.
205-
td, err := ioutil.TempDir("", "getter")
204+
td, err := os.MkdirTemp("", "getter")
206205
if err != nil {
207206
return fmt.Errorf(
208207
"Error creating temporary directory for archive: %s", err)

common.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package getter
22

33
import (
4-
"io/ioutil"
4+
"os"
55
)
66

77
func tmpFile(dir, pattern string) (string, error) {
8-
f, err := ioutil.TempFile(dir, pattern)
8+
f, err := os.CreateTemp(dir, pattern)
99
if err != nil {
1010
return "", err
1111
}

decompress_tar_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package getter
33
import (
44
"archive/tar"
55
"bytes"
6-
"io/ioutil"
76
"os"
87
"path/filepath"
98
"runtime"
@@ -79,7 +78,7 @@ func TestTarLimits(t *testing.T) {
7978
t.Fatal(err)
8079
}
8180

82-
td, err := ioutil.TempDir("", "getter")
81+
td, err := os.MkdirTemp("", "getter")
8382
if err != nil {
8483
t.Fatalf("err: %s", err)
8584
}
@@ -130,7 +129,7 @@ func TestTarLimits(t *testing.T) {
130129

131130
// testDecompressPermissions decompresses a directory and checks the permissions of the expanded files
132131
func testDecompressorPermissions(t *testing.T, d Decompressor, input string, expected map[string]int, umask os.FileMode) {
133-
td, err := ioutil.TempDir("", "getter")
132+
td, err := os.MkdirTemp("", "getter")
134133
if err != nil {
135134
t.Fatalf("err: %s", err)
136135
}

decompress_testing.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"crypto/md5"
55
"encoding/hex"
66
"io"
7-
"io/ioutil"
87
"os"
98
"path/filepath"
109
"reflect"
@@ -34,7 +33,7 @@ func TestDecompressor(t testing.T, d Decompressor, cases []TestDecompressCase) {
3433
t.Logf("Testing: %s", tc.Input)
3534

3635
// Temporary dir to store stuff
37-
td, err := ioutil.TempDir("", "getter")
36+
td, err := os.MkdirTemp("", "getter")
3837
if err != nil {
3938
t.Fatalf("err: %s", err)
4039
}

decompress_zip_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package getter
33
import (
44
"archive/zip"
55
"bytes"
6-
"io/ioutil"
76
"log"
87
"os"
98
"path/filepath"
@@ -166,7 +165,7 @@ func TestDecompressZipBomb(t *testing.T) {
166165
}
167166
}
168167

169-
td, err := ioutil.TempDir("", "go-getter-zip")
168+
td, err := os.MkdirTemp("", "go-getter-zip")
170169
if err != nil {
171170
t.Fatalf("err: %s", err)
172171
}

detect_file_unix_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
package getter
44

55
import (
6-
"io/ioutil"
76
"os"
87
"path/filepath"
98
"testing"
@@ -12,7 +11,7 @@ import (
1211
// If a relative symlink is passed in as the pwd to Detect, the resulting URL
1312
// can have an invalid path.
1413
func TestFileDetector_relativeSymlink(t *testing.T) {
15-
tmpDir, err := ioutil.TempDir("", "go-getter")
14+
tmpDir, err := os.MkdirTemp("", "go-getter")
1615
if err != nil {
1716
t.Fatal(err)
1817
}

get_gcs_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package getter
22

33
import (
4-
"io/ioutil"
54
"net/url"
65
"os"
76
"path/filepath"
@@ -83,7 +82,7 @@ func TestGCSGetter_GetGenerationFile(t *testing.T) {
8382
}
8483

8584
// Verify contents are valid for this generation
86-
content, err := ioutil.ReadFile(dst)
85+
content, err := os.ReadFile(dst)
8786
if err != nil {
8887
t.Fatalf("err: %s", err)
8988
}
@@ -99,7 +98,7 @@ func TestGCSGetter_GetGenerationFile(t *testing.T) {
9998
}
10099

101100
// Verify contents are valid for this generation
102-
content, err = ioutil.ReadFile(dst)
101+
content, err = os.ReadFile(dst)
103102
if err != nil {
104103
t.Fatalf("err: %s", err)
105104
}

get_git.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"context"
66
"encoding/base64"
77
"fmt"
8-
"io/ioutil"
98
"net/url"
109
"os"
1110
"os/exec"
@@ -99,7 +98,7 @@ func (g *GitGetter) Get(dst string, u *url.URL) error {
9998
}
10099

101100
// Create a temp file for the key and ensure it is removed.
102-
fh, err := ioutil.TempFile("", "go-getter")
101+
fh, err := os.CreateTemp("", "go-getter")
103102
if err != nil {
104103
return err
105104
}

get_git_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"encoding/base64"
77
"errors"
88
"fmt"
9-
"io/ioutil"
109
"net/url"
1110
"os"
1211
"os/exec"
@@ -417,14 +416,14 @@ func TestGitGetter_gitVersion(t *testing.T) {
417416
if runtime.GOOS == "windows" {
418417
t.Skip("skipping on windows since the test requires sh")
419418
}
420-
dir, err := ioutil.TempDir("", "go-getter")
419+
dir, err := os.MkdirTemp("", "go-getter")
421420
if err != nil {
422421
t.Fatal(err)
423422
}
424423
defer os.RemoveAll(dir)
425424

426425
script := filepath.Join(dir, "git")
427-
err = ioutil.WriteFile(
426+
err = os.WriteFile(
428427
script,
429428
[]byte("#!/bin/sh\necho \"git version 2.0 (Some Metadata Here)\n\""),
430429
0700)
@@ -707,7 +706,7 @@ func TestGitGetter_subdirectory_symlink(t *testing.T) {
707706
g := new(GitGetter)
708707
dst := tempDir(t)
709708

710-
target, err := ioutil.TempFile("", "link-target")
709+
target, err := os.CreateTemp("", "link-target")
711710
if err != nil {
712711
t.Fatal(err)
713712
}
@@ -822,7 +821,7 @@ type gitRepo struct {
822821

823822
// testGitRepo creates a new test git repository.
824823
func testGitRepo(t *testing.T, name string) *gitRepo {
825-
dir, err := ioutil.TempDir("", "go-getter")
824+
dir, err := os.MkdirTemp("", "go-getter")
826825
if err != nil {
827826
t.Fatal(err)
828827
}
@@ -864,7 +863,7 @@ func (r *gitRepo) git(args ...string) {
864863
// commitFile writes and commits a text file to the repo.
865864
func (r *gitRepo) commitFile(file, content string) {
866865
path := filepath.Join(r.dir, file)
867-
if err := ioutil.WriteFile(path, []byte(content), 0600); err != nil {
866+
if err := os.WriteFile(path, []byte(content), 0600); err != nil {
868867
r.t.Fatal(err)
869868
}
870869
r.git("add", file)

get_http_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"encoding/hex"
77
"errors"
88
"fmt"
9-
"io/ioutil"
109
"net"
1110
"net/http"
1211
"net/http/httputil"
@@ -250,7 +249,7 @@ func TestHttpGetter_resume(t *testing.T) {
250249
t.Fatalf("finishing download should not error: %v", err)
251250
}
252251

253-
b, err := ioutil.ReadFile(dst)
252+
b, err := os.ReadFile(dst)
254253
if err != nil {
255254
t.Fatalf("readfile failed: %v", err)
256255
}
@@ -306,7 +305,7 @@ func TestHttpGetter_resumeNoRange(t *testing.T) {
306305
t.Fatalf("finishing download should not error: %v", err)
307306
}
308307

309-
b, err := ioutil.ReadFile(dst)
308+
b, err := os.ReadFile(dst)
310309
if err != nil {
311310
t.Fatalf("readfile failed: %v", err)
312311
}
@@ -758,7 +757,7 @@ func TestHttpGetter_subdirLink(t *testing.T) {
758757
defer ln.Close()
759758

760759
httpGetter := new(HttpGetter)
761-
dst, err := ioutil.TempDir("", "tf")
760+
dst, err := os.MkdirTemp("", "tf")
762761
if err != nil {
763762
t.Fatalf("err: %s", err)
764763
}
@@ -826,7 +825,7 @@ func testHttpServerWithXTerraformGetDetected(t *testing.T) net.Listener {
826825
w.Header().Set("X-Terraform-Get", first)
827826
})
828827
mux.HandleFunc("/archive.tar.gz", func(w http.ResponseWriter, r *http.Request) {
829-
f, err := ioutil.ReadFile("testdata/archive.tar.gz")
828+
f, err := os.ReadFile("testdata/archive.tar.gz")
830829
if err != nil {
831830
t.Fatal(err)
832831
}

0 commit comments

Comments
 (0)