Merge pull request #133 from fluxcd/remove-ioutil

Remove deprecated `io/ioutil`
fluxcd · Nov 22, 2021 · 91f89c4 · 91f89c4
2 parents eb55926 + e73e690
commit 91f89c4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/github/integration_test.go b/github/integration_test.go
@@ -20,7 +20,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"math/rand"
 	"net/http"
 	"os"
@@ -140,7 +139,7 @@ var _ = Describe("GitHub Provider", func() {
 	BeforeSuite(func() {
 		githubToken := os.Getenv("GITHUB_TOKEN")
 		if len(githubToken) == 0 {
-			b, err := ioutil.ReadFile(ghTokenFile)
+			b, err := os.ReadFile(ghTokenFile)
 			if token := string(b); err == nil && len(token) != 0 {
 				githubToken = token
 			} else {

diff --git a/gitlab/integration_test.go b/gitlab/integration_test.go
@@ -23,7 +23,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"net/http"
 	"os"
@@ -90,9 +89,9 @@ type customTransport struct {
 }
 
 func getBodyFromReaderWithoutConsuming(r *io.ReadCloser) string {
-	body, _ := ioutil.ReadAll(*r)
+	body, _ := io.ReadAll(*r)
 	(*r).Close()
-	*r = ioutil.NopCloser(bytes.NewBuffer(body))
+	*r = io.NopCloser(bytes.NewBuffer(body))
 	return string(body)
 }
 
@@ -124,7 +123,7 @@ func (t *customTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 			strings.Contains(string(responseBody), ProjectStillBeingDeleted) {
 			time.Sleep(2 * time.Second)
 			if req != nil && req.Body != nil {
-				req.Body = ioutil.NopCloser(strings.NewReader(requestBody))
+				req.Body = io.NopCloser(strings.NewReader(requestBody))
 			}
 			retryCount--
 			continue
@@ -189,7 +188,7 @@ var _ = Describe("GitLab Provider", func() {
 	BeforeSuite(func() {
 		gitlabToken := os.Getenv("GITLAB_TOKEN")
 		if len(gitlabToken) == 0 {
-			b, err := ioutil.ReadFile(ghTokenFile)
+			b, err := os.ReadFile(ghTokenFile)
 			if token := string(b); err == nil && len(token) != 0 {
 				gitlabToken = token
 			} else {

diff --git a/stash/integration_suite_test.go b/stash/integration_suite_test.go
@@ -19,7 +19,6 @@ package stash
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"math/rand"
 	"net/http"
 	"os"
@@ -186,7 +185,7 @@ var _ = Describe("Stash Provider", func() {
 
 		stashToken := os.Getenv("STASH_TOKEN")
 		if stashToken == "" {
-			b, err := ioutil.ReadFile(stashTokenFile)
+			b, err := os.ReadFile(stashTokenFile)
 			if token := string(b); err == nil && token != "" {
 				stashToken = token
 			} else {