Merge branch 'main' into chore/replace-deprecated-command-with-enviro…

…nment-file

commands/apps.go

@@ -18,7 +18,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
@@ -953,7 +952,7 @@ func readAppAlertDestination(stdin io.Reader, path string) (*godo.AlertDestinati
 		alertDestinations = alertDestinationsFile
 	}
 
-	byt, err := ioutil.ReadAll(alertDestinations)
+	byt, err := io.ReadAll(alertDestinations)
 	if err != nil {
 		return nil, fmt.Errorf("reading app alert destinations: %w", err)
 	}

commands/apps_dev_config_test.go

@@ -2,7 +2,6 @@ package commands
 
 import (
 	"errors"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -202,7 +201,7 @@ func tempAppSpec(t *testing.T, spec *godo.AppSpec) (path string) {
 	path = tempFile(t, "app.yaml")
 	specYaml, err := yaml.Marshal(spec)
 	require.NoError(t, err, "marshaling app spec")
-	err = ioutil.WriteFile(path, specYaml, 0664)
+	err = os.WriteFile(path, specYaml, 0664)
 	require.NoError(t, err, "writing app spec to disk")
 	return
 }

commands/apps_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"io"
-	"io/ioutil"
 	"net/url"
 	"os"
 	"testing"
@@ -130,12 +129,9 @@ var (
 
 func TestRunAppsCreate(t *testing.T) {
 	withTestClient(t, func(config *CmdConfig, tm *tcMocks) {
-		specFile, err := ioutil.TempFile("", "spec")
+		specFile, err := os.CreateTemp(t.TempDir(), "spec")
 		require.NoError(t, err)
-		defer func() {
-			os.Remove(specFile.Name())
-			specFile.Close()
-		}()
+		defer specFile.Close()
 
 		err = json.NewEncoder(specFile).Encode(&testAppSpec)
 		require.NoError(t, err)
@@ -195,12 +191,9 @@ func TestRunAppsList(t *testing.T) {
 
 func TestRunAppsUpdate(t *testing.T) {
 	withTestClient(t, func(config *CmdConfig, tm *tcMocks) {
-		specFile, err := ioutil.TempFile("", "spec")
+		specFile, err := os.CreateTemp(t.TempDir(), "spec")
 		require.NoError(t, err)
-		defer func() {
-			os.Remove(specFile.Name())
-			specFile.Close()
-		}()
+		defer specFile.Close()
 
 		err = json.NewEncoder(specFile).Encode(&testAppSpec)
 		require.NoError(t, err)
@@ -439,8 +432,8 @@ func TestRunAppsGetLogs(t *testing.T) {
 
 			tc := config.Doit.(*doctl.TestConfig)
 			tc.ListenFn = func(url *url.URL, token string, schemaFunc listen.SchemaFunc, out io.Writer) listen.ListenerService {
-				assert.Equal(t, token, "aa-bb-11-cc-33")
-				assert.Equal(t, url.String(), "wss://proxy-apps-prod-ams3-001.ondigitalocean.app/?token=aa-bb-11-cc-33")
+				assert.Equal(t, "aa-bb-11-cc-33", token)
+				assert.Equal(t, "wss://proxy-apps-prod-ams3-001.ondigitalocean.app/?token=aa-bb-11-cc-33", url.String())
 				return tm.listen
 			}
 
@@ -543,7 +536,7 @@ var validAppSpec = &godo.AppSpec{
 func testTempFile(t *testing.T, data []byte) string {
 	t.Helper()
 	file := t.TempDir() + "/file"
-	err := ioutil.WriteFile(file, data, 0644)
+	err := os.WriteFile(file, data, 0644)
 	require.NoError(t, err, "writing temp file")
 	return file
 }
@@ -769,12 +762,9 @@ func TestRunAppsListAlerts(t *testing.T) {
 
 func TestRunAppsUpdateAlertDestinations(t *testing.T) {
 	withTestClient(t, func(config *CmdConfig, tm *tcMocks) {
-		destinationsFile, err := ioutil.TempFile("", "dest")
+		destinationsFile, err := os.CreateTemp(t.TempDir(), "dest")
 		require.NoError(t, err)
-		defer func() {
-			os.Remove(destinationsFile.Name())
-			destinationsFile.Close()
-		}()
+		defer destinationsFile.Close()
 
 		err = json.NewEncoder(destinationsFile).Encode(&testAlertUpdate)
 		require.NoError(t, err)

commands/auth_test.go

@@ -17,7 +17,6 @@ import (
 	"bufio"
 	"bytes"
 	"io"
-	"io/ioutil"
 	"path/filepath"
 	"testing"
 
@@ -48,7 +47,7 @@ func TestAuthInit(t *testing.T) {
 		return "valid-token", nil
 	}
 
-	cfgFileWriter = func() (io.WriteCloser, error) { return &nopWriteCloser{Writer: ioutil.Discard}, nil }
+	cfgFileWriter = func() (io.WriteCloser, error) { return &nopWriteCloser{Writer: io.Discard}, nil }
 
 	withTestClient(t, func(config *CmdConfig, tm *tcMocks) {
 		tm.oauth.EXPECT().TokenInfo(gomock.Any()).Return(&do.OAuthTokenInfo{}, nil)
@@ -98,7 +97,7 @@ func TestAuthInitConfig(t *testing.T) {
 				"unset": map[interface{}]interface{}{"dev-config": ""},
 			},
 		)
-		assert.Equal(t, devConfigSetting, expectedConfigSetting, "unexpected setting for 'dev.config'")
+		assert.Equal(t, expectedConfigSetting, devConfigSetting, "unexpected setting for 'dev.config'")
 	})
 }
 
@@ -114,7 +113,7 @@ func TestAuthInitWithProvidedToken(t *testing.T) {
 		return "", errors.New("should not have called this")
 	}
 
-	cfgFileWriter = func() (io.WriteCloser, error) { return &nopWriteCloser{Writer: ioutil.Discard}, nil }
+	cfgFileWriter = func() (io.WriteCloser, error) { return &nopWriteCloser{Writer: io.Discard}, nil }
 
 	withTestClient(t, func(config *CmdConfig, tm *tcMocks) {
 		tm.oauth.EXPECT().TokenInfo(gomock.Any()).Return(&do.OAuthTokenInfo{}, nil)
@@ -136,7 +135,7 @@ func TestAuthForcesLowercase(t *testing.T) {
 		return "", errors.New("should not have called this")
 	}
 
-	cfgFileWriter = func() (io.WriteCloser, error) { return &nopWriteCloser{Writer: ioutil.Discard}, nil }
+	cfgFileWriter = func() (io.WriteCloser, error) { return &nopWriteCloser{Writer: io.Discard}, nil }
 
 	withTestClient(t, func(config *CmdConfig, tm *tcMocks) {
 		tm.oauth.EXPECT().TokenInfo(gomock.Any()).Return(&do.OAuthTokenInfo{}, nil)

commands/certificates.go

@@ -14,7 +14,7 @@ limitations under the License.
 package commands
 
 import (
-	"io/ioutil"
+	"os"
 
 	"github.com/digitalocean/doctl"
 	"github.com/digitalocean/doctl/commands/displayers"
@@ -217,7 +217,7 @@ func RunCertificateDelete(c *CmdConfig) error {
 }
 
 func readInputFromFile(path string) (string, error) {
-	fileBytes, err := ioutil.ReadFile(path)
+	fileBytes, err := os.ReadFile(path)
 	if err != nil {
 		return "", err
 	}

commands/certificates_test.go

@@ -1,7 +1,6 @@
 package commands
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -106,21 +105,21 @@ func TestCertificatesCreate(t *testing.T) {
 		t.Run(test.desc, func(t *testing.T) {
 			withTestClient(t, func(config *CmdConfig, tm *tcMocks) {
 				if test.privateKeyPath != "" {
-					pkErr := ioutil.WriteFile(test.privateKeyPath, []byte("-----BEGIN PRIVATE KEY-----"), 0600)
+					pkErr := os.WriteFile(test.privateKeyPath, []byte("-----BEGIN PRIVATE KEY-----"), 0600)
 					assert.NoError(t, pkErr)
 
 					defer os.Remove(test.privateKeyPath)
 				}
 
 				if test.certLeafPath != "" {
-					certErr := ioutil.WriteFile(test.certLeafPath, []byte("-----BEGIN CERTIFICATE-----"), 0600)
+					certErr := os.WriteFile(test.certLeafPath, []byte("-----BEGIN CERTIFICATE-----"), 0600)
 					assert.NoError(t, certErr)
 
 					defer os.Remove(test.certLeafPath)
 				}
 
 				if test.certChainPath != "" {
-					certErr := ioutil.WriteFile(test.certChainPath, []byte("-----BEGIN CERTIFICATE-----"), 0600)
+					certErr := os.WriteFile(test.certChainPath, []byte("-----BEGIN CERTIFICATE-----"), 0600)
 					assert.NoError(t, certErr)
 
 					defer os.Remove(test.certChainPath)

commands/commands_test.go

@@ -14,7 +14,7 @@ limitations under the License.
 package commands
 
 import (
-	"io/ioutil"
+	"io"
 	"sort"
 	"testing"
 
@@ -241,7 +241,7 @@ func withTestClient(t *testing.T, tFn testFn) {
 	config := &CmdConfig{
 		NS:   "test",
 		Doit: testConfig,
-		Out:  ioutil.Discard,
+		Out:  io.Discard,
 
 		// can stub this out, since the return is dictated by the mocks.
 		initServices: func(c *CmdConfig) error { return nil },

commands/droplets.go

@@ -15,7 +15,7 @@ package commands
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"sort"
 	"strconv"
 	"strings"
@@ -413,7 +413,7 @@ func extractSSHKeys(keys []string) []godo.DropletCreateSSHKey {
 
 func extractUserData(userData, filename string) (string, error) {
 	if userData == "" && filename != "" {
-		data, err := ioutil.ReadFile(filename)
+		data, err := os.ReadFile(filename)
 		if err != nil {
 			return "", err
 		}

commands/droplets_test.go

@@ -15,7 +15,6 @@ package commands
 
 import (
 	"bytes"
-	"io/ioutil"
 	"os"
 	"strconv"
 	"testing"
@@ -163,9 +162,8 @@ coreos:
       command: start
 `
 
-		tmpFile, err := ioutil.TempFile(os.TempDir(), "doctlDropletsTest-*.yml")
+		tmpFile, err := os.CreateTemp(t.TempDir(), "doctlDropletsTest-*.yml")
 		assert.NoError(t, err)
-		defer os.Remove(tmpFile.Name())
 
 		_, err = tmpFile.WriteString(userData)
 		assert.NoError(t, err)

commands/invoices.go

@@ -15,7 +15,7 @@ package commands
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	"github.com/digitalocean/doctl"
 	"github.com/digitalocean/doctl/commands/displayers"
@@ -145,7 +145,7 @@ func RunInvoicesGetPDF(c *CmdConfig) error {
 
 	outputFile := getOutputFileArg("pdf", c.Args)
 
-	err = ioutil.WriteFile(outputFile, pdf, 0644)
+	err = os.WriteFile(outputFile, pdf, 0644)
 	if err != nil {
 		return err
 	}
@@ -167,7 +167,7 @@ func RunInvoicesGetCSV(c *CmdConfig) error {
 
 	outputFile := getOutputFileArg("csv", c.Args)
 
-	err = ioutil.WriteFile(outputFile, csv, 0644)
+	err = os.WriteFile(outputFile, csv, 0644)
 	if err != nil {
 		return err
 	}

commands/invoices_test.go

@@ -14,7 +14,6 @@ limitations under the License.
 package commands
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -185,7 +184,7 @@ func TestInvoicesGetPDF(t *testing.T) {
 		assert.NoError(t, err)
 
 		// Assert the file exists
-		result, err := ioutil.ReadFile(fpath)
+		result, err := os.ReadFile(fpath)
 		assert.NoError(t, err)
 		assert.Equal(t, content, result)
 
@@ -208,7 +207,7 @@ func TestInvoicesGetCSV(t *testing.T) {
 		assert.NoError(t, err)
 
 		// Assert the file exists
-		result, err := ioutil.ReadFile(fpath)
+		result, err := os.ReadFile(fpath)
 		assert.NoError(t, err)
 		assert.Equal(t, content, result)
 

commands/monitoring_test.go

@@ -203,7 +203,7 @@ func TestAlertPolicyCreate_ValidTypes(t *testing.T) {
 			config.Doit.Set(config.NS, doctl.ArgAlertPolicySlackURLs, slackURLsStr)
 
 			err := RunCmdAlertPolicyCreate(config)
-			assert.Equal(t, err, tt.expectedErr)
+			assert.Equal(t, tt.expectedErr, err)
 		})
 	}
 }

commands/registry_test.go

@@ -700,11 +700,7 @@ func TestRegistryLogin(t *testing.T) {
 
 				config.Out = os.Stderr
 				err := RunRegistryLogin(config)
-				if test.err != nil {
-					assert.Error(t, test.err, err)
-				} else {
-					assert.NoError(t, err)
-				}
+				assert.Equal(t, test.err, err)
 			})
 		})
 	}

commands/serverless_test.go

@@ -18,7 +18,6 @@ import (
 	"bytes"
 	"context"
 	"errors"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -688,17 +687,12 @@ func TestGetCredentialDirectory(t *testing.T) {
 
 func TestPreserveCredsMovesExistingToStaging(t *testing.T) {
 	withTestClient(t, func(config *CmdConfig, tm *tcMocks) {
-		tmp, err := ioutil.TempDir("", "test-dir")
-		require.NoError(t, err)
-		defer func() {
-			err := os.RemoveAll(tmp)
-			require.NoError(t, err, "error cleaning tmp dir")
-		}()
+		tmp := t.TempDir()
 
 		// Set up "existing" creds in the "sandbox" dir
 		serverlessDir := filepath.Join(tmp, "sandbox")
 		serverlessCredsDir := filepath.Join(serverlessDir, "creds", "d5b388f2")
-		err = os.MkdirAll(serverlessCredsDir, os.FileMode(0755))
+		err := os.MkdirAll(serverlessCredsDir, os.FileMode(0755))
 		require.NoError(t, err)
 		serverlessCreds := filepath.Join(serverlessCredsDir, "credentials.json")
 		creds, err := os.Create(serverlessCreds)
@@ -726,17 +720,12 @@ func TestPreserveCredsMovesLegacyCreds(t *testing.T) {
 			return "a7bbe7e8af7411ec912e47a270a2ee78a7bbe7e8af7411ec912e47a270a2ee78"
 		}
 
-		tmp, err := ioutil.TempDir("", "test-dir")
-		require.NoError(t, err)
-		defer func() {
-			err := os.RemoveAll(tmp)
-			require.NoError(t, err, "error cleaning tmp dir")
-		}()
+		tmp := t.TempDir()
 
 		// Set up "existing" legacy creds in the "sandbox" dir
 		serverlessDir := filepath.Join(tmp, "sandbox")
 		legacyCredsDir := filepath.Join(serverlessDir, ".nimbella")
-		err = os.MkdirAll(legacyCredsDir, os.FileMode(0755))
+		err := os.MkdirAll(legacyCredsDir, os.FileMode(0755))
 		require.NoError(t, err)
 		legacyCreds := filepath.Join(legacyCredsDir, "credentials.json")
 		creds, err := os.Create(legacyCreds)

commands/sshkeys.go

@@ -14,7 +14,7 @@ limitations under the License.
 package commands
 
 import (
-	"io/ioutil"
+	"os"
 
 	"github.com/digitalocean/doctl"
 	"github.com/digitalocean/doctl/commands/displayers"
@@ -149,7 +149,7 @@ func RunKeyImport(c *CmdConfig) error {
 
 	keyName := c.Args[0]
 
-	keyFile, err := ioutil.ReadFile(keyPath)
+	keyFile, err := os.ReadFile(keyPath)
 	if err != nil {
 		return err
 	}