Skip to content

Commit d6e63cd

Browse files
committed
Replace ioutil.ReadFile w/ os.ReadFile
As of Go 1.16, this function simply calls os.ReadFile
1 parent c629393 commit d6e63cd

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

internal/command/init_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"context"
66
"encoding/json"
77
"fmt"
8-
"io/ioutil"
98
"log"
109
"os"
1110
"path/filepath"
@@ -524,7 +523,7 @@ func TestInit_backendUnset(t *testing.T) {
524523
log.Printf("[TRACE] TestInit_backendUnset: beginning second init")
525524

526525
// Unset
527-
if err := ioutil.WriteFile("main.tf", []byte(""), 0644); err != nil {
526+
if err := os.WriteFile("main.tf", []byte(""), 0644); err != nil {
528527
t.Fatalf("err: %s", err)
529528
}
530529

@@ -1144,7 +1143,7 @@ func TestInit_backendReinitConfigToExtra(t *testing.T) {
11441143

11451144
// init again but remove the path option from the config
11461145
cfg := "terraform {\n backend \"local\" {}\n}\n"
1147-
if err := ioutil.WriteFile("main.tf", []byte(cfg), 0644); err != nil {
1146+
if err := os.WriteFile("main.tf", []byte(cfg), 0644); err != nil {
11481147
t.Fatal(err)
11491148
}
11501149

@@ -2359,7 +2358,7 @@ func TestInit_providerLockFile(t *testing.T) {
23592358
}
23602359

23612360
lockFile := ".terraform.lock.hcl"
2362-
buf, err := ioutil.ReadFile(lockFile)
2361+
buf, err := os.ReadFile(lockFile)
23632362
if err != nil {
23642363
t.Fatalf("failed to read dependency lock file %s: %s", lockFile, err)
23652364
}
@@ -2540,7 +2539,7 @@ provider "registry.terraform.io/hashicorp/test" {
25402539

25412540
// write input lockfile
25422541
lockFile := ".terraform.lock.hcl"
2543-
if err := ioutil.WriteFile(lockFile, []byte(tc.input), 0644); err != nil {
2542+
if err := os.WriteFile(lockFile, []byte(tc.input), 0644); err != nil {
25442543
t.Fatalf("failed to write input lockfile: %s", err)
25452544
}
25462545

@@ -2552,7 +2551,7 @@ provider "registry.terraform.io/hashicorp/test" {
25522551
t.Fatalf("expected error, got output: \n%s", done(t).Stdout())
25532552
}
25542553

2555-
buf, err := ioutil.ReadFile(lockFile)
2554+
buf, err := os.ReadFile(lockFile)
25562555
if err != nil {
25572556
t.Fatalf("failed to read dependency lock file %s: %s", lockFile, err)
25582557
}

internal/command/meta_backend_test.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package command
66
import (
77
"context"
88
"fmt"
9-
"io/ioutil"
109
"os"
1110
"path/filepath"
1211
"reflect"
@@ -389,7 +388,7 @@ func TestMetaBackend_configureNewBackendWithState(t *testing.T) {
389388

390389
// Verify the default paths don't exist
391390
if !isEmptyState(DefaultStateFilename) {
392-
data, _ := ioutil.ReadFile(DefaultStateFilename)
391+
data, _ := os.ReadFile(DefaultStateFilename)
393392

394393
t.Fatal("state should not exist, but contains:\n", string(data))
395394
}
@@ -439,7 +438,7 @@ func TestMetaBackend_configureNewBackendWithoutCopy(t *testing.T) {
439438

440439
// Verify the default paths don't exist
441440
if !isEmptyState(DefaultStateFilename) {
442-
data, _ := ioutil.ReadFile(DefaultStateFilename)
441+
data, _ := os.ReadFile(DefaultStateFilename)
443442

444443
t.Fatal("state should not exist, but contains:\n", string(data))
445444
}
@@ -484,7 +483,7 @@ func TestMetaBackend_configureNewBackendWithStateNoMigrate(t *testing.T) {
484483

485484
// Verify the default paths don't exist
486485
if !isEmptyState(DefaultStateFilename) {
487-
data, _ := ioutil.ReadFile(DefaultStateFilename)
486+
data, _ := os.ReadFile(DefaultStateFilename)
488487

489488
t.Fatal("state should not exist, but contains:\n", string(data))
490489
}
@@ -555,7 +554,7 @@ func TestMetaBackend_configureNewBackendWithStateExisting(t *testing.T) {
555554

556555
// Verify the default paths don't exist
557556
if !isEmptyState(DefaultStateFilename) {
558-
data, _ := ioutil.ReadFile(DefaultStateFilename)
557+
data, _ := os.ReadFile(DefaultStateFilename)
559558

560559
t.Fatal("state should not exist, but contains:\n", string(data))
561560
}
@@ -626,7 +625,7 @@ func TestMetaBackend_configureNewBackendWithStateExistingNoMigrate(t *testing.T)
626625

627626
// Verify the default paths don't exist
628627
if !isEmptyState(DefaultStateFilename) {
629-
data, _ := ioutil.ReadFile(DefaultStateFilename)
628+
data, _ := os.ReadFile(DefaultStateFilename)
630629

631630
t.Fatal("state should not exist, but contains:\n", string(data))
632631
}
@@ -1476,13 +1475,13 @@ func TestMetaBackend_configuredBackendUnset(t *testing.T) {
14761475

14771476
// Verify the default paths don't exist
14781477
if !isEmptyState(DefaultStateFilename) {
1479-
data, _ := ioutil.ReadFile(DefaultStateFilename)
1478+
data, _ := os.ReadFile(DefaultStateFilename)
14801479
t.Fatal("state should not exist, but contains:\n", string(data))
14811480
}
14821481

14831482
// Verify a backup doesn't exist
14841483
if !isEmptyState(DefaultStateFilename + DefaultBackupExtension) {
1485-
data, _ := ioutil.ReadFile(DefaultStateFilename + DefaultBackupExtension)
1484+
data, _ := os.ReadFile(DefaultStateFilename + DefaultBackupExtension)
14861485
t.Fatal("backup should not exist, but contains:\n", string(data))
14871486
}
14881487

@@ -1499,7 +1498,7 @@ func TestMetaBackend_configuredBackendUnset(t *testing.T) {
14991498

15001499
// Verify no backup since it was empty to start
15011500
if !isEmptyState(DefaultStateFilename + DefaultBackupExtension) {
1502-
data, _ := ioutil.ReadFile(DefaultStateFilename + DefaultBackupExtension)
1501+
data, _ := os.ReadFile(DefaultStateFilename + DefaultBackupExtension)
15031502
t.Fatal("backup state should be empty, but contains:\n", string(data))
15041503
}
15051504
}
@@ -1941,7 +1940,7 @@ func TestMetaBackend_backendConfigToExtra(t *testing.T) {
19411940

19421941
// init again but remove the path option from the config
19431942
cfg := "terraform {\n backend \"local\" {}\n}\n"
1944-
if err := ioutil.WriteFile("main.tf", []byte(cfg), 0644); err != nil {
1943+
if err := os.WriteFile("main.tf", []byte(cfg), 0644); err != nil {
19451944
t.Fatal(err)
19461945
}
19471946

0 commit comments

Comments
 (0)