Merge pull request #193 from coveooss/feature/DT-5227-ioutil-deprecated

DT-5227 // remove ioutils
coveooss · Oct 24, 2022 · ebb17d4 · ebb17d4
2 parents 06b9c42 + d72f9b1
commit ebb17d4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 15 deletions.
diff --git a/cli/root.go b/cli/root.go
@@ -2,8 +2,9 @@ package cli
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/url"
+	"os"
 	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -76,11 +77,11 @@ var rootCmd = &cobra.Command{
 				return fmt.Errorf("Failed to download the config file from S3, %v", err)
 			}
 
-			if fileContent, err = ioutil.ReadAll(resp.Body); err != nil {
+			if fileContent, err = io.ReadAll(resp.Body); err != nil {
 				return fmt.Errorf("Failed to read the config file from S3, %v", err)
 			}
 		} else {
-			if fileContent, err = ioutil.ReadFile(configurationFile); err != nil {
+			if fileContent, err = os.ReadFile(configurationFile); err != nil {
 				return err
 			}
 		}

diff --git a/credentials/source_local.go b/credentials/source_local.go
@@ -2,7 +2,6 @@ package credentials
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 )
 
@@ -34,7 +33,7 @@ func getCredentialsFromFile(fileName string) ([]Credentials, error) {
 		err         error
 		fileContent []byte
 	)
-	if fileContent, err = ioutil.ReadFile(fileName); err != nil {
+	if fileContent, err = os.ReadFile(fileName); err != nil {
 		return nil, err
 	}
 	return getCredentialsFromBytes(fileContent)

diff --git a/credentials/source_local_test.go b/credentials/source_local_test.go
@@ -1,7 +1,6 @@
 package credentials
 
 import (
-	"io/ioutil"
 	"os"
 	"path"
 	"testing"
@@ -10,7 +9,7 @@ import (
 )
 
 func TestGetCredentialsFromLocalSource(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "")
+	tempDir, err := os.MkdirTemp("", "")
 	if err != nil {
 		panic(err)
 	}
@@ -23,7 +22,7 @@ func TestGetCredentialsFromLocalSource(t *testing.T) {
 	assert.Equal(t, "Local file", localSource.Type())
 	assert.Error(t, localSource.ValidateConfiguration())
 
-	ioutil.WriteFile(filePath, []byte(`test_cred:
+	os.WriteFile(filePath, []byte(`test_cred:
   type: usernamepassword
   description: a credential
   username: user

diff --git a/credentials/source_s3.go b/credentials/source_s3.go
@@ -2,7 +2,7 @@ package credentials
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
@@ -41,7 +41,7 @@ func (source *AWSS3Source) Credentials() ([]Credentials, error) {
 	if err != nil {
 		return nil, err
 	}
-	body, err := ioutil.ReadAll(response.Body)
+	body, err := io.ReadAll(response.Body)
 	if err != nil {
 		return nil, err
 	}

diff --git a/credentials/source_s3_test.go b/credentials/source_s3_test.go
@@ -2,7 +2,7 @@ package credentials
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"strings"
 	"testing"
 
@@ -66,7 +66,7 @@ func (m *mockS3Client) GetObject(input *s3.GetObjectInput) (*s3.GetObjectOutput,
 	assert.Equal(m.t, s3Bucket, *input.Bucket)
 	assert.Equal(m.t, s3Key, *input.Key)
 
-	return &s3.GetObjectOutput{Body: ioutil.NopCloser(strings.NewReader(`test_cred:
+	return &s3.GetObjectOutput{Body: io.NopCloser(strings.NewReader(`test_cred:
   type: usernamepassword
   description: a credential
   username: user

diff --git a/credentials/sources_test.go b/credentials/sources_test.go
@@ -1,7 +1,6 @@
 package credentials
 
 import (
-	"io/ioutil"
 	"os"
 	"path"
 	"sort"
@@ -13,13 +12,13 @@ import (
 )
 
 func TestSourcesConfigWithLocalSource(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "")
+	tempDir, err := os.MkdirTemp("", "")
 	if err != nil {
 		panic(err)
 	}
 	defer os.RemoveAll(tempDir)
 	filePath := path.Join(tempDir, "local_file.json")
-	ioutil.WriteFile(filePath, []byte(`[{"id": "test", "type": "secret", "description": "test-desc", "secret": "my secret"}]`), 0777)
+	os.WriteFile(filePath, []byte(`[{"id": "test", "type": "secret", "description": "test-desc", "secret": "my secret"}]`), 0777)
 	localSource := &LocalSource{
 		File: filePath,
 	}