Update ioutil library references to os and io respectively for command

(manual cherry-pick f0fd046)

No user facing changes so I assume no change log is required

command/acl_bootstrap.go

@@ -2,7 +2,7 @@ package command
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"strings"
 
@@ -86,10 +86,10 @@ func (c *ACLBootstrapCommand) Run(args []string) int {
 		case "":
 			terminalToken = []byte{}
 		case "-":
-			terminalToken, err = ioutil.ReadAll(os.Stdin)
+			terminalToken, err = io.ReadAll(os.Stdin)
 		default:
 			file = args[0]
-			terminalToken, err = ioutil.ReadFile(file)
+			terminalToken, err = os.ReadFile(file)
 		}
 		if err != nil {
 			c.Ui.Error(fmt.Sprintf("Error reading provided token: %v", err))

command/acl_policy_apply.go

@@ -2,7 +2,7 @@ package command
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"strings"
 
@@ -76,13 +76,13 @@ func (c *ACLPolicyApplyCommand) Run(args []string) int {
 	var rawPolicy []byte
 	var err error
 	if file == "-" {
-		rawPolicy, err = ioutil.ReadAll(os.Stdin)
+		rawPolicy, err = io.ReadAll(os.Stdin)
 		if err != nil {
 			c.Ui.Error(fmt.Sprintf("Failed to read stdin: %v", err))
 			return 1
 		}
 	} else {
-		rawPolicy, err = ioutil.ReadFile(file)
+		rawPolicy, err = os.ReadFile(file)
 		if err != nil {
 			c.Ui.Error(fmt.Sprintf("Failed to read file: %v", err))
 			return 1

command/agent/agent.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	golog "log"
 	"net"
 	"os"
@@ -850,7 +849,7 @@ func (a *Agent) setupNodeID(config *nomad.Config) error {
 	// validate it. Saved state overwrites any configured node id
 	fileID := filepath.Join(config.DataDir, "node-id")
 	if _, err := os.Stat(fileID); err == nil {
-		rawID, err := ioutil.ReadFile(fileID)
+		rawID, err := os.ReadFile(fileID)
 		if err != nil {
 			return err
 		}
@@ -875,7 +874,7 @@ func (a *Agent) setupNodeID(config *nomad.Config) error {
 		if err := escapingfs.EnsurePath(fileID, false); err != nil {
 			return err
 		}
-		if err := ioutil.WriteFile(fileID, []byte(config.NodeID), 0600); err != nil {
+		if err := os.WriteFile(fileID, []byte(config.NodeID), 0600); err != nil {
 			return err
 		}
 		return nil
@@ -887,7 +886,7 @@ func (a *Agent) setupNodeID(config *nomad.Config) error {
 		if err := escapingfs.EnsurePath(fileID, false); err != nil {
 			return err
 		}
-		if err := ioutil.WriteFile(fileID, []byte(id), 0600); err != nil {
+		if err := os.WriteFile(fileID, []byte(id), 0600); err != nil {
 			return err
 		}
 

command/agent/agent_endpoint_test.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"net/http/httptest"
@@ -379,7 +379,7 @@ func TestHTTP_AgentMonitor(t *testing.T) {
 					s.Server.logger.Warn("log that should be sent")
 					tried++
 				}
-				output, err := ioutil.ReadAll(resp.Body)
+				output, err := io.ReadAll(resp.Body)
 				if err != nil {
 					return false, err
 				}
@@ -420,7 +420,7 @@ func TestHTTP_AgentMonitor(t *testing.T) {
 					s.Agent.logger.Warn("log that should be sent")
 					tried++
 				}
-				output, err := ioutil.ReadAll(resp.Body)
+				output, err := io.ReadAll(resp.Body)
 				if err != nil {
 					return false, err
 				}

command/agent/agent_test.go

@@ -2,7 +2,6 @@ package agent
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -1273,7 +1272,7 @@ func TestServer_ShouldReload_ReturnTrueForFileChanges(t *testing.T) {
 	dir := t.TempDir()
 
 	tmpfn := filepath.Join(dir, "testcert")
-	err := ioutil.WriteFile(tmpfn, content, 0666)
+	err := os.WriteFile(tmpfn, content, 0666)
 	require.Nil(err)
 
 	const (
@@ -1325,7 +1324,7 @@ func TestServer_ShouldReload_ReturnTrueForFileChanges(t *testing.T) {
 	`
 
 	os.Remove(tmpfn)
-	err = ioutil.WriteFile(tmpfn, []byte(newCertificate), 0666)
+	err = os.WriteFile(tmpfn, []byte(newCertificate), 0666)
 	require.Nil(err)
 
 	newAgentConfig := &Config{

command/agent/alloc_endpoint_test.go

@@ -4,7 +4,6 @@ import (
 	"archive/tar"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -766,7 +765,7 @@ func TestHTTP_AllocSnapshot_Atomic(t *testing.T) {
 		os.RemoveAll(allocDir.TaskDirs["web"].LocalDir)
 
 		// require Snapshot fails
-		if err := allocDir.Snapshot(ioutil.Discard); err != nil {
+		if err := allocDir.Snapshot(io.Discard); err != nil {
 			t.Logf("[DEBUG] agent.test: snapshot returned error: %v", err)
 		} else {
 			t.Errorf("expected Snapshot() to fail but it did not")

command/agent/command_test.go

@@ -1,8 +1,8 @@
 package agent
 
 import (
-	"io/ioutil"
 	"math"
+	"os"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -109,7 +109,7 @@ func TestCommand_MetaConfigValidation(t *testing.T) {
 	}
 	for _, tc := range tcases {
 		configFile := filepath.Join(tmpDir, "conf1.hcl")
-		err := ioutil.WriteFile(configFile, []byte(`client{
+		err := os.WriteFile(configFile, []byte(`client{
 			enabled = true
 			meta = {
 				"valid" = "yes"
@@ -160,7 +160,7 @@ func TestCommand_NullCharInDatacenter(t *testing.T) {
 	}
 	for _, tc := range tcases {
 		configFile := filepath.Join(tmpDir, "conf1.hcl")
-		err := ioutil.WriteFile(configFile, []byte(`
+		err := os.WriteFile(configFile, []byte(`
         datacenter = "`+tc+`"
         client{
 			enabled = true
@@ -207,7 +207,7 @@ func TestCommand_NullCharInRegion(t *testing.T) {
 	}
 	for _, tc := range tcases {
 		configFile := filepath.Join(tmpDir, "conf1.hcl")
-		err := ioutil.WriteFile(configFile, []byte(`
+		err := os.WriteFile(configFile, []byte(`
         region = "`+tc+`"
         client{
 			enabled = true

command/agent/config_test.go

@@ -2,7 +2,6 @@ package agent
 
 import (
 	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
 	"path/filepath"
@@ -460,7 +459,7 @@ func TestConfig_ParseConfigFile(t *testing.T) {
 		t.Fatalf("expected error, got nothing")
 	}
 
-	fh, err := ioutil.TempFile("", "nomad")
+	fh, err := os.CreateTemp("", "nomad")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -514,19 +513,19 @@ func TestConfig_LoadConfigDir(t *testing.T) {
 	}
 
 	file1 := filepath.Join(dir, "conf1.hcl")
-	err = ioutil.WriteFile(file1, []byte(`{"region":"west"}`), 0600)
+	err = os.WriteFile(file1, []byte(`{"region":"west"}`), 0600)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
 
 	file2 := filepath.Join(dir, "conf2.hcl")
-	err = ioutil.WriteFile(file2, []byte(`{"datacenter":"sfo"}`), 0600)
+	err = os.WriteFile(file2, []byte(`{"datacenter":"sfo"}`), 0600)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
 
 	file3 := filepath.Join(dir, "conf3.hcl")
-	err = ioutil.WriteFile(file3, []byte(`nope;!!!`), 0600)
+	err = os.WriteFile(file3, []byte(`nope;!!!`), 0600)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -558,7 +557,7 @@ func TestConfig_LoadConfig(t *testing.T) {
 		t.Fatalf("expected error, got nothing")
 	}
 
-	fh, err := ioutil.TempFile("", "nomad")
+	fh, err := os.CreateTemp("", "nomad")
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -586,7 +585,7 @@ func TestConfig_LoadConfig(t *testing.T) {
 	dir := t.TempDir()
 
 	file1 := filepath.Join(dir, "config1.hcl")
-	err = ioutil.WriteFile(file1, []byte(`{"datacenter":"sfo"}`), 0600)
+	err = os.WriteFile(file1, []byte(`{"datacenter":"sfo"}`), 0600)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -1342,7 +1341,7 @@ func TestTelemetry_Parse(t *testing.T) {
 	dir := t.TempDir()
 
 	file1 := filepath.Join(dir, "config1.hcl")
-	err := ioutil.WriteFile(file1, []byte(`telemetry{
+	err := os.WriteFile(file1, []byte(`telemetry{
 		prefix_filter = ["+nomad.raft"]
 		filter_default = false
 		disable_dispatched_job_summary_metrics = true

command/agent/consul/group_test.go

@@ -1,7 +1,7 @@
 package consul
 
 import (
-	"io/ioutil"
+	"io"
 	"testing"
 	"time"
 
@@ -22,8 +22,8 @@ func TestConsul_Connect(t *testing.T) {
 	testconsul, err := testutil.NewTestServerConfigT(t, func(c *testutil.TestServerConfig) {
 		// If -v wasn't specified squelch consul logging
 		if !testing.Verbose() {
-			c.Stdout = ioutil.Discard
-			c.Stderr = ioutil.Discard
+			c.Stdout = io.Discard
+			c.Stderr = io.Discard
 		}
 	})
 	if err != nil {

command/agent/consul/int_test.go

@@ -2,7 +2,7 @@ package consul_test
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 	"testing"
 	"time"
 
@@ -48,8 +48,8 @@ func TestConsul_Integration(t *testing.T) {
 	testconsul, err := testutil.NewTestServerConfigT(t, func(c *testutil.TestServerConfig) {
 		// If -v wasn't specified squelch consul logging
 		if !testing.Verbose() {
-			c.Stdout = ioutil.Discard
-			c.Stderr = ioutil.Discard
+			c.Stdout = io.Discard
+			c.Stderr = io.Discard
 		}
 	})
 	if err != nil {