Skip to content

Commit 8716e4f

Browse files
committed
Replace deprecated ioutil.
1 parent e310de3 commit 8716e4f

11 files changed

+22
-32
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"
@@ -182,7 +181,7 @@ func (c *Client) get(ctx context.Context, req *Request, g Getter) (*GetResult, *
182181
if decompressor != nil {
183182
// Create a temporary directory to store our archive. We delete
184183
// this at the end of everything.
185-
td, err := ioutil.TempDir("", "getter")
184+
td, err := os.MkdirTemp("", "getter")
186185
if err != nil {
187186
return nil, &getError{true, fmt.Errorf(
188187
"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: 3 additions & 4 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,14 +78,14 @@ 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
}
8685

8786
tarFilePath := filepath.Join(td, "input.tar")
8887

89-
err = ioutil.WriteFile(tarFilePath, b.Bytes(), 0666)
88+
err = os.WriteFile(tarFilePath, b.Bytes(), 0666)
9089
if err != nil {
9190
t.Fatalf("err: %s", err)
9291
}
@@ -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: 2 additions & 3 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,14 +165,14 @@ 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
}
173172

174173
zipFilePath := filepath.Join(td, "input.zip")
175174

176-
err = ioutil.WriteFile(zipFilePath, buf.Bytes(), 0666)
175+
err = os.WriteFile(zipFilePath, buf.Bytes(), 0666)
177176
if err != nil {
178177
t.Fatalf("err: %s", err)
179178
}

get_file_unix_test.go

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

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

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"
@@ -96,7 +95,7 @@ func (g *GitGetter) Get(ctx context.Context, req *Request) error {
9695
}
9796

9897
// Create a temp file for the key and ensure it is removed.
99-
fh, err := ioutil.TempFile("", "go-getter")
98+
fh, err := os.CreateTemp("", "go-getter")
10099
if err != nil {
101100
return err
102101
}

get_git_test.go

Lines changed: 4 additions & 5 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"
@@ -322,14 +321,14 @@ func TestGitGetter_gitVersion(t *testing.T) {
322321
if runtime.GOOS == "windows" {
323322
t.Skip("skipping on windows since the test requires sh")
324323
}
325-
dir, err := ioutil.TempDir("", "go-getter")
324+
dir, err := os.MkdirTemp("", "go-getter")
326325
if err != nil {
327326
t.Fatal(err)
328327
}
329328
defer os.RemoveAll(dir)
330329

331330
script := filepath.Join(dir, "git")
332-
err = ioutil.WriteFile(
331+
err = os.WriteFile(
333332
script,
334333
[]byte("#!/bin/sh\necho \"git version 2.0 (Some Metadata Here)\n\""),
335334
0700)
@@ -850,7 +849,7 @@ type gitRepo struct {
850849

851850
// testGitRepo creates a new test git repository.
852851
func testGitRepo(t *testing.T, name string) *gitRepo {
853-
dir, err := ioutil.TempDir("", "go-getter")
852+
dir, err := os.MkdirTemp("", "go-getter")
854853
if err != nil {
855854
t.Fatal(err)
856855
}
@@ -892,7 +891,7 @@ func (r *gitRepo) git(args ...string) {
892891
// commitFile writes and commits a text file to the repo.
893892
func (r *gitRepo) commitFile(file, content string) {
894893
path := filepath.Join(r.dir, file)
895-
if err := ioutil.WriteFile(path, []byte(content), 0600); err != nil {
894+
if err := os.WriteFile(path, []byte(content), 0600); err != nil {
896895
r.t.Fatal(err)
897896
}
898897
r.git("add", file)

get_http_test.go

Lines changed: 3 additions & 4 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"
@@ -305,7 +304,7 @@ func TestHttpGetter_resume(t *testing.T) {
305304
t.Fatalf("finishing download should not error: %v", err)
306305
}
307306

308-
b, err := ioutil.ReadFile(dst)
307+
b, err := os.ReadFile(dst)
309308
if err != nil {
310309
t.Fatalf("readfile failed: %v", err)
311310
}
@@ -362,7 +361,7 @@ func TestHttpGetter_resumeNoRange(t *testing.T) {
362361
t.Fatalf("finishing download should not error: %v", err)
363362
}
364363

365-
b, err := ioutil.ReadFile(dst)
364+
b, err := os.ReadFile(dst)
366365
if err != nil {
367366
t.Fatalf("readfile failed: %v", err)
368367
}
@@ -804,7 +803,7 @@ func TestHttpGetter_subdirLink(t *testing.T) {
804803
ln := testHttpServerSubDir(t)
805804
defer ln.Close()
806805

807-
dst, err := ioutil.TempDir("", "tf")
806+
dst, err := os.MkdirTemp("", "tf")
808807
if err != nil {
809808
t.Fatalf("err: %s", err)
810809
}

helper/testing/utils.go

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

33
import (
44
"io"
5-
"io/ioutil"
65
"os"
76
"path/filepath"
87
"reflect"
@@ -11,7 +10,7 @@ import (
1110
)
1211

1312
func TempDir(t *testing.T) string {
14-
dir, err := ioutil.TempDir("", "tf")
13+
dir, err := os.MkdirTemp("", "tf")
1514
if err != nil {
1615
t.Fatalf("err: %s", err)
1716
}
@@ -28,7 +27,7 @@ func TempTestFile(t *testing.T) string {
2827
}
2928

3029
func AssertContents(t *testing.T, path string, contents string) {
31-
data, err := ioutil.ReadFile(path)
30+
data, err := os.ReadFile(path)
3231
if err != nil {
3332
t.Fatalf("err: %s", err)
3433
}
@@ -41,7 +40,7 @@ func AssertContents(t *testing.T, path string, contents string) {
4140
// TempFileWithContent writes a temporary file and returns the path and a function
4241
// to clean it up.
4342
func TempFileWithContent(t *testing.T, contents string) (string, func()) {
44-
tf, err := ioutil.TempFile("", "getter")
43+
tf, err := os.CreateTemp("", "getter")
4544
if err != nil {
4645
t.Fatalf("err: %s", err)
4746
}

0 commit comments

Comments
 (0)