diff --git a/deploy/install_test.go b/deploy/install_test.go index e851da57..3cfef85c 100644 --- a/deploy/install_test.go +++ b/deploy/install_test.go @@ -21,7 +21,6 @@ import ( "fmt" "io" "io/fs" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -806,7 +805,7 @@ func TestDeployProcess_InstallK3s(t *testing.T) { osOpenFile = func(name string, _ int, _ os.FileMode) (*os.File, error) { var err error // openedFile, err = os.Create(filepath.Join(os.TempDir(), filepath.Base(name))) - openedFile, err = ioutil.TempFile(os.TempDir(), "") + openedFile, err = os.CreateTemp(os.TempDir(), "") if err != nil { t.Fatal(err) } @@ -873,7 +872,7 @@ func TestDeployProcess_InstallK3s(t *testing.T) { osOpenFile = func(_ string, _ int, _ os.FileMode) (*os.File, error) { var err error // openedFile, err = os.Create(filepath.Join(os.TempDir(), filepath.Base(name))) - openedFile, err = ioutil.TempFile(os.TempDir(), "") + openedFile, err = os.CreateTemp(os.TempDir(), "") if err != nil { t.Fatal(err) } diff --git a/internal/powerflex/token_getter_test.go b/internal/powerflex/token_getter_test.go index d31fad67..e7145f25 100644 --- a/internal/powerflex/token_getter_test.go +++ b/internal/powerflex/token_getter_test.go @@ -17,10 +17,10 @@ package powerflex_test import ( "context" "fmt" - "io/ioutil" "karavi-authorization/internal/powerflex" "net/http" "net/http/httptest" + "os" "testing" "time" @@ -32,7 +32,7 @@ import ( func TestLogin_GetToken(t *testing.T) { t.Run("success getting a token", func(t *testing.T) { tokens := make(map[string]interface{}) - credFile, err := ioutil.ReadFile("../../tokens.yaml") + credFile, err := os.ReadFile("../../tokens.yaml") if err != nil { t.Errorf("unable to read token: %v", err) } @@ -99,7 +99,7 @@ func TestLogin_GetToken(t *testing.T) { t.Run("success getting a token during refresh", func(t *testing.T) { tokens := make(map[string]interface{}) - credFile, err := ioutil.ReadFile("../../tokens.yaml") + credFile, err := os.ReadFile("../../tokens.yaml") if err != nil { t.Errorf("unable to read token: %v", err) } @@ -182,7 +182,7 @@ func TestLogin_GetToken(t *testing.T) { t.Run("timeout getting a token during refresh", func(t *testing.T) { tokens := make(map[string]interface{}) - credFile, err := ioutil.ReadFile("../../tokens.yaml") + credFile, err := os.ReadFile("../../tokens.yaml") if err != nil { t.Errorf("unable to read token: %v", err) } diff --git a/internal/tenantsvc/service_test.go b/internal/tenantsvc/service_test.go index eb7ff49b..76d5ff5c 100644 --- a/internal/tenantsvc/service_test.go +++ b/internal/tenantsvc/service_test.go @@ -18,7 +18,6 @@ import ( "context" "encoding/base64" "fmt" - "io/ioutil" "karavi-authorization/internal/tenantsvc" "karavi-authorization/internal/token/jwx" "karavi-authorization/pb" @@ -394,7 +393,7 @@ func testGenerateToken(sut *tenantsvc.TenantService, _ *redis.Client, afterFn Af func testRefreshToken(sut *tenantsvc.TenantService, _ *redis.Client, afterFn AfterFunc) func(*testing.T) { return func(t *testing.T) { tokens := make(map[string]interface{}) - credFile, err := ioutil.ReadFile("../../tokens.yaml") + credFile, err := os.ReadFile("../../tokens.yaml") if err != nil { t.Errorf("unable to read token: %v", err) } diff --git a/internal/web/middleware_test.go b/internal/web/middleware_test.go index 31557258..32cbec0b 100644 --- a/internal/web/middleware_test.go +++ b/internal/web/middleware_test.go @@ -17,12 +17,12 @@ package web_test import ( "context" "errors" - "io/ioutil" "karavi-authorization/internal/token/jwx" "karavi-authorization/internal/web" "karavi-authorization/pb" "net/http" "net/http/httptest" + "os" "testing" "github.com/sirupsen/logrus" @@ -122,7 +122,7 @@ func TestAuthMW(t *testing.T) { // test token tokens := make(map[string]interface{}) - credFile, err := ioutil.ReadFile("../../tokens.yaml") + credFile, err := os.ReadFile("../../tokens.yaml") if err != nil { t.Errorf("unable to read token: %v", err) } @@ -149,7 +149,7 @@ func TestAuthMW(t *testing.T) { // test token tokens := make(map[string]interface{}) - credFile, err := ioutil.ReadFile("../../tokens.yaml") + credFile, err := os.ReadFile("../../tokens.yaml") if err != nil { t.Errorf("unable to read token: %v", err) }