chore: address io/ioutil depreciation

api/api_test.go

@@ -11,9 +11,9 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"path/filepath"
 	"regexp"
 	"testing"
@@ -354,7 +354,7 @@ func TestServeWithTLS(t *testing.T) {
 			tlsConf := &tls.Config{}
 			if tc.clientCACert != "" {
 				caCertPool := x509.NewCertPool()
-				caCert, err := ioutil.ReadFile(tc.clientCACert)
+				caCert, err := os.ReadFile(tc.clientCACert)
 				require.NoError(t, err)
 				caCertPool.AppendCertsFromPEM(caCert)
 				tlsConf = &tls.Config{
@@ -549,11 +549,11 @@ func TestServeWithMutualTLS_MultipleCA(t *testing.T) {
 	cleanup := testutils.MakeTempDir(t, tmpDir)
 	defer cleanup()
 	for _, src := range caFiles {
-		input, err := ioutil.ReadFile(src)
+		input, err := os.ReadFile(src)
 		file := filepath.Base(src)
 		dest := filepath.Join(tmpDir, file)
 		require.NoError(t, err)
-		err = ioutil.WriteFile(dest, input, 0644)
+		err = os.WriteFile(dest, input, 0644)
 		require.NoError(t, err)
 	}
 

api/server_test.go

@@ -9,7 +9,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 	"time"
@@ -82,7 +82,7 @@ func TestRequest(t *testing.T) {
 			require.NoError(t, err)
 			bytesR := bytes.NewBuffer(b)
 			mockResp := &http.Response{
-				Body:       ioutil.NopCloser(bytesR),
+				Body:       io.NopCloser(bytesR),
 				StatusCode: tc.httpStatus,
 			}
 			hc.On("Do", mock.Anything).Return(mockResp, tc.httpError).Once()

api/task.go

@@ -6,7 +6,7 @@ package api
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"sort"
 	"strings"
@@ -101,7 +101,7 @@ func (h *taskHandler) updateTask(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		logger.Trace("unable to read request body from update", "error", err)
 		jsonErrorResponse(ctx, w, http.StatusInternalServerError, err)

command/commands_test.go

@@ -4,15 +4,15 @@
 package command
 
 import (
-	"io/ioutil"
+	"io"
 	"testing"
 
 	"github.com/mitchellh/cli"
 	"github.com/stretchr/testify/assert"
 )
 
 func Test_Commands(t *testing.T) {
-	cf := Commands(ioutil.Discard, ioutil.Discard)
+	cf := Commands(io.Discard, io.Discard)
 
 	// map of commands to synopsis
 	expectedCommands := map[string]cli.Command{

command/meta.go

@@ -7,7 +7,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/url"
 	"strings"
 
@@ -82,7 +81,7 @@ func (m *meta) defaultFlagSet(name string) *flag.FlagSet {
 	m.tls.sslVerify = m.flags.Bool(FlagSSLVerify, true, fmt.Sprintf("Boolean to verify SSL or not. Set to true to verify SSL. "+
 		"\n\t\tThis can also be specified using the %s environment variable.", api.EnvTLSSSLVerify))
 
-	m.flags.SetOutput(ioutil.Discard)
+	m.flags.SetOutput(io.Discard)
 
 	return m.flags
 }

config/config.go

@@ -6,7 +6,6 @@ package config
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -489,7 +488,7 @@ func fromFile(path string) (*Config, error) {
 	}
 
 	logger := logging.Global().Named(logSystemName)
-	content, err := ioutil.ReadFile(path)
+	content, err := os.ReadFile(path)
 	if err != nil {
 		logger.Error("failed reading config file from disk", filePathLogKey, path)
 		return nil, err
@@ -533,7 +532,7 @@ func fromPath(path string) (*Config, error) {
 	}
 
 	// Ensure the given filepath has at least one config file
-	files, err := ioutil.ReadDir(path)
+	files, err := os.ReadDir(path)
 	if err != nil {
 		logger.Error("failed listing directory", filePathLogKey, path)
 		return nil, err
@@ -591,7 +590,7 @@ func stringFromEnv(list []string, def string) *string {
 
 func stringFromFile(list []string, def string) *string {
 	for _, s := range list {
-		c, err := ioutil.ReadFile(s)
+		c, err := os.ReadFile(s)
 		if err == nil {
 			return String(strings.TrimSpace(string(c)))
 		}

driver/terraform.go

@@ -7,7 +7,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"path/filepath"
@@ -145,7 +145,7 @@ func NewTerraform(config *TerraformConfig) (*Terraform, error) {
 		postApply:         h,
 		resolver:          hcat.NewResolver(),
 		watcher:           config.Watcher,
-		fileReader:        ioutil.ReadFile,
+		fileReader:        os.ReadFile,
 		logger:            logger,
 	}, nil
 }
@@ -496,7 +496,7 @@ func (tf *Terraform) inspectTask(ctx context.Context, returnPlan bool) (InspectP
 		if tf.logClient {
 			tfLogger = log.New(log.Writer(), "", log.Flags())
 		} else {
-			tfLogger = log.New(ioutil.Discard, "", 0)
+			tfLogger = log.New(io.Discard, "", 0)
 		}
 		defer tf.client.SetStdout(tfLogger.Writer())
 	}

e2e/command_test.go

@@ -9,7 +9,6 @@
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -160,14 +159,14 @@
 
 			output, err := runSubcommand(t, tc.input, subcmd...)
 			assert.NoError(t, err)
 			assert.Contains(t, output, tc.outputContains)
 
 			// confirm that the task's final enabled state
 			taskStatuses, err := cts.Status().Task(disabledTaskName, nil)
 			require.NoError(t, err)
 			status, ok := taskStatuses[disabledTaskName]
 			require.True(t, ok)
 			assert.Equal(t, tc.expectEnabled, status.Enabled)
 
 			if !tc.expectEnabled {
 				// only check for events if we expect the task to be enabled
@@ -177,7 +176,7 @@
 			// check that there was an initial event
 			eventCountBase := 1
 			eventCountNow := eventCount(t, disabledTaskName, cts.Port())
 			require.Equal(t, eventCountBase, eventCountNow,
 				"event count did not increment once. task was not triggered as expected")
 
 			// make a change in Consul and confirm a new event is triggered
@@ -631,7 +630,7 @@
 			// If required by test case, verify contents of generated variables file
 			for _, v := range tc.tfVarsFiles {
 				expectedFilePath := filepath.Join(tempDir, taskName, "variables.auto.tfvars")
-				b, err := ioutil.ReadFile(expectedFilePath)
+				b, err := os.ReadFile(expectedFilePath)
 				require.NoError(t, err)
 				assert.Contains(t, string(b), v)
 			}

e2e/test_modules/incompatible_w_cts/variables.tf

@@ -2,5 +2,6 @@
 # SPDX-License-Identifier: MPL-2.0
 
 variable "test" {
+  default = "test"
 }
 

templates/hcltmpl/integration_test.go

@@ -8,7 +8,7 @@ package hcltmpl
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 	"testing"
 	"time"
 
@@ -77,8 +77,8 @@ func TestLoadDynamicConfig_ConsulKV(t *testing.T) {
 	srv, err := testutil.NewTestServerConfigT(tb,
 		func(c *testutil.TestServerConfig) {
 			c.LogLevel = "warn"
-			c.Stdout = ioutil.Discard
-			c.Stderr = ioutil.Discard
+			c.Stdout = io.Discard
+			c.Stderr = io.Discard
 		})
 	require.NoError(t, err)
 	clients := hcat.NewClientSet()

templates/tftmpl/golden_test.go

@@ -7,7 +7,7 @@ import (
 	"bytes"
 	"flag"
 	"io"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/hashicorp/consul-terraform-sync/templates/hcltmpl"
@@ -514,7 +514,7 @@ func TestNewFiles(t *testing.T) {
 func checkGoldenFile(t *testing.T, goldenFile string, actual string) {
 	// update golden files if necessary
 	if *update {
-		if err := ioutil.WriteFile(goldenFile, []byte(actual), 0644); err != nil {
+		if err := os.WriteFile(goldenFile, []byte(actual), 0644); err != nil {
 			require.NoError(t, err)
 		}
 	}

templates/tftmpl/integration_test.go

@@ -8,7 +8,7 @@ package tftmpl
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"path/filepath"
@@ -27,7 +27,7 @@ import (
 )
 
 func TestInitRootModule(t *testing.T) {
-	dir, err := ioutil.TempDir(".", "consul-terraform-sync-tftmpl-")
+	dir, err := os.MkdirTemp(".", "consul-terraform-sync-tftmpl-")
 	require.NoError(t, err)
 	defer os.RemoveAll(dir)
 
@@ -233,12 +233,12 @@ func TestRenderTFVarsTmpl(t *testing.T) {
 			t.Parallel()
 
 			// Setup Consul server
-			log.SetOutput(ioutil.Discard)
+			log.SetOutput(io.Discard)
 			srv, err := testutil.NewTestServerConfigT(tb,
 				func(c *testutil.TestServerConfig) {
 					c.LogLevel = "warn"
-					c.Stdout = ioutil.Discard
-					c.Stderr = ioutil.Discard
+					c.Stdout = io.Discard
+					c.Stderr = io.Discard
 
 					// Hardcode node info so it doesn't change per run
 					c.NodeName = "worker-01"
@@ -275,8 +275,8 @@ func TestRenderTFVarsTmpl(t *testing.T) {
 					func(c *testutil.TestServerConfig) {
 						c.Bootstrap = false
 						c.LogLevel = "warn"
-						c.Stdout = ioutil.Discard
-						c.Stderr = ioutil.Discard
+						c.Stdout = io.Discard
+						c.Stderr = io.Discard
 
 						// Hardcode node info so it doesn't change per run
 						c.NodeName = "worker-02"

templates/tftmpl/tmplfunc/catalog_services_registration_test.go

@@ -4,7 +4,7 @@
 package tmplfunc
 
 import (
-	"io/ioutil"
+	"io"
 	"regexp"
 	"testing"
 	"time"
@@ -182,8 +182,8 @@ func TestCatalogServicesRegistrationQuery_Fetch(t *testing.T) {
 		func(c *testutil.TestServerConfig) {
 			c.Bootstrap = false
 			c.LogLevel = "warn"
-			c.Stdout = ioutil.Discard
-			c.Stderr = ioutil.Discard
+			c.Stdout = io.Discard
+			c.Stderr = io.Discard
 			c.NodeMeta = map[string]string{"k": "v"}
 		})
 
@@ -195,8 +195,8 @@ func TestCatalogServicesRegistrationQuery_Fetch(t *testing.T) {
 			c.Datacenter = "dc2"
 			c.Bootstrap = true
 			c.LogLevel = "warn"
-			c.Stdout = ioutil.Discard
-			c.Stderr = ioutil.Discard
+			c.Stdout = io.Discard
+			c.Stderr = io.Discard
 		})
 	require.NoError(t, err, "failed to start consul server 3")
 	defer srv3.Stop()

templates/tftmpl/tmplfunc/services_regex_test.go

@@ -5,7 +5,7 @@ package tmplfunc
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"regexp"
 	"sort"
 	"testing"
@@ -155,8 +155,8 @@ func TestServicesRegexQuery_Fetch(t *testing.T) {
 		func(c *testutil.TestServerConfig) {
 			c.Bootstrap = false
 			c.LogLevel = "warn"
-			c.Stdout = ioutil.Discard
-			c.Stderr = ioutil.Discard
+			c.Stdout = io.Discard
+			c.Stderr = io.Discard
 			c.NodeMeta = nodeMeta
 		})
 	consulSrv2 := &dep.HealthService{
@@ -175,8 +175,8 @@ func TestServicesRegexQuery_Fetch(t *testing.T) {
 			c.Datacenter = "dc2"
 			c.Bootstrap = true
 			c.LogLevel = "warn"
-			c.Stdout = ioutil.Discard
-			c.Stderr = ioutil.Discard
+			c.Stdout = io.Discard
+			c.Stderr = io.Discard
 		})
 	require.NoError(t, err, "failed to start consul server 3")
 	defer srv3.Stop()