diff --git a/pkg/cmd/oauth-apiserver/testing/integration.go b/pkg/cmd/oauth-apiserver/testing/integration.go index c530e1de6..db3cc05cf 100644 --- a/pkg/cmd/oauth-apiserver/testing/integration.go +++ b/pkg/cmd/oauth-apiserver/testing/integration.go @@ -1,7 +1,6 @@ package testing import ( - "io/ioutil" "os" "strings" @@ -14,7 +13,7 @@ import ( // StartDefaultTestServer starts a test server with default test flags. func StartDefaultTestServer(t Logger, storageConfig *storagebackend.Config, flags ...string) (func(), *rest.Config, error) { // create kubeconfig which will not actually be used. But authz/authn needs it to startup. - fakeKubeConfig, err := ioutil.TempFile("", "kubeconfig") + fakeKubeConfig, err := os.CreateTemp("", "kubeconfig") if err != nil { return nil, nil, err } diff --git a/pkg/cmd/oauth-apiserver/testing/testserver.go b/pkg/cmd/oauth-apiserver/testing/testserver.go index 3800569fb..05ffc9bd3 100644 --- a/pkg/cmd/oauth-apiserver/testing/testserver.go +++ b/pkg/cmd/oauth-apiserver/testing/testserver.go @@ -3,7 +3,6 @@ package testing import ( "context" "fmt" - "io/ioutil" "net" "os" "path" @@ -60,7 +59,7 @@ func StartTestServer(t Logger, customFlags []string, storageConfig *storagebacke } }() - result.TmpDir, err = ioutil.TempDir("", "openshift-apiserver") + result.TmpDir, err = os.MkdirTemp("", "openshift-apiserver") if err != nil { return result, fmt.Errorf("failed to create temp dir: %v", err) } diff --git a/test/e2e/tokenreviews.go b/test/e2e/tokenreviews.go index 18dfa3540..92baa3485 100644 --- a/test/e2e/tokenreviews.go +++ b/test/e2e/tokenreviews.go @@ -5,7 +5,7 @@ import ( "context" "crypto/tls" "encoding/json" - "io/ioutil" + "io" "net/http" "testing" @@ -54,7 +54,7 @@ func TestTokenReviews(t *testing.T) { require.NoError(t, err) defer resp.Body.Close() - respBodyBytes, err := ioutil.ReadAll(resp.Body) + respBodyBytes, err := io.ReadAll(resp.Body) require.NoError(t, err) tokenReviewResp := &kauthenticationv1.TokenReview{} @@ -69,7 +69,7 @@ func TestTokenReviews(t *testing.T) { require.NoError(t, err) defer resp.Body.Close() - respBodyBytes, err = ioutil.ReadAll(resp.Body) + respBodyBytes, err = io.ReadAll(resp.Body) require.NoError(t, err) tokenReviewResp = &kauthenticationv1.TokenReview{}