Skip to content

Migrate away from deprecated ioutil #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sebrandon1 wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −7
Open

Migrate away from deprecated ioutil #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions pkg/cmd/oauth-apiserver/testing/integration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package testing

import (
"io/ioutil"
"os"
"strings"

Expand All @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/cmd/oauth-apiserver/testing/testserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package testing
import (
"context"
"fmt"
"io/ioutil"
"net"
"os"
"path"
Expand Down Expand Up @@ -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)
}
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/tokenreviews.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"context"
"crypto/tls"
"encoding/json"
"io/ioutil"
"io"
"net/http"
"testing"

Expand Down Expand Up @@ -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{}
Expand All @@ -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{}
Expand Down