Skip to content

Commit 407f195

Browse files
sebrandon1sebrandon1
committed
Migrate away from deprecated ioutil
1 parent e43923c commit 407f195

20 files changed

Lines changed: 48 additions & 66 deletions

‎pkg/build/builder/cmd/dockercfg/cfg.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package dockercfg
22

33
import (
44
"encoding/json"
5-
"io/ioutil"
65
"os"
76
"os/user"
87
"path/filepath"
@@ -121,7 +120,7 @@ func readSpecificDockerConfigJSONFile(filePath string) error {
121120
var contents []byte
122121
var err error
123122

124-
if contents, err = ioutil.ReadFile(filePath); err != nil {
123+
if contents, err = os.ReadFile(filePath); err != nil {
125124
log.V(4).Infof("error reading file: %v", err)
126125
return err
127126
}

‎pkg/build/builder/cmd/dockercfg/cfg_test.go‎

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

33
import (
4-
"io/ioutil"
54
"os"
65
"path/filepath"
76
"testing"
@@ -16,7 +15,7 @@ func TestGetDockerAuth(t *testing.T) {
1615

1716
content := "{ \"auths\": { \"test-server-1.tld\":{\"auth\":\"Zm9vOmJhcgo=\",\"email\":\"test@email.test.com\"}}}"
1817

19-
tmpDirPath, err := ioutil.TempDir("", "test_foo_bar_")
18+
tmpDirPath, err := os.MkdirTemp("", "test_foo_bar_")
2019
if err != nil {
2120
t.Fatalf("Creating tmp dir fail: %v", err)
2221
return

‎pkg/build/builder/cmd/scmauth/cacert.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package scmauth
22

33
import (
44
"fmt"
5-
"io/ioutil"
5+
"os"
66
"path/filepath"
77

88
s2igit "github.com/openshift/source-to-image/pkg/scm/git"
@@ -27,7 +27,7 @@ func (s CACert) Setup(baseDir string, context SCMAuthContext) (string, error) {
2727
if !(s.SourceURL.Type == s2igit.URLTypeURL && s.SourceURL.URL.Scheme == "https" && s.SourceURL.URL.Opaque == "") {
2828
return "", nil
2929
}
30-
gitconfig, err := ioutil.TempFile("", "ca.crt.")
30+
gitconfig, err := os.CreateTemp("", "ca.crt.")
3131
if err != nil {
3232
return "", err
3333
}

‎pkg/build/builder/cmd/scmauth/password.go‎

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

33
import (
44
"fmt"
5-
"io/ioutil"
65
"net/url"
76
"os"
87
"path/filepath"
@@ -66,12 +65,12 @@ func (u UsernamePassword) Setup(baseDir string, context SCMAuthContext) (string,
6665

6766
// Write git config if needed
6867
if gitconfigURL != nil {
69-
gitcredentials, err := ioutil.TempFile("", "gitcredentials.")
68+
gitcredentials, err := os.CreateTemp("", "gitcredentials.")
7069
if err != nil {
7170
return "", err
7271
}
7372
defer gitcredentials.Close()
74-
gitconfig, err := ioutil.TempFile("", "gitcredentialscfg.")
73+
gitconfig, err := os.CreateTemp("", "gitcredentialscfg.")
7574
if err != nil {
7675
return "", err
7776
}

‎pkg/build/builder/cmd/scmauth/scmauth_test.go‎

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

33
import (
4-
"io/ioutil"
54
"os"
65
"path/filepath"
76
"strings"
@@ -11,12 +10,12 @@ import (
1110
)
1211

1312
func secretDir(t *testing.T, files ...string) string {
14-
dir, err := ioutil.TempDir("", "test")
13+
dir, err := os.MkdirTemp("", "test")
1514
if err != nil {
1615
t.Fatalf("error creating temp dir: %v", err)
1716
}
1817
for _, f := range files {
19-
err := ioutil.WriteFile(filepath.Join(dir, f), []byte("test"), 0600)
18+
err := os.WriteFile(filepath.Join(dir, f), []byte("test"), 0600)
2019
if err != nil {
2120
t.Fatalf("error creating test file: %v", err)
2221
}

‎pkg/build/builder/cmd/scmauth/scmauths.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package scmauth
22

33
import (
44
"fmt"
5-
"io/ioutil"
65
"net/url"
76
"os"
87

@@ -53,7 +52,7 @@ func (a SCMAuths) doSetup(secretsDir string) (SCMAuthContext, error) {
5352
}
5453

5554
func (a SCMAuths) Setup(secretsDir string) (env []string, overrideURL *url.URL, gitConfig string, err error) {
56-
files, err := ioutil.ReadDir(secretsDir)
55+
files, err := os.ReadDir(secretsDir)
5756
if err != nil {
5857
return nil, nil, "", err
5958
}

‎pkg/build/builder/cmd/scmauth/scmauths_test.go‎

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

33
import (
4-
"io/ioutil"
54
"os"
65
"testing"
76
)
@@ -34,7 +33,7 @@ func scmAuths() SCMAuths {
3433
func TestPresent(t *testing.T) {
3534
secretDir := secretDir(t, "one", "three")
3635
defer os.RemoveAll(secretDir)
37-
files, err := ioutil.ReadDir(secretDir)
36+
files, err := os.ReadDir(secretDir)
3837
if err != nil {
3938
t.Fatalf("unexpected error: %v", err)
4039
}

‎pkg/build/builder/cmd/scmauth/sshkey.go‎

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

33
import (
44
"fmt"
5-
"io/ioutil"
5+
"os"
66
"path/filepath"
77
)
88

@@ -16,7 +16,7 @@ type SSHPrivateKey struct{}
1616
// SSH key while accessing private repository. Note that this does _not_ generate a .gitconfig
1717
// file or set the GIT_CONFIG environment variable.
1818
func (SSHPrivateKey) Setup(baseDir string, context SCMAuthContext) (string, error) {
19-
script, err := ioutil.TempFile("", "gitssh")
19+
script, err := os.CreateTemp("", "gitssh")
2020
if err != nil {
2121
return "", err
2222
}
@@ -26,7 +26,7 @@ func (SSHPrivateKey) Setup(baseDir string, context SCMAuthContext) (string, erro
2626
}
2727
foundPrivateKey := false
2828
foundKnownHosts := false
29-
files, err := ioutil.ReadDir(baseDir)
29+
files, err := os.ReadDir(baseDir)
3030
if err != nil {
3131
return "", err
3232
}

‎pkg/build/builder/cmd/scmauth/sshkey_test.go‎

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

33
import (
4-
"io/ioutil"
54
"os"
65
"strings"
76
"testing"
@@ -31,7 +30,7 @@ func TestSSHPrivateKeySetup(t *testing.T) {
3130
if !isSet {
3231
t.Errorf("GIT_SSH is not set")
3332
}
34-
buf, err := ioutil.ReadFile(fileName)
33+
buf, err := os.ReadFile(fileName)
3534
if err != nil {
3635
t.Errorf("problem reading ssh file %s", err.Error())
3736
}
@@ -55,7 +54,7 @@ func TestSSHPrivateKeyWithKnownHostsSetup(t *testing.T) {
5554
if !isSet {
5655
t.Errorf("GIT_SSH is not set")
5756
}
58-
buf, err := ioutil.ReadFile(fileName)
57+
buf, err := os.ReadFile(fileName)
5958
if err != nil {
6059
t.Errorf("problem reading ssh file %s", err.Error())
6160
}

‎pkg/build/builder/cmd/scmauth/util.go‎

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

33
import (
44
"fmt"
5-
"io/ioutil"
65
"os"
76
"path/filepath"
87
"strings"
@@ -17,13 +16,13 @@ var log = utillog.ToFile(os.Stderr, 2)
1716
// section to the provided path.
1817
// Returns the path to the git configuration file, and error if raised.
1918
func createGitConfig(includePath string, context SCMAuthContext) (string, error) {
20-
tempDir, err := ioutil.TempDir("", "git")
19+
tempDir, err := os.MkdirTemp("", "git")
2120
if err != nil {
2221
return "", err
2322
}
2423
gitconfig := filepath.Join(tempDir, ".gitconfig")
2524
content := fmt.Sprintf("[include]\npath = %s\n", includePath)
26-
if err := ioutil.WriteFile(gitconfig, []byte(content), 0600); err != nil {
25+
if err := os.WriteFile(gitconfig, []byte(content), 0600); err != nil {
2726
return "", err
2827
}
2928
// The GIT_CONFIG variable won't affect regular git operation
@@ -61,6 +60,6 @@ func ensureGitConfigIncludes(path string, context SCMAuthContext) (string, error
6160

6261
lines = append(lines, fmt.Sprintf("path = %s", path))
6362
content := []byte(strings.Join(lines, "\n"))
64-
err = ioutil.WriteFile(gitconfig, content, 0600)
63+
err = os.WriteFile(gitconfig, content, 0600)
6564
return gitconfig, err
6665
}

0 commit comments

Comments
 (0)