From 10e1b10d86a1b2b4f7c62110e0bc2d53cf1153c8 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Wed, 6 Sep 2023 13:21:30 -0700 Subject: [PATCH] internal/builtin: deprecate io/ioutil (#314) Signed-off-by: Lars Lehtonen --- internal/builtin/provisioners/file/resource_provisioner.go | 3 +-- .../provisioners/local-exec/resource_provisioner_test.go | 3 +-- .../builtin/provisioners/remote-exec/resource_provisioner.go | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/internal/builtin/provisioners/file/resource_provisioner.go b/internal/builtin/provisioners/file/resource_provisioner.go index a45e617615..631d20cf1e 100644 --- a/internal/builtin/provisioners/file/resource_provisioner.go +++ b/internal/builtin/provisioners/file/resource_provisioner.go @@ -7,7 +7,6 @@ import ( "context" "errors" "fmt" - "io/ioutil" "os" "github.com/mitchellh/go-homedir" @@ -132,7 +131,7 @@ func getSrc(v cty.Value) (string, bool, error) { switch { case !content.IsNull(): - file, err := ioutil.TempFile("", "tf-file-content") + file, err := os.CreateTemp("", "tf-file-content") if err != nil { return "", true, err } diff --git a/internal/builtin/provisioners/local-exec/resource_provisioner_test.go b/internal/builtin/provisioners/local-exec/resource_provisioner_test.go index ed2eb173cc..98223a76a0 100644 --- a/internal/builtin/provisioners/local-exec/resource_provisioner_test.go +++ b/internal/builtin/provisioners/local-exec/resource_provisioner_test.go @@ -5,7 +5,6 @@ package localexec import ( "fmt" - "io/ioutil" "os" "strings" "testing" @@ -38,7 +37,7 @@ func TestResourceProvider_Apply(t *testing.T) { } // Check the file - raw, err := ioutil.ReadFile("test_out") + raw, err := os.ReadFile("test_out") if err != nil { t.Fatalf("err: %v", err) } diff --git a/internal/builtin/provisioners/remote-exec/resource_provisioner.go b/internal/builtin/provisioners/remote-exec/resource_provisioner.go index 836cc3f64f..8f69c3fc3b 100644 --- a/internal/builtin/provisioners/remote-exec/resource_provisioner.go +++ b/internal/builtin/provisioners/remote-exec/resource_provisioner.go @@ -9,7 +9,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "log" "os" "strings" @@ -182,7 +181,7 @@ func collectScripts(v cty.Value) ([]io.ReadCloser, error) { var r []io.ReadCloser for _, script := range scripts { - r = append(r, ioutil.NopCloser(bytes.NewReader([]byte(script)))) + r = append(r, io.NopCloser(bytes.NewReader([]byte(script)))) } return r, nil