replace deprecated io/ioutil calls

TykTechnologies · Apr 17, 2023 · 824136c · 824136c
1 parent 7f974c9
commit 824136c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/internal/pkg/unsafeparser/unsafeparser.go b/internal/pkg/unsafeparser/unsafeparser.go
@@ -2,7 +2,7 @@
 package unsafeparser
 
 import (
-	"io/ioutil"
+	"os"
 
 	"github.com/TykTechnologies/graphql-go-tools/pkg/ast"
 	"github.com/TykTechnologies/graphql-go-tools/pkg/astparser"
@@ -25,7 +25,7 @@ func ParseGraphqlDocumentBytes(input []byte) ast.Document {
 }
 
 func ParseGraphqlDocumentFile(filePath string) ast.Document {
-	fileBytes, err := ioutil.ReadFile(filePath)
+	fileBytes, err := os.ReadFile(filePath)
 	if err != nil {
 		panic(err)
 	}

diff --git a/pkg/astvalidation/reference/main.go b/pkg/astvalidation/reference/main.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -23,13 +22,13 @@ func main() {
 		workingDir = filepath.Join(currDir, "pkg/astvalidation/reference/__tests__")
 	}
 
-	dir, err := ioutil.ReadDir(workingDir)
+	dir, err := os.ReadDir(workingDir)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	replacementsPath := workingDir + "/../replacements.yml"
-	replacementContent, _ := ioutil.ReadFile(replacementsPath)
+	replacementContent, _ := os.ReadFile(replacementsPath)
 
 	var replacements []Replacement
 	if err := yaml.Unmarshal(replacementContent, &replacements); err != nil {
@@ -112,7 +111,7 @@ func skipRule(name string) bool {
 // processFile - convert and save reference test file
 func processFile(workingDir string, filename string, replacements Replacements) {
 	fPath := filepath.Join(workingDir, filename)
-	fileContent, _ := ioutil.ReadFile(fPath)
+	fileContent, _ := os.ReadFile(fPath)
 
 	testName := strings.TrimSuffix(strings.Split(filepath.Base(filename), ".")[0], "-test")
 
@@ -129,7 +128,7 @@ func processFile(workingDir string, filename string, replacements Replacements)
 	result := converter.iterateLines(testName, content)
 
 	outFileName := testName + "_test.go"
-	err := ioutil.WriteFile(filepath.Join(outDir, outFileName), []byte(result), os.ModePerm)
+	err := os.WriteFile(filepath.Join(outDir, outFileName), []byte(result), os.ModePerm)
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/pkg/execution/datasource/datasource_graphql.go b/pkg/execution/datasource/datasource_graphql.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"io"
-	"io/ioutil"
 	"net/http"
 
 	"github.com/buger/jsonparser"
@@ -440,9 +439,9 @@ func (g *GraphQLDataSource) Resolve(ctx context.Context, args ResolverArgs, out
 		)
 		return n, err
 	}
-	data, err := ioutil.ReadAll(res.Body)
+	data, err := io.ReadAll(res.Body)
 	if err != nil {
-		g.Log.Error("GraphQLDataSource.ioutil.ReadAll",
+		g.Log.Error("GraphQLDataSource.io.ReadAll",
 			log.Error(err),
 		)
 		return n, err