chore: update deprecated use of io/ioutils

Martin Guibert · Martin Guibert · commit e067a6db12f3 · 2022-09-28T15:52:20.000+02:00
diff --git a/enumeration/terraform/provider_downloader.go b/enumeration/terraform/provider_downloader.go
@@ -2,7 +2,6 @@ package terraform
 
 import (
 	"context"
-	"io/ioutil"
 	"net/http"
 	"os"
 
@@ -53,7 +52,7 @@ func (p *ProviderDownloader) Download(url, path string) error {
 	if resp.StatusCode != http.StatusOK {
 		return errors.Errorf("unsuccessful request to %s: %s", url, resp.Status)
 	}
-	f, err := ioutil.TempFile("", "terraform-provider")
+	f, err := os.CreateTemp("", "terraform-provider")
 	if err != nil {
 		return errors.Errorf("failed to open temporary file to download from %s", url)
 	}
diff --git a/enumeration/terraform/provider_downloader_test.go b/enumeration/terraform/provider_downloader_test.go
@@ -2,12 +2,13 @@ package terraform
 
 import (
 	"fmt"
-	terraformError "github.com/snyk/driftctl/enumeration/terraform/error"
-	"io/ioutil"
 	"net/http"
+	"os"
 	"path"
 	"testing"
 
+	terraformError "github.com/snyk/driftctl/enumeration/terraform/error"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/stretchr/testify/assert"
 
@@ -59,7 +60,7 @@ func TestProviderDownloader_Download(t *testing.T) {
 			testFile: aws.String("invalid.zip"),
 			assert: func(assert *assert.Assertions, tmpDir string, err error) {
 				assert.NotNil(err)
-				infos, err := ioutil.ReadDir(tmpDir)
+				infos, err := os.ReadDir(tmpDir)
 				assert.Nil(err)
 				assert.Len(infos, 0)
 			},
@@ -69,7 +70,7 @@ func TestProviderDownloader_Download(t *testing.T) {
 			testFile: aws.String("terraform-provider-aws_3.5.0_linux_amd64.zip"),
 			assert: func(assert *assert.Assertions, tmpDir string, err error) {
 				assert.Nil(err)
-				file, err := ioutil.ReadFile(path.Join(tmpDir, "terraform-provider-aws_v3.5.0_x5"))
+				file, err := os.ReadFile(path.Join(tmpDir, "terraform-provider-aws_v3.5.0_x5"))
 				assert.Nil(err)
 				assert.Equal([]byte{0x74, 0x65, 0x73, 0x74, 0xa}, file)
 			},
@@ -92,7 +93,7 @@ func TestProviderDownloader_Download(t *testing.T) {
 				httpmock.RegisterResponder("GET", url, c.responder)
 			} else {
 				if c.testFile != nil {
-					body, err := ioutil.ReadFile("./testdata/" + *c.testFile)
+					body, err := os.ReadFile("./testdata/" + *c.testFile)
 					if err != nil {
 						tt.Error(err)
 					}
diff --git a/pkg/analyser/analyzer_test.go b/pkg/analyser/analyzer_test.go
@@ -2,7 +2,7 @@ package analyser
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
 	"testing"
 	"time"
 
@@ -1343,11 +1343,11 @@ func TestAnalysis_MarshalJSON(t *testing.T) {
 		t.Fatal(err)
 	}
 	if *goldenfile.Update == "TestAnalysis_MarshalJSON" {
-		if err := ioutil.WriteFile(goldenFile, got, 0600); err != nil {
+		if err := os.WriteFile(goldenFile, got, 0600); err != nil {
 			t.Fatal(err)
 		}
 	}
-	expected, err := ioutil.ReadFile(goldenFile)
+	expected, err := os.ReadFile(goldenFile)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1429,7 +1429,7 @@ func TestAnalysis_UnmarshalJSON(t *testing.T) {
 	}
 
 	got := Analysis{}
-	input, err := ioutil.ReadFile("./testdata/input.json")
+	input, err := os.ReadFile("./testdata/input.json")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/pkg/cmd/scan/output/console_test.go b/pkg/cmd/scan/output/console_test.go
@@ -3,7 +3,6 @@ package output
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"os"
 	"path"
 	"testing"
@@ -160,12 +159,12 @@ func TestConsole_Write(t *testing.T) {
 
 			expectedFilePath := path.Join("./testdata", tt.goldenfile)
 			if *goldenfile.Update == tt.goldenfile {
-				if err := ioutil.WriteFile(expectedFilePath, out, 0600); err != nil {
+				if err := os.WriteFile(expectedFilePath, out, 0600); err != nil {
 					t.Fatal(err)
 				}
 			}
 
-			expected, err := ioutil.ReadFile(expectedFilePath)
+			expected, err := os.ReadFile(expectedFilePath)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/pkg/cmd/scan/output/html_test.go b/pkg/cmd/scan/output/html_test.go
@@ -1,7 +1,7 @@
 package output
 
 import (
-	"io/ioutil"
+	"os"
 	"path"
 	"testing"
 	"time"
@@ -236,7 +236,7 @@ func TestHTML_Write(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			tempDir := t.TempDir()
-			tempFile, err := ioutil.TempFile(tempDir, "result")
+			tempFile, err := os.CreateTemp(tempDir, "result")
 
 			if err != nil {
 				t.Fatal(err)
@@ -250,19 +250,19 @@ func TestHTML_Write(t *testing.T) {
 				assert.NoError(t, err)
 			}
 
-			got, err := ioutil.ReadFile(tempFile.Name())
+			got, err := os.ReadFile(tempFile.Name())
 			if err != nil {
 				t.Fatal(err)
 			}
 
 			expectedFilePath := path.Join("./testdata/", tt.goldenfile)
 			if *goldenfile.Update == tt.goldenfile {
-				if err := ioutil.WriteFile(expectedFilePath, got, 0600); err != nil {
+				if err := os.WriteFile(expectedFilePath, got, 0600); err != nil {
 					t.Fatal(err)
 				}
 			}
 
-			expected, err := ioutil.ReadFile(expectedFilePath)
+			expected, err := os.ReadFile(expectedFilePath)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/pkg/cmd/scan/output/json_test.go b/pkg/cmd/scan/output/json_test.go
@@ -3,7 +3,6 @@ package output
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"os"
 	"path"
 	"testing"
@@ -60,25 +59,25 @@ func TestJSON_Write(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			tempDir := t.TempDir()
-			tempFile, err := ioutil.TempFile(tempDir, "result")
+			tempFile, err := os.CreateTemp(tempDir, "result")
 			if err != nil {
 				t.Fatal(err)
 			}
 			c := NewJSON(tempFile.Name())
 			if err := c.Write(tt.args.analysis); (err != nil) != tt.wantErr {
 				t.Errorf("Write() error = %v, wantErr %v", err, tt.wantErr)
 			}
-			result, err := ioutil.ReadFile(tempFile.Name())
+			result, err := os.ReadFile(tempFile.Name())
 			if err != nil {
 				t.Fatal(err)
 			}
 			expectedFilePath := path.Join("./testdata/", tt.goldenfile)
 			if *goldenfile.Update == tt.goldenfile {
-				if err := ioutil.WriteFile(expectedFilePath, result, 0600); err != nil {
+				if err := os.WriteFile(expectedFilePath, result, 0600); err != nil {
 					t.Fatal(err)
 				}
 			}
-			expected, err := ioutil.ReadFile(expectedFilePath)
+			expected, err := os.ReadFile(expectedFilePath)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -145,11 +144,11 @@ func TestJSON_Write_stdout(t *testing.T) {
 
 			expectedFilePath := path.Join("./testdata/", tt.goldenfile)
 			if *goldenfile.Update == tt.goldenfile {
-				if err := ioutil.WriteFile(expectedFilePath, result, 0600); err != nil {
+				if err := os.WriteFile(expectedFilePath, result, 0600); err != nil {
 					t.Fatal(err)
 				}
 			}
-			expected, err := ioutil.ReadFile(expectedFilePath)
+			expected, err := os.ReadFile(expectedFilePath)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -162,7 +161,7 @@ func TestJSON_WriteMultiplesTimesInSameFile(t *testing.T) {
 	emptyAnalysis := &analyser.Analysis{}
 	longerAnalysis := fakeAnalysis(analyser.AnalyzerOptions{})
 	tempDir := t.TempDir()
-	tempFile, err := ioutil.TempFile(tempDir, "result")
+	tempFile, err := os.CreateTemp(tempDir, "result")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -176,18 +175,18 @@ func TestJSON_WriteMultiplesTimesInSameFile(t *testing.T) {
 		t.Errorf("Second write error = %v", err)
 	}
 
-	result, err := ioutil.ReadFile(tempFile.Name())
+	result, err := os.ReadFile(tempFile.Name())
 	if err != nil {
 		t.Fatal(err)
 	}
 	goldenFileName := "output_multiples_times.json"
 	expectedFilePath := path.Join("./testdata/", goldenFileName)
 	if *goldenfile.Update == goldenFileName {
-		if err := ioutil.WriteFile(expectedFilePath, result, 0600); err != nil {
+		if err := os.WriteFile(expectedFilePath, result, 0600); err != nil {
 			t.Fatal(err)
 		}
 	}
-	expected, err := ioutil.ReadFile(expectedFilePath)
+	expected, err := os.ReadFile(expectedFilePath)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/pkg/cmd/scan/output/plan_test.go b/pkg/cmd/scan/output/plan_test.go
@@ -3,7 +3,6 @@ package output
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"os"
 	"path"
 	"testing"
@@ -36,25 +35,25 @@ func TestPlan_Write(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			tempDir := t.TempDir()
-			tempFile, err := ioutil.TempFile(tempDir, "result")
+			tempFile, err := os.CreateTemp(tempDir, "result")
 			if err != nil {
 				t.Fatal(err)
 			}
 			c := NewPlan(tempFile.Name())
 			if err := c.Write(tt.analysis); (err != nil) != tt.wantErr {
 				t.Errorf("Write() error = %v, wantErr %v", err, tt.wantErr)
 			}
-			result, err := ioutil.ReadFile(tempFile.Name())
+			result, err := os.ReadFile(tempFile.Name())
 			if err != nil {
 				t.Fatal(err)
 			}
 			expectedFilePath := path.Join("./testdata/", tt.goldenfile)
 			if *goldenfile.Update == tt.goldenfile {
-				if err := ioutil.WriteFile(expectedFilePath, result, 0600); err != nil {
+				if err := os.WriteFile(expectedFilePath, result, 0600); err != nil {
 					t.Fatal(err)
 				}
 			}
-			expected, err := ioutil.ReadFile(expectedFilePath)
+			expected, err := os.ReadFile(expectedFilePath)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -113,11 +112,11 @@ func TestPlan_Write_stdout(t *testing.T) {
 
 			expectedFilePath := path.Join("./testdata/", tt.goldenfile)
 			if *goldenfile.Update == tt.goldenfile {
-				if err := ioutil.WriteFile(expectedFilePath, result, 0600); err != nil {
+				if err := os.WriteFile(expectedFilePath, result, 0600); err != nil {
 					t.Fatal(err)
 				}
 			}
-			expected, err := ioutil.ReadFile(expectedFilePath)
+			expected, err := os.ReadFile(expectedFilePath)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/pkg/driftctl_test.go b/pkg/driftctl_test.go
@@ -2,7 +2,7 @@ package pkg_test
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
 	"path"
 	"strings"
 	"testing"
@@ -1417,7 +1417,7 @@ func TestDriftctlRun_TestResourcesNormalization(t *testing.T) {
 
 	readResourceFile := func(ty, path string) ([]*resource.Resource, error) {
 		results := []*resource.Resource{}
-		file, err := ioutil.ReadFile(path)
+		file, err := os.ReadFile(path)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/iac/terraform/state/backend/s3_reader_test.go b/pkg/iac/terraform/state/backend/s3_reader_test.go
@@ -2,7 +2,7 @@ package backend
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"reflect"
 	"testing"
@@ -125,6 +125,6 @@ func TestS3Backend_Read(t *testing.T) {
 		t.Error(err)
 	}
 	reader.S3Client = fakeS3
-	_, err = ioutil.ReadAll(reader)
+	_, err = io.ReadAll(reader)
 	assert.Nil(err)
 }
diff --git a/pkg/iac/terraform/state/backend/tfcloud_config_reader.go b/pkg/iac/terraform/state/backend/tfcloud_config_reader.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -29,7 +28,7 @@ func NewTFCloudConfigReader(reader io.ReadCloser) *tfCloudConfigReader {
 }
 
 func (r *tfCloudConfigReader) GetToken(host string) (string, error) {
-	b, err := ioutil.ReadAll(r.reader)
+	b, err := io.ReadAll(r.reader)
 	if err != nil {
 		return "", errors.New("unable to read file")
 	}
diff --git a/pkg/iac/terraform/state/backend/tfcloud_config_reader_test.go b/pkg/iac/terraform/state/backend/tfcloud_config_reader_test.go
@@ -2,7 +2,7 @@ package backend
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"strings"
 	"testing"
 )
@@ -41,7 +41,7 @@ func TestTFCloudConfigReader_GetToken(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			readerCloser := ioutil.NopCloser(strings.NewReader(tt.src))
+			readerCloser := io.NopCloser(strings.NewReader(tt.src))
 			defer readerCloser.Close()
 			r := NewTFCloudConfigReader(readerCloser)
 			got, err := r.GetToken("app.terraform.io")
diff --git a/pkg/telemetry/telemetry_test.go b/pkg/telemetry/telemetry_test.go
@@ -2,7 +2,7 @@ package telemetry
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"runtime"
 	"testing"
@@ -114,7 +114,7 @@ func TestSendTelemetry(t *testing.T) {
 					func(req *http.Request) (*http.Response, error) {
 
 						requestTelemetry := &telemetry{}
-						requestBody, err := ioutil.ReadAll(req.Body)
+						requestBody, err := io.ReadAll(req.Body)
 						if err != nil {
 							t.Fatal(err)
 						}
@@ -163,7 +163,7 @@ func TestTelemetrySetProperClient(t *testing.T) {
 		"https://telemetry.driftctl.com/telemetry",
 		func(req *http.Request) (*http.Response, error) {
 			requestTelemetry := &telemetry{}
-			requestBody, err := ioutil.ReadAll(req.Body)
+			requestBody, err := io.ReadAll(req.Body)
 			if err != nil {
 				t.Fatal(err)
 			}
diff --git a/pkg/terraform/hcl/hcl.go b/pkg/terraform/hcl/hcl.go
diff --git a/pkg/version/version.go b/pkg/version/version.go
diff --git a/test/acceptance/testing.go b/test/acceptance/testing.go
diff --git a/test/files.go b/test/files.go
diff --git a/test/goldenfile/goldenfile.go b/test/goldenfile/goldenfile.go
diff --git a/test/schemas/shemas.go b/test/schemas/shemas.go

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package terraform`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`		`- "io/ioutil"`
`6`	`5`	`"net/http"`
`7`	`6`	`"os"`
`8`	`7`
`@@ -53,7 +52,7 @@ func (p *ProviderDownloader) Download(url, path string) error {`
`53`	`52`	`if resp.StatusCode != http.StatusOK {`
`54`	`53`	`return errors.Errorf("unsuccessful request to %s: %s", url, resp.Status)`
`55`	`54`	`}`
`56`		`- f, err := ioutil.TempFile("", "terraform-provider")`
	`55`	`+ f, err := os.CreateTemp("", "terraform-provider")`
`57`	`56`	`if err != nil {`
`58`	`57`	`return errors.Errorf("failed to open temporary file to download from %s", url)`
`59`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package analyser`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"encoding/json"`
`5`		`- "io/ioutil"`
	`5`	`+ "os"`
`6`	`6`	`"testing"`
`7`	`7`	`"time"`
`8`	`8`
`@@ -1343,11 +1343,11 @@ func TestAnalysis_MarshalJSON(t *testing.T) {`
`1343`	`1343`	`t.Fatal(err)`
`1344`	`1344`	`}`
`1345`	`1345`	`if *goldenfile.Update == "TestAnalysis_MarshalJSON" {`
`1346`		`- if err := ioutil.WriteFile(goldenFile, got, 0600); err != nil {`
	`1346`	`+ if err := os.WriteFile(goldenFile, got, 0600); err != nil {`
`1347`	`1347`	`t.Fatal(err)`
`1348`	`1348`	`}`
`1349`	`1349`	`}`
`1350`		`- expected, err := ioutil.ReadFile(goldenFile)`
	`1350`	`+ expected, err := os.ReadFile(goldenFile)`
`1351`	`1351`	`if err != nil {`
`1352`	`1352`	`t.Fatal(err)`
`1353`	`1353`	`}`
`@@ -1429,7 +1429,7 @@ func TestAnalysis_UnmarshalJSON(t *testing.T) {`
`1429`	`1429`	`}`
`1430`	`1430`
`1431`	`1431`	`got := Analysis{}`
`1432`		`- input, err := ioutil.ReadFile("./testdata/input.json")`
	`1432`	`+ input, err := os.ReadFile("./testdata/input.json")`
`1433`	`1433`	`if err != nil {`
`1434`	`1434`	`t.Fatal(err)`
`1435`	`1435`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ package output`
`3`	`3`	`import (`
`4`	`4`	`"bytes"`
`5`	`5`	`"io"`
`6`		`- "io/ioutil"`
`7`	`6`	`"os"`
`8`	`7`	`"path"`
`9`	`8`	`"testing"`
`@@ -60,25 +59,25 @@ func TestJSON_Write(t *testing.T) {`
`60`	`59`	`for _, tt := range tests {`
`61`	`60`	`t.Run(tt.name, func(t *testing.T) {`
`62`	`61`	`tempDir := t.TempDir()`
`63`		`- tempFile, err := ioutil.TempFile(tempDir, "result")`
	`62`	`+ tempFile, err := os.CreateTemp(tempDir, "result")`
`64`	`63`	`if err != nil {`
`65`	`64`	`t.Fatal(err)`
`66`	`65`	`}`
`67`	`66`	`c := NewJSON(tempFile.Name())`
`68`	`67`	`if err := c.Write(tt.args.analysis); (err != nil) != tt.wantErr {`
`69`	`68`	`t.Errorf("Write() error = %v, wantErr %v", err, tt.wantErr)`
`70`	`69`	`}`
`71`		`- result, err := ioutil.ReadFile(tempFile.Name())`
	`70`	`+ result, err := os.ReadFile(tempFile.Name())`
`72`	`71`	`if err != nil {`
`73`	`72`	`t.Fatal(err)`
`74`	`73`	`}`
`75`	`74`	`expectedFilePath := path.Join("./testdata/", tt.goldenfile)`
`76`	`75`	`if *goldenfile.Update == tt.goldenfile {`
`77`		`- if err := ioutil.WriteFile(expectedFilePath, result, 0600); err != nil {`
	`76`	`+ if err := os.WriteFile(expectedFilePath, result, 0600); err != nil {`
`78`	`77`	`t.Fatal(err)`
`79`	`78`	`}`
`80`	`79`	`}`
`81`		`- expected, err := ioutil.ReadFile(expectedFilePath)`
	`80`	`+ expected, err := os.ReadFile(expectedFilePath)`
`82`	`81`	`if err != nil {`
`83`	`82`	`t.Fatal(err)`
`84`	`83`	`}`
`@@ -145,11 +144,11 @@ func TestJSON_Write_stdout(t *testing.T) {`
`145`	`144`
`146`	`145`	`expectedFilePath := path.Join("./testdata/", tt.goldenfile)`
`147`	`146`	`if *goldenfile.Update == tt.goldenfile {`
`148`		`- if err := ioutil.WriteFile(expectedFilePath, result, 0600); err != nil {`
	`147`	`+ if err := os.WriteFile(expectedFilePath, result, 0600); err != nil {`
`149`	`148`	`t.Fatal(err)`
`150`	`149`	`}`
`151`	`150`	`}`
`152`		`- expected, err := ioutil.ReadFile(expectedFilePath)`
	`151`	`+ expected, err := os.ReadFile(expectedFilePath)`
`153`	`152`	`if err != nil {`
`154`	`153`	`t.Fatal(err)`
`155`	`154`	`}`
`@@ -162,7 +161,7 @@ func TestJSON_WriteMultiplesTimesInSameFile(t *testing.T) {`
`162`	`161`	`emptyAnalysis := &analyser.Analysis{}`
`163`	`162`	`longerAnalysis := fakeAnalysis(analyser.AnalyzerOptions{})`
`164`	`163`	`tempDir := t.TempDir()`
`165`		`- tempFile, err := ioutil.TempFile(tempDir, "result")`
	`164`	`+ tempFile, err := os.CreateTemp(tempDir, "result")`
`166`	`165`	`if err != nil {`
`167`	`166`	`t.Fatal(err)`
`168`	`167`	`}`
`@@ -176,18 +175,18 @@ func TestJSON_WriteMultiplesTimesInSameFile(t *testing.T) {`
`176`	`175`	`t.Errorf("Second write error = %v", err)`
`177`	`176`	`}`
`178`	`177`
`179`		`- result, err := ioutil.ReadFile(tempFile.Name())`
	`178`	`+ result, err := os.ReadFile(tempFile.Name())`
`180`	`179`	`if err != nil {`
`181`	`180`	`t.Fatal(err)`
`182`	`181`	`}`
`183`	`182`	`goldenFileName := "output_multiples_times.json"`
`184`	`183`	`expectedFilePath := path.Join("./testdata/", goldenFileName)`
`185`	`184`	`if *goldenfile.Update == goldenFileName {`
`186`		`- if err := ioutil.WriteFile(expectedFilePath, result, 0600); err != nil {`
	`185`	`+ if err := os.WriteFile(expectedFilePath, result, 0600); err != nil {`
`187`	`186`	`t.Fatal(err)`
`188`	`187`	`}`
`189`	`188`	`}`
`190`		`- expected, err := ioutil.ReadFile(expectedFilePath)`
	`189`	`+ expected, err := os.ReadFile(expectedFilePath)`
`191`	`190`	`if err != nil {`
`192`	`191`	`t.Fatal(err)`
`193`	`192`	`}`