diff --git a/cluster/gce/gci/append_or_replace_prefixed_line_test.go b/cluster/gce/gci/append_or_replace_prefixed_line_test.go index 100961378f..0433381fa8 100644 --- a/cluster/gce/gci/append_or_replace_prefixed_line_test.go +++ b/cluster/gce/gci/append_or_replace_prefixed_line_test.go @@ -154,7 +154,7 @@ jelloworld } for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - f, err := os.CreateTemp("", "append_or_replace_test") + f, err := os.CreateTemp(t.TempDir(), "append_or_replace_test") if err != nil { t.Fatalf("Failed to create temp file: %v", err) } diff --git a/cmd/auth-provider-gcp/app/getcredentials.go b/cmd/auth-provider-gcp/app/getcredentials.go index 5c366cc4a9..e558769c65 100644 --- a/cmd/auth-provider-gcp/app/getcredentials.go +++ b/cmd/auth-provider-gcp/app/getcredentials.go @@ -19,7 +19,7 @@ package app import ( "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "os" @@ -112,7 +112,7 @@ func getCredentials(authFlow string) error { if err != nil { return err } - unparsedRequest, err := ioutil.ReadAll(os.Stdin) + unparsedRequest, err := io.ReadAll(os.Stdin) if err != nil { return err } diff --git a/cmd/gke-gcloud-auth-plugin/cred.go b/cmd/gke-gcloud-auth-plugin/cred.go index 0255727697..378ceee0df 100644 --- a/cmd/gke-gcloud-auth-plugin/cred.go +++ b/cmd/gke-gcloud-auth-plugin/cred.go @@ -11,7 +11,7 @@ import ( "encoding/json" "flag" "fmt" - "io/ioutil" + "os" "os/exec" "path/filepath" "strings" @@ -369,7 +369,7 @@ func executeCommand(name string, arg ...string) ([]byte, error) { } func readFile(filename string) ([]byte, error) { - return ioutil.ReadFile(filename) + return os.ReadFile(filename) } func timeNow() time.Time { diff --git a/cmd/gke-gcloud-auth-plugin/cred_test.go b/cmd/gke-gcloud-auth-plugin/cred_test.go index f09409f4d8..6ce4b5eef7 100644 --- a/cmd/gke-gcloud-auth-plugin/cred_test.go +++ b/cmd/gke-gcloud-auth-plugin/cred_test.go @@ -3,7 +3,6 @@ package main import ( "context" "fmt" - "os" "path" "testing" "time" @@ -703,14 +702,14 @@ func TestCloudsdkBasedGcloudAccessToken(t *testing.T) { } tokenForEnvVar := "gcloud_token_in_env_var" - os.Setenv(cloudsdkAuthAccessEnvVar, tokenForEnvVar) + t.Setenv(cloudsdkAuthAccessEnvVar, tokenForEnvVar) ec, err := p.execCredential() if err != nil { t.Fatalf("err should be nil") } - os.Setenv(cloudsdkAuthAccessEnvVar, "") + t.Setenv(cloudsdkAuthAccessEnvVar, "") if diff := cmp.Diff(ec.Status.Token, tokenForEnvVar); diff != "" { t.Errorf("unexpected token (-want +got): %s", diff) diff --git a/pkg/credentialconfig/config.go b/pkg/credentialconfig/config.go index 7ad63f5f57..d79f3b52d0 100644 --- a/pkg/credentialconfig/config.go +++ b/pkg/credentialconfig/config.go @@ -22,7 +22,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net/http" "os" "path/filepath" @@ -108,7 +107,7 @@ func ReadDockercfgFile(searchPaths []string) (cfg DockerConfig, err error) { continue } klog.V(4).Infof("looking for .dockercfg at %s", absDockerConfigFileLocation) - contents, err := ioutil.ReadFile(absDockerConfigFileLocation) + contents, err := os.ReadFile(absDockerConfigFileLocation) if os.IsNotExist(err) { continue } @@ -160,7 +159,7 @@ func ReadDockerConfigJSONFile(searchPaths []string) (cfg DockerConfig, err error func ReadSpecificDockerConfigJSONFile(filePath string) (cfg DockerConfig, err error) { var contents []byte - if contents, err = ioutil.ReadFile(filePath); err != nil { + if contents, err = os.ReadFile(filePath); err != nil { return nil, err } return readDockerConfigJSONFileFromBytes(contents) @@ -212,7 +211,7 @@ func ReadURL(url string, client *http.Client, header *http.Header) (body []byte, } limitedReader := &io.LimitedReader{R: resp.Body, N: maxReadLength} - contents, err := ioutil.ReadAll(limitedReader) + contents, err := io.ReadAll(limitedReader) if err != nil { return nil, err } diff --git a/pkg/credentialconfig/config_test.go b/pkg/credentialconfig/config_test.go index 8a5aec0a52..e7a8b0978e 100644 --- a/pkg/credentialconfig/config_test.go +++ b/pkg/credentialconfig/config_test.go @@ -19,7 +19,6 @@ package credentialconfig import ( "encoding/base64" "encoding/json" - "io/ioutil" "os" "path/filepath" "reflect" @@ -33,7 +32,7 @@ func TestReadDockerConfigFile(t *testing.T) { //test dockerconfig json inputDockerconfigJSONFile := "{ \"auths\": { \"http://foo.example.com\":{\"auth\":\"Zm9vOmJhcgo=\",\"email\":\"foo@example.com\"}}}" - preferredPath, err := ioutil.TempDir("", "test_foo_bar_dockerconfigjson_") + preferredPath, err := os.MkdirTemp(t.TempDir(), "test_foo_bar_dockerconfigjson_") if err != nil { t.Fatalf("Creating tmp dir fail: %v", err) return diff --git a/pkg/gcpcredential/gcpcredential.go b/pkg/gcpcredential/gcpcredential.go index a92c1aeb5d..c163182092 100644 --- a/pkg/gcpcredential/gcpcredential.go +++ b/pkg/gcpcredential/gcpcredential.go @@ -18,8 +18,8 @@ package gcpcredential import ( "encoding/json" - "io/ioutil" "net/http" + "os" "os/exec" "runtime" "strings" @@ -102,7 +102,7 @@ func onGCEVM() bool { } name = fields[1] } else { - data, err := ioutil.ReadFile(GCEProductNameFile) + data, err := os.ReadFile(GCEProductNameFile) if err != nil { klog.V(2).Infof("Error while reading product_name: %v", err) return false diff --git a/providers/gce/gcpcredential/credentialutil.go b/providers/gce/gcpcredential/credentialutil.go index 55a4988b86..4fd300cf26 100644 --- a/providers/gce/gcpcredential/credentialutil.go +++ b/providers/gce/gcpcredential/credentialutil.go @@ -21,7 +21,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net/http" "k8s.io/cloud-provider/credentialconfig" @@ -68,7 +67,7 @@ func ReadURL(url string, client *http.Client, header *http.Header) (body []byte, } limitedReader := &io.LimitedReader{R: resp.Body, N: maxReadLength} - contents, err := ioutil.ReadAll(limitedReader) + contents, err := io.ReadAll(limitedReader) if err != nil { return nil, err }