fix linter warnings (#620)

wundergraph · Sep 26, 2023 · aa898c4 · aa898c4
1 parent bfb2eaa
commit aa898c4
Show file tree

Hide file tree

Showing 30 changed files with 77 additions and 84 deletions.
diff --git a/v2/examples/chat/util.go b/v2/examples/chat/util.go
@@ -2,7 +2,6 @@ package chat
 
 import (
 	"encoding/json"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -63,7 +62,7 @@ func LoadSchemaFromExamplesDirectoryWithinPkg() ([]byte, error) {
 	}
 
 	absolutePath := filepath.Join(strings.Split(wd, "pkg")[0], chatExampleDirectoryRelativePath, "schema.graphql")
-	return ioutil.ReadFile(absolutePath)
+	return os.ReadFile(absolutePath)
 }
 
 func GraphQLRequestForOperation(operation string) ([]byte, error) {

diff --git a/v2/examples/federation/gateway/datasource_poller.go b/v2/examples/federation/gateway/datasource_poller.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"strings"
@@ -206,7 +206,7 @@ func (d *DatasourcePollerPoller) fetchServiceSDL(ctx context.Context, serviceURL
 		Errors GQLErr `json:"errors,omitempty"`
 	}
 
-	bs, err := ioutil.ReadAll(resp.Body)
+	bs, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return "", fmt.Errorf("read bytes: %v", err)
 	}

diff --git a/v2/examples/kafka_pubsub/main.go b/v2/examples/kafka_pubsub/main.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"math/rand"
 	"os"
@@ -102,7 +102,7 @@ func main() {
 
 	// Parse command line parameters
 	f := flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
-	f.SetOutput(ioutil.Discard)
+	f.SetOutput(io.Discard)
 	f.BoolVar(&args.help, "h", false, "")
 	f.BoolVar(&args.help, "help", false, "")
 	f.StringVar(&args.products, "p", "", "")

diff --git a/v2/examples/kafka_pubsub/transactional_producer/main.go b/v2/examples/kafka_pubsub/transactional_producer/main.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"math/rand"
 	"os"
@@ -57,7 +57,7 @@ func main() {
 
 	// Parse command line parameters
 	f := flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
-	f.SetOutput(ioutil.Discard)
+	f.SetOutput(io.Discard)
 	f.BoolVar(&args.help, "h", false, "")
 	f.BoolVar(&args.help, "help", false, "")
 	f.BoolVar(&args.enableTransaction, "enable-transaction", false, "")

diff --git a/v2/internal/pkg/unsafeparser/unsafeparser.go b/v2/internal/pkg/unsafeparser/unsafeparser.go
@@ -2,7 +2,7 @@
 package unsafeparser
 
 import (
-	"io/ioutil"
+	"os"
 
 	"github.com/wundergraph/graphql-go-tools/v2/pkg/ast"
 	"github.com/wundergraph/graphql-go-tools/v2/pkg/astparser"
@@ -26,7 +26,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/v2/pkg/astparser/parser_test.go b/v2/pkg/astparser/parser_test.go
@@ -2,7 +2,7 @@ package astparser
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -2322,7 +2322,7 @@ func TestErrorReport(t *testing.T) {
 
 func TestParseStarwars(t *testing.T) {
 
-	starWarsSchema, err := ioutil.ReadFile("./testdata/starwars.schema.graphql")
+	starWarsSchema, err := os.ReadFile("./testdata/starwars.schema.graphql")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -2336,7 +2336,7 @@ func TestParseStarwars(t *testing.T) {
 func TestParseTodo(t *testing.T) {
 
 	inputFileName := "./testdata/todo.graphql"
-	schema, err := ioutil.ReadFile(inputFileName)
+	schema, err := os.ReadFile(inputFileName)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -2352,7 +2352,7 @@ func TestParseTodo(t *testing.T) {
 func BenchmarkParseStarwars(b *testing.B) {
 
 	inputFileName := "./testdata/starwars.schema.graphql"
-	starwarsSchema, err := ioutil.ReadFile(inputFileName)
+	starwarsSchema, err := os.ReadFile(inputFileName)
 	if err != nil {
 		b.Fatal(err)
 	}
@@ -2379,7 +2379,7 @@ func BenchmarkParseStarwars(b *testing.B) {
 func BenchmarkParseGithub(b *testing.B) {
 
 	inputFileName := "./testdata/github.schema.graphql"
-	schemaFile, err := ioutil.ReadFile(inputFileName)
+	schemaFile, err := os.ReadFile(inputFileName)
 	if err != nil {
 		b.Fatal(err)
 	}

diff --git a/v2/pkg/astprinter/astprinter_test.go b/v2/pkg/astprinter/astprinter_test.go
@@ -2,7 +2,7 @@ package astprinter
 
 import (
 	"bytes"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/jensneuse/diffview"
@@ -533,7 +533,7 @@ func TestPrintSchemaDefinition(t *testing.T) {
 
 	goldie.Assert(t, "starwars_schema_definition", out)
 	if t.Failed() {
-		fixture, err := ioutil.ReadFile("./fixtures/starwars_schema_definition.golden")
+		fixture, err := os.ReadFile("./fixtures/starwars_schema_definition.golden")
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -557,7 +557,7 @@ func TestPrintOperationDefinition(t *testing.T) {
 
 	goldie.Assert(t, "introspectionquery", out)
 	if t.Failed() {
-		fixture, err := ioutil.ReadFile("./fixtures/introspectionquery.golden")
+		fixture, err := os.ReadFile("./fixtures/introspectionquery.golden")
 		if err != nil {
 			t.Fatal(err)
 		}

diff --git a/v2/pkg/asttransform/baseschema_test.go b/v2/pkg/asttransform/baseschema_test.go
@@ -2,7 +2,7 @@ package asttransform_test
 
 import (
 	"bytes"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/jensneuse/diffview"
@@ -28,7 +28,7 @@ func runTestMerge(definition, fixtureName string) func(t *testing.T) {
 		got := buf.Bytes()
 		goldie.Assert(t, fixtureName, got)
 		if t.Failed() {
-			want, err := ioutil.ReadFile("./fixtures/" + fixtureName + ".golden")
+			want, err := os.ReadFile("./fixtures/" + fixtureName + ".golden")
 			if err != nil {
 				panic(err)
 			}

diff --git a/v2/pkg/astvalidation/reference/main.go b/v2/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/v2/pkg/astvalidation/reference/testsgo/harness_test.go b/v2/pkg/astvalidation/reference/testsgo/harness_test.go
@@ -1,7 +1,7 @@
 package testsgo
 
 import (
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -314,7 +314,7 @@ func hasReportError(t *testing.T, report operationreport.Report) MessageCompare
 var testSchema string
 
 func init() {
-	content, err := ioutil.ReadFile("test_schema.graphql")
+	content, err := os.ReadFile("test_schema.graphql")
 	if err != nil {
 		panic(err)
 	}

diff --git a/v2/pkg/astvisitor/visitor_test.go b/v2/pkg/astvisitor/visitor_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/jensneuse/diffview"
@@ -46,7 +46,7 @@ func TestVisitOperation(t *testing.T) {
 
 	if t.Failed() {
 
-		fixture, err := ioutil.ReadFile("./fixtures/visitor.golden")
+		fixture, err := os.ReadFile("./fixtures/visitor.golden")
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -125,7 +125,7 @@ func TestVisitSchemaDefinition(t *testing.T) {
 
 	if t.Failed() {
 
-		fixture, err := ioutil.ReadFile("./fixtures/schema_visitor.golden")
+		fixture, err := os.ReadFile("./fixtures/schema_visitor.golden")
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -185,7 +185,7 @@ func TestWalker_Path(t *testing.T) {
 
 	if t.Failed() {
 
-		fixture, err := ioutil.ReadFile("./fixtures/path.golden")
+		fixture, err := os.ReadFile("./fixtures/path.golden")
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -248,7 +248,7 @@ func TestVisitWithSkip(t *testing.T) {
 
 	if t.Failed() {
 
-		fixture, err := ioutil.ReadFile("./fixtures/visitor_skip.golden")
+		fixture, err := os.ReadFile("./fixtures/visitor_skip.golden")
 		if err != nil {
 			t.Fatal(err)
 		}

diff --git a/v2/pkg/codegen/codegen_test.go b/v2/pkg/codegen/codegen_test.go
@@ -2,7 +2,7 @@ package codegen
 
 import (
 	"bytes"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -94,7 +94,7 @@ func TestCodeGen_GenerateDirectiveDefinitionStruct(t *testing.T) {
 	goldie.Assert(t, "DataSource", data)
 	if t.Failed() {
 
-		fixture, err := ioutil.ReadFile("./fixtures/DataSource.golden")
+		fixture, err := os.ReadFile("./fixtures/DataSource.golden")
 		if err != nil {
 			t.Fatal(err)
 		}

diff --git a/v2/pkg/graphql/execution_engine_v2.go b/v2/pkg/graphql/execution_engine_v2.go
@@ -6,7 +6,7 @@ import (
 	"compress/gzip"
 	"context"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strconv"
 	"sync"
@@ -96,7 +96,7 @@ func (e *EngineResultWriter) AsHTTPResponse(status int, headers http.Header) *ht
 	}
 
 	res := &http.Response{}
-	res.Body = ioutil.NopCloser(b)
+	res.Body = io.NopCloser(b)
 	res.Header = headers
 	res.StatusCode = status
 	res.ContentLength = int64(b.Len())

diff --git a/v2/pkg/graphql/execution_engine_v2_helpers_test.go b/v2/pkg/graphql/execution_engine_v2_helpers_test.go
@@ -3,7 +3,7 @@ package graphql
 import (
 	"bytes"
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 
@@ -34,14 +34,14 @@ func createTestRoundTripper(t *testing.T, testCase roundTripperTestCase) testRou
 			var receivedBodyBytes []byte
 			if req.Body != nil {
 				var err error
-				receivedBodyBytes, err = ioutil.ReadAll(req.Body)
+				receivedBodyBytes, err = io.ReadAll(req.Body)
 				require.NoError(t, err)
 			}
 			require.Equal(t, testCase.expectedBody, string(receivedBodyBytes), "roundTripperTestCase body do not match")
 		}
 
 		body := bytes.NewBuffer([]byte(testCase.sendResponseBody))
-		return &http.Response{StatusCode: testCase.sendStatusCode, Body: ioutil.NopCloser(body)}
+		return &http.Response{StatusCode: testCase.sendStatusCode, Body: io.NopCloser(body)}
 	}
 }
 

diff --git a/v2/pkg/graphql/execution_engine_v2_test.go b/v2/pkg/graphql/execution_engine_v2_test.go
@@ -6,7 +6,7 @@ import (
 	"compress/gzip"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"sync"
@@ -44,7 +44,7 @@ func TestEngineResponseWriter_AsHTTPResponse(t *testing.T) {
 		headers := make(http.Header)
 		headers.Set("Content-Type", "application/json")
 		response := rw.AsHTTPResponse(http.StatusOK, headers)
-		body, err := ioutil.ReadAll(response.Body)
+		body, err := io.ReadAll(response.Body)
 		require.NoError(t, err)
 
 		assert.Equal(t, http.StatusOK, response.StatusCode)
@@ -71,7 +71,7 @@ func TestEngineResponseWriter_AsHTTPResponse(t *testing.T) {
 			reader, err := gzip.NewReader(response.Body)
 			require.NoError(t, err)
 
-			body, err := ioutil.ReadAll(reader)
+			body, err := io.ReadAll(reader)
 			require.NoError(t, err)
 
 			assert.Equal(t, `{"key": "value"}`, string(body))
@@ -86,7 +86,7 @@ func TestEngineResponseWriter_AsHTTPResponse(t *testing.T) {
 			assert.Equal(t, "deflate", response.Header.Get(httpclient.ContentEncodingHeader))
 
 			reader := flate.NewReader(response.Body)
-			body, err := ioutil.ReadAll(reader)
+			body, err := io.ReadAll(reader)
 			require.NoError(t, err)
 
 			assert.Equal(t, `{"key": "value"}`, string(body))

diff --git a/v2/pkg/graphql/request.go b/v2/pkg/graphql/request.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"io"
-	"io/ioutil"
 	"net/http"
 
 	"github.com/wundergraph/graphql-go-tools/v2/pkg/ast"
@@ -47,7 +46,7 @@ type Request struct {
 }
 
 func UnmarshalRequest(reader io.Reader, request *Request) error {
-	requestBytes, err := ioutil.ReadAll(reader)
+	requestBytes, err := io.ReadAll(reader)
 	if err != nil {
 		return err
 	}