refactor: move away from ioutil (deprecated)

6 files changed, 17 insertions, 19 deletions

diff --git a/client/client_test.go b/client/client_test.go
index f2ecd6c..48681f7 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -5,7 +5,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"path"
 	"strings"
@@ -83,7 +83,7 @@ func testSuccessfulGet(t *testing.T, client *GitlabNetClient) {
 
 		defer response.Body.Close()
 
-		responseBody, err := ioutil.ReadAll(response.Body)
+		responseBody, err := io.ReadAll(response.Body)
 		require.NoError(t, err)
 		require.Equal(t, string(responseBody), "Hello")
 	})
@@ -99,7 +99,7 @@ func testSuccessfulPost(t *testing.T, client *GitlabNetClient) {
 
 		defer response.Body.Close()
 
-		responseBody, err := ioutil.ReadAll(response.Body)
+		responseBody, err := io.ReadAll(response.Body)
 		require.NoError(t, err)
 		require.Equal(t, "Echo: {\"key\":\"value\"}", string(responseBody))
 	})
@@ -155,7 +155,7 @@ func testAuthenticationHeader(t *testing.T, client *GitlabNetClient) {
 
 		defer response.Body.Close()
 
-		responseBody, err := ioutil.ReadAll(response.Body)
+		responseBody, err := io.ReadAll(response.Body)
 		require.NoError(t, err)
 
 		header, err := base64.StdEncoding.DecodeString(string(responseBody))
@@ -170,7 +170,7 @@ func testAuthenticationHeader(t *testing.T, client *GitlabNetClient) {
 
 		defer response.Body.Close()
 
-		responseBody, err := ioutil.ReadAll(response.Body)
+		responseBody, err := io.ReadAll(response.Body)
 		require.NoError(t, err)
 
 		header, err := base64.StdEncoding.DecodeString(string(responseBody))
@@ -194,7 +194,7 @@ func buildRequests(t *testing.T, relativeURLRoot string) []testserver.TestReques
 			Handler: func(w http.ResponseWriter, r *http.Request) {
 				require.Equal(t, http.MethodPost, r.Method)
 
-				b, err := ioutil.ReadAll(r.Body)
+				b, err := io.ReadAll(r.Body)
 				defer r.Body.Close()
 
 				require.NoError(t, err)
diff --git a/client/httpclient.go b/client/httpclient.go
index a2ecfd0..72238f8 100644
--- a/client/httpclient.go
+++ b/client/httpclient.go
@@ -6,7 +6,6 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
@@ -139,7 +138,7 @@ func buildHttpsTransport(hcc httpClientCfg, selfSignedCert bool, gitlabURL strin
 	}
 
 	if hcc.caPath != "" {
-		fis, _ := ioutil.ReadDir(hcc.caPath)
+		fis, _ := os.ReadDir(hcc.caPath)
 		for _, fi := range fis {
 			if fi.IsDir() {
 				continue
@@ -171,7 +170,7 @@ func buildHttpsTransport(hcc httpClientCfg, selfSignedCert bool, gitlabURL strin
 }
 
 func addCertToPool(certPool *x509.CertPool, fileName string) {
-	cert, err := ioutil.ReadFile(fileName)
+	cert, err := os.ReadFile(fileName)
 	if err == nil {
 		certPool.AppendCertsFromPEM(cert)
 	}
diff --git a/client/httpclient_test.go b/client/httpclient_test.go
index f3643a0..f7a6340 100644
--- a/client/httpclient_test.go
+++ b/client/httpclient_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 	"testing"
@@ -64,7 +64,7 @@ func testBasicAuthHeaders(t *testing.T, response *http.Response) {
 	defer response.Body.Close()
 
 	require.NotNil(t, response)
-	responseBody, err := ioutil.ReadAll(response.Body)
+	responseBody, err := io.ReadAll(response.Body)
 	require.NoError(t, err)
 
 	headerParts := strings.Split(string(responseBody), " ")
diff --git a/client/httpsclient_test.go b/client/httpsclient_test.go
index be1d49c..d2c2293 100644
--- a/client/httpsclient_test.go
+++ b/client/httpsclient_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"path"
 	"testing"
@@ -57,7 +57,7 @@ func TestSuccessfulRequests(t *testing.T) {
 
 			defer response.Body.Close()
 
-			responseBody, err := ioutil.ReadAll(response.Body)
+			responseBody, err := io.ReadAll(response.Body)
 			require.NoError(t, err)
 			require.Equal(t, string(responseBody), "Hello")
 		})
diff --git a/client/testserver/gitalyserver.go b/client/testserver/gitalyserver.go
index d2b3767..7159d16 100644
--- a/client/testserver/gitalyserver.go
+++ b/client/testserver/gitalyserver.go
@@ -1,7 +1,6 @@
 package testserver
 
 import (
-	"io/ioutil"
 	"net"
 	"os"
 	"path"
@@ -61,7 +60,7 @@ func (s *TestGitalyServer) SSHUploadArchive(stream pb.SSHService_SSHUploadArchiv
 func StartGitalyServer(t *testing.T) (string, *TestGitalyServer) {
 	t.Helper()
 
-	tempDir, _ := ioutil.TempDir("", "gitlab-shell-test-api")
+	tempDir, _ := os.MkdirTemp("", "gitlab-shell-test-api")
 	gitalySocketPath := path.Join(tempDir, "gitaly.sock")
 	t.Cleanup(func() { os.RemoveAll(tempDir) })
 
diff --git a/client/testserver/testserver.go b/client/testserver/testserver.go
index 0667cd4..c263aa0 100644
--- a/client/testserver/testserver.go
+++ b/client/testserver/testserver.go
@@ -3,7 +3,7 @@ package testserver
 import (
 	"crypto/tls"
 	"crypto/x509"
-	"io/ioutil"
+	"io"
 	"log"
 	"net"
 	"net/http"
@@ -18,7 +18,7 @@ import (
 )
 
 var (
-	tempDir, _ = ioutil.TempDir("", "gitlab-shell-test-api")
+	tempDir, _ = os.MkdirTemp("", "gitlab-shell-test-api")
 	testSocket = path.Join(tempDir, "internal.sock")
 )
 
@@ -41,7 +41,7 @@ func StartSocketHttpServer(t *testing.T, handlers []TestRequestHandler) string {
 		Handler: buildHandler(handlers),
 		// We'll put this server through some nasty stuff we don't want
 		// in our test output
-		ErrorLog: log.New(ioutil.Discard, "", 0),
+		ErrorLog: log.New(io.Discard, "", 0),
 	}
 	go server.Serve(socketListener)
 
@@ -76,7 +76,7 @@ func StartHttpsServer(t *testing.T, handlers []TestRequestHandler, clientCAPath
 	server.TLS.BuildNameToCertificate()
 
 	if clientCAPath != "" {
-		caCert, err := ioutil.ReadFile(clientCAPath)
+		caCert, err := os.ReadFile(clientCAPath)
 		require.NoError(t, err)
 
 		caCertPool := x509.NewCertPool()