Drop io/ioutil and fix staticcheck

yyuuttaaoo · Apr 26, 2022 · fa277a9 · fa277a9
1 parent 6c62754
commit fa277a9
Show file tree

Hide file tree

Showing 18 changed files with 81 additions and 86 deletions.
diff --git a/auth.go b/auth.go
@@ -10,7 +10,6 @@ import (
 	"encoding/json"
 	"errors"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"os/exec"
@@ -272,7 +271,7 @@ func (c *Client) AuthCheck(conf *AuthConfiguration) (AuthStatus, error) {
 		return authStatus, err
 	}
 	defer resp.Body.Close()
-	data, err := ioutil.ReadAll(resp.Body)
+	data, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return authStatus, err
 	}
@@ -318,7 +317,7 @@ func NewAuthConfigurationsFromCredsHelpers(registry string) (*AuthConfiguration,
 
 func getHelperProviderFromDockerCfg(pathsToTry []string, registry string) (string, error) {
 	for _, path := range pathsToTry {
-		content, err := ioutil.ReadFile(path)
+		content, err := os.ReadFile(path)
 		if err != nil {
 			// if we can't read the file keep going
 			continue

diff --git a/auth_test.go b/auth_test.go
@@ -8,7 +8,6 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path"
@@ -43,15 +42,15 @@ func TestAuthConfigurationSearchPath(t *testing.T) {
 
 func TestAuthConfigurationsFromFile(t *testing.T) {
 	t.Parallel()
-	tmpDir, err := ioutil.TempDir("", "go-dockerclient-auth-test")
+	tmpDir, err := os.MkdirTemp("", "go-dockerclient-auth-test")
 	if err != nil {
 		t.Fatalf("Unable to create temporary directory for TestAuthConfigurationsFromFile: %s", err)
 	}
 	defer os.RemoveAll(tmpDir)
 	authString := base64.StdEncoding.EncodeToString([]byte("user:pass"))
 	content := fmt.Sprintf(`{"auths":{"foo": {"auth": "%s"}}}`, authString)
 	configFile := path.Join(tmpDir, "docker_config")
-	if err = ioutil.WriteFile(configFile, []byte(content), 0o600); err != nil {
+	if err = os.WriteFile(configFile, []byte(content), 0o600); err != nil {
 		t.Errorf("Error writing auth config for TestAuthConfigurationsFromFile: %s", err)
 	}
 	auths, err := NewAuthConfigurationsFromFile(configFile)
@@ -65,7 +64,7 @@ func TestAuthConfigurationsFromFile(t *testing.T) {
 
 func TestAuthConfigurationsFromDockerCfg(t *testing.T) {
 	t.Parallel()
-	tmpDir, err := ioutil.TempDir("", "go-dockerclient-auth-dockercfg-test")
+	tmpDir, err := os.MkdirTemp("", "go-dockerclient-auth-dockercfg-test")
 	if err != nil {
 		t.Fatalf("Unable to create temporary directory for TestAuthConfigurationsFromDockerCfg: %s", err)
 	}
@@ -80,7 +79,7 @@ func TestAuthConfigurationsFromDockerCfg(t *testing.T) {
 		authString := base64.StdEncoding.EncodeToString([]byte("user:pass"))
 		content := fmt.Sprintf(`{"auths":{"%s": {"auth": "%s"}}}`, key, authString)
 		configFile := path.Join(tmpDir, fmt.Sprintf("docker_config_%d.json", i))
-		if err = ioutil.WriteFile(configFile, []byte(content), 0o600); err != nil {
+		if err = os.WriteFile(configFile, []byte(content), 0o600); err != nil {
 			t.Errorf("Error writing auth config for TestAuthConfigurationsFromFile: %s", err)
 		}
 		pathsToTry = append(pathsToTry, configFile)
@@ -376,15 +375,15 @@ func TestAuthConfigurationsMerge(t *testing.T) {
 
 func TestGetHelperProviderFromDockerCfg(t *testing.T) {
 	t.Parallel()
-	tmpDir, err := ioutil.TempDir("", "go-dockerclient-creds-test")
+	tmpDir, err := os.MkdirTemp("", "go-dockerclient-creds-test")
 	if err != nil {
 		t.Fatalf("Unable to create temporary directory for TestGetHelperProviderFromDockerCfg: %s", err)
 	}
 	defer os.RemoveAll(tmpDir)
 	expectedProvider := "ecr-login-test"
 	content := fmt.Sprintf(`{"credsStore": "ecr-login","credHelpers":{"docker.io":"%s"}}`, expectedProvider)
 	configFile := path.Join(tmpDir, "docker_config")
-	if err = ioutil.WriteFile(configFile, []byte(content), 0o600); err != nil {
+	if err = os.WriteFile(configFile, []byte(content), 0o600); err != nil {
 		t.Errorf("Error writing auth config for TestGetHelperProviderFromDockerCfg: %s", err)
 	}
 

diff --git a/build_test.go b/build_test.go
@@ -8,7 +8,6 @@ import (
 	"bytes"
 	"errors"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -54,6 +53,9 @@ func TestBuildImageContextDirDockerignoreParsing(t *testing.T) {
 		}
 	}()
 	workingdir, err := os.Getwd()
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	var buf bytes.Buffer
 	opts := BuildImageOptions{
@@ -82,7 +84,7 @@ func TestBuildImageContextDirDockerignoreParsing(t *testing.T) {
 		}
 	}()
 
-	files, err := ioutil.ReadDir(tmpdir)
+	files, err := os.ReadDir(tmpdir)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -153,7 +155,7 @@ func TestBuildImageSendXRegistryConfig(t *testing.T) {
 }
 
 func unpackBodyTarball(req io.Reader) (tmpdir string, err error) {
-	tmpdir, err = ioutil.TempDir("", "go-dockerclient-test")
+	tmpdir, err = os.MkdirTemp("", "go-dockerclient-test")
 	if err != nil {
 		return
 	}

diff --git a/client.go b/client.go
@@ -17,7 +17,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/http/httputil"
@@ -240,19 +239,19 @@ func NewVersionedTLSClient(endpoint string, cert, key, ca, apiVersionString stri
 	var keyPEMBlock []byte
 	var caPEMCert []byte
 	if _, err := os.Stat(cert); !os.IsNotExist(err) {
-		certPEMBlock, err = ioutil.ReadFile(cert)
+		certPEMBlock, err = os.ReadFile(cert)
 		if err != nil {
 			return nil, err
 		}
 	}
 	if _, err := os.Stat(key); !os.IsNotExist(err) {
-		keyPEMBlock, err = ioutil.ReadFile(key)
+		keyPEMBlock, err = os.ReadFile(key)
 		if err != nil {
 			return nil, err
 		}
 	}
 	if _, err := os.Stat(ca); !os.IsNotExist(err) {
-		caPEMCert, err = ioutil.ReadFile(ca)
+		caPEMCert, err = os.ReadFile(ca)
 		if err != nil {
 			return nil, err
 		}
@@ -565,10 +564,10 @@ func (c *Client) streamURL(method, url string, streamOptions streamOptions) erro
 	protocol := c.endpointURL.Scheme
 	address := c.endpointURL.Path
 	if streamOptions.stdout == nil {
-		streamOptions.stdout = ioutil.Discard
+		streamOptions.stdout = io.Discard
 	}
 	if streamOptions.stderr == nil {
-		streamOptions.stderr = ioutil.Discard
+		streamOptions.stderr = io.Discard
 	}
 
 	if protocol == unixProtocol || protocol == namedPipeProtocol {
@@ -798,10 +797,10 @@ func (c *Client) hijack(method, path string, hijackOptions hijackOptions) (Close
 			// will "hang" until the container terminates, even though you're not reading
 			// stdout/stderr
 			if hijackOptions.stdout == nil {
-				hijackOptions.stdout = ioutil.Discard
+				hijackOptions.stdout = io.Discard
 			}
 			if hijackOptions.stderr == nil {
-				hijackOptions.stderr = ioutil.Discard
+				hijackOptions.stderr = io.Discard
 			}
 
 			go func() {
@@ -1024,7 +1023,7 @@ func newError(resp *http.Response) *Error {
 		Message string `json:"message"`
 	}
 	defer resp.Body.Close()
-	data, err := ioutil.ReadAll(resp.Body)
+	data, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return &Error{Status: resp.StatusCode, Message: fmt.Sprintf("cannot read body, err: %v", err)}
 	}

diff --git a/client_stress_test.go b/client_stress_test.go
@@ -9,9 +9,9 @@ package docker
 
 import (
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"reflect"
 	"sort"
 	"sync"
@@ -66,11 +66,11 @@ func TestClientDoConcurrentStress(t *testing.T) {
 			}
 			defer tt.srv.Close()
 			if tt.withTLSClient {
-				certPEMBlock, certErr := ioutil.ReadFile("testing/data/cert.pem")
+				certPEMBlock, certErr := os.ReadFile("testing/data/cert.pem")
 				if certErr != nil {
 					t.Fatal(certErr)
 				}
-				keyPEMBlock, certErr := ioutil.ReadFile("testing/data/key.pem")
+				keyPEMBlock, certErr := os.ReadFile("testing/data/key.pem")
 				if certErr != nil {
 					t.Fatal(certErr)
 				}

diff --git a/client_test.go b/client_test.go
@@ -10,7 +10,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -346,7 +345,7 @@ func TestGetFakeNativeURL(t *testing.T) {
 
 func TestError(t *testing.T) {
 	t.Parallel()
-	fakeBody := ioutil.NopCloser(bytes.NewBufferString("bad parameter"))
+	fakeBody := io.NopCloser(bytes.NewBufferString("bad parameter"))
 	resp := &http.Response{
 		StatusCode: 400,
 		Body:       fakeBody,
@@ -893,7 +892,7 @@ func (rt *FakeRoundTripper) RoundTrip(r *http.Request) (*http.Response, error) {
 	rt.requests = append(rt.requests, r)
 	res := &http.Response{
 		StatusCode: rt.status,
-		Body:       ioutil.NopCloser(body),
+		Body:       io.NopCloser(body),
 		Header:     make(http.Header),
 	}
 	for k, v := range rt.header {

diff --git a/client_unix_test.go b/client_unix_test.go
@@ -8,7 +8,7 @@
 package docker
 
 import (
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"net/http/httptest"
@@ -46,7 +46,7 @@ func TestNewTSLAPIClientUnixEndpoint(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	data, err := ioutil.ReadAll(rsp.Body)
+	data, err := io.ReadAll(rsp.Body)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -56,7 +56,7 @@ func TestNewTSLAPIClientUnixEndpoint(t *testing.T) {
 }
 
 func newNativeServer(handler http.Handler) (*httptest.Server, func(), error) {
-	tmpdir, err := ioutil.TempDir("", "socket")
+	tmpdir, err := os.MkdirTemp("", "socket")
 	if err != nil {
 		return nil, nil, err
 	}

diff --git a/container_commit_test.go b/container_commit_test.go
@@ -3,7 +3,7 @@ package docker
 import (
 	"bytes"
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"reflect"
 	"testing"
@@ -66,7 +66,7 @@ func TestCommitContainerParams(t *testing.T) {
 				t.Errorf("Wrong HTTP method. Want POST. Got %s.", meth)
 			}
 			if test.body != nil {
-				if requestBody, err := ioutil.ReadAll(fakeRT.requests[0].Body); err == nil {
+				if requestBody, err := io.ReadAll(fakeRT.requests[0].Body); err == nil {
 					if !bytes.Equal(requestBody, test.body) {
 						t.Errorf("Expected body %#v, got %#v", test.body, requestBody)
 					}

diff --git a/container_start_test.go b/container_start_test.go
@@ -3,7 +3,7 @@ package docker
 import (
 	"context"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"reflect"
@@ -57,7 +57,7 @@ func TestStartContainerHostConfigAPI124(t *testing.T) {
 		t.Errorf("StartContainer(%q): Unepected %q Content-Type in request.", id, contentType)
 	}
 	if req.Body != nil {
-		data, _ := ioutil.ReadAll(req.Body)
+		data, _ := io.ReadAll(req.Body)
 		t.Errorf("StartContainer(%q): Unexpected data sent: %s", id, data)
 	}
 }

diff --git a/container_unix_test.go b/container_unix_test.go
@@ -10,7 +10,6 @@ package docker
 import (
 	"bufio"
 	"bytes"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
@@ -54,7 +53,7 @@ func TestExportContainerViaUnixSocket(t *testing.T) {
 
 func TestStatsTimeoutUnixSocket(t *testing.T) {
 	t.Parallel()
-	tmpdir, err := ioutil.TempDir("", "socket")
+	tmpdir, err := os.MkdirTemp("", "socket")
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/event_test.go b/event_test.go
@@ -8,9 +8,9 @@ import (
 	"bufio"
 	"crypto/tls"
 	"crypto/x509"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"strings"
 	"testing"
 	"time"
@@ -33,7 +33,7 @@ func TestTLSEventListeners(t *testing.T) {
 			t.Fatalf("Error loading server key pair: %s", err)
 		}
 
-		caCert, err := ioutil.ReadFile("testing/data/ca.pem")
+		caCert, err := os.ReadFile("testing/data/ca.pem")
 		if err != nil {
 			t.Fatalf("Error loading ca certificate: %s", err)
 		}

diff --git a/image_test.go b/image_test.go
@@ -9,7 +9,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"net/url"
@@ -682,7 +682,7 @@ func TestImportImageFromInput(t *testing.T) {
 	if !reflect.DeepEqual(got, expected) {
 		t.Errorf("ImportImage: wrong query string. Want %#v. Got %#v.", expected, got)
 	}
-	body, err := ioutil.ReadAll(req.Body)
+	body, err := io.ReadAll(req.Body)
 	if err != nil {
 		t.Errorf("ImportImage: caugth error while reading body %#v", err.Error())
 	}
@@ -712,7 +712,7 @@ func TestImportImageDoesNotPassInputIfSourceIsNotDash(t *testing.T) {
 	if !reflect.DeepEqual(got, expected) {
 		t.Errorf("ImportImage: wrong query string. Want %#v. Got %#v.", expected, got)
 	}
-	body, err := ioutil.ReadAll(req.Body)
+	body, err := io.ReadAll(req.Body)
 	if err != nil {
 		t.Errorf("ImportImage: caugth error while reading body %#v", err.Error())
 	}
@@ -740,11 +740,11 @@ func TestImportImageShouldPassTarContentToBodyWhenSourceIsFilePath(t *testing.T)
 		t.Fatal(err)
 	}
 	req := fakeRT.requests[0]
-	tarContent, err := ioutil.ReadAll(tar)
+	tarContent, err := io.ReadAll(tar)
 	if err != nil {
 		t.Fatal(err)
 	}
-	body, err := ioutil.ReadAll(req.Body)
+	body, err := io.ReadAll(req.Body)
 	if err != nil {
 		t.Fatal(err)
 	}