Replace uses of the io/ioutil package (googleforgames#2752)

* Deprecate io/ioutil * Remove unnecessary linter rule
GonzaloSaez · Sep 26, 2022 · dc3eb37 · dc3eb37
1 parent c1b863e
commit dc3eb37
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 52 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -89,4 +89,3 @@ issues:
   exclude-use-default: false
   exclude:
     - Using the variable on range scope .* in function literal
-    - "SA1019: \"io/ioutil\" has been deprecated since Go 1.16"
diff --git a/cmd/allocator/main.go b/cmd/allocator/main.go
@@ -18,7 +18,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
@@ -574,17 +573,17 @@ func getCACertPool(path string) (*x509.CertPool, error) {
 	// Add all certificates under client-certs path because there could be multiple clusters
 	// and all client certs should be added.
 	caCertPool := x509.NewCertPool()
-	filesInfo, err := ioutil.ReadDir(path)
+	dirEntries, err := os.ReadDir(path)
 	if err != nil {
 		return nil, fmt.Errorf("error reading certs from dir %s: %s", path, err.Error())
 	}
 
-	for _, file := range filesInfo {
-		if !strings.HasSuffix(file.Name(), ".crt") && !strings.HasSuffix(file.Name(), ".pem") {
+	for _, dirEntry := range dirEntries {
+		if !strings.HasSuffix(dirEntry.Name(), ".crt") && !strings.HasSuffix(dirEntry.Name(), ".pem") {
 			continue
 		}
-		certFile := filepath.Join(path, file.Name())
-		caCert, err := ioutil.ReadFile(certFile)
+		certFile := filepath.Join(path, dirEntry.Name())
+		caCert, err := os.ReadFile(certFile)
 		if err != nil {
 			logger.Errorf("CA cert is not readable or missing: %s", err.Error())
 			continue

diff --git a/examples/allocator-client/main.go b/examples/allocator-client/main.go
@@ -20,7 +20,7 @@ import (
 	"crypto/x509"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	pb "agones.dev/agones/pkg/allocation/go"
 	"github.com/pkg/errors"
@@ -40,15 +40,15 @@ func main() {
 	flag.Parse()
 
 	endpoint := *externalIP + ":" + *port
-	cert, err := ioutil.ReadFile(*certFile)
+	cert, err := os.ReadFile(*certFile)
 	if err != nil {
 		panic(err)
 	}
-	key, err := ioutil.ReadFile(*keyFile)
+	key, err := os.ReadFile(*keyFile)
 	if err != nil {
 		panic(err)
 	}
-	cacert, err := ioutil.ReadFile(*cacertFile)
+	cacert, err := os.ReadFile(*cacertFile)
 	if err != nil {
 		panic(err)
 	}

diff --git a/examples/autoscaler-webhook/main.go b/examples/autoscaler-webhook/main.go
@@ -12,14 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//Autoscaler webhook server which handles FleetAutoscaleReview json payload
+// Autoscaler webhook server which handles FleetAutoscaleReview json payload
 package main
 
 import (
 	"encoding/json"
 	"flag"
 	"io"
-	"io/ioutil"
 	"math"
 	"net/http"
 	"os"
@@ -137,7 +136,7 @@ func handleAutoscale(w http.ResponseWriter, r *http.Request) {
 	}
 
 	var faReq autoscalingv1.FleetAutoscaleReview
-	res, err := ioutil.ReadAll(r.Body)
+	res, err := io.ReadAll(r.Body)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 	}

diff --git a/pkg/fleetautoscalers/fleetautoscalers.go b/pkg/fleetautoscalers/fleetautoscalers.go
@@ -21,7 +21,7 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"math"
 	"net/http"
 	"net/url"
@@ -173,7 +173,7 @@ func applyWebhookPolicy(w *autoscalingv1.WebhookPolicy, f *agonesv1.Fleet) (repl
 	if res.StatusCode != http.StatusOK {
 		return 0, false, fmt.Errorf("bad status code %d from the server: %s", res.StatusCode, u.String())
 	}
-	result, err := ioutil.ReadAll(res.Body)
+	result, err := io.ReadAll(res.Body)
 	if err != nil {
 		return 0, false, err
 	}

diff --git a/pkg/fleetautoscalers/fleetautoscalers_test.go b/pkg/fleetautoscalers/fleetautoscalers_test.go
@@ -20,7 +20,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -46,7 +45,7 @@ func (t testServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	var faRequest autoscalingv1.FleetAutoscaleReview
 
-	res, err := ioutil.ReadAll(r.Body)
+	res, err := io.ReadAll(r.Body)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return

diff --git a/pkg/gameserverallocations/controller.go b/pkg/gameserverallocations/controller.go
@@ -16,7 +16,7 @@ package gameserverallocations
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 	"mime"
 	"net/http"
 	"time"
@@ -172,7 +172,7 @@ func (c *Controller) allocationDeserialization(r *http.Request, namespace string
 		return gsa, errors.New("Could not find deserializer")
 	}
 
-	b, err := ioutil.ReadAll(r.Body)
+	b, err := io.ReadAll(r.Body)
 	if err != nil {
 		return gsa, errors.Wrap(err, "could not read body")
 	}

diff --git a/pkg/sdkserver/helper_test.go b/pkg/sdkserver/helper_test.go
@@ -17,7 +17,6 @@ package sdkserver
 import (
 	"context"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"testing"
 	"time"
@@ -42,7 +41,7 @@ func testHTTPHealth(t *testing.T, url string, expectedResponse string, expectedS
 		assert.NotNil(t, resp)
 		if resp != nil {
 			defer resp.Body.Close() // nolint: errcheck
-			body, err := ioutil.ReadAll(resp.Body)
+			body, err := io.ReadAll(resp.Body)
 			assert.Nil(t, err, "(%s) read response error should be nil: %v", url, err)
 			assert.Equal(t, expectedStatus, resp.StatusCode, "url: %s", url)
 			assert.Equal(t, []byte(expectedResponse), body, "(%s) response body should be '%s'", url, expectedResponse)

diff --git a/pkg/sdkserver/localsdk_test.go b/pkg/sdkserver/localsdk_test.go
@@ -18,7 +18,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strconv"
 	"sync"
@@ -309,7 +308,7 @@ func TestLocalSDKServerWatchGameServer(t *testing.T) {
 	j, err := json.Marshal(fixture)
 	assert.Nil(t, err)
 
-	err = ioutil.WriteFile(path, j, os.ModeDevice)
+	err = os.WriteFile(path, j, os.ModeDevice)
 	assert.Nil(t, err)
 
 	assertWatchUpdate(t, stream, "bar", func(gs *sdk.GameServer) interface{} {
@@ -705,7 +704,7 @@ func TestAlphaSDKConformanceFunctionality(t *testing.T) {
 }
 
 func gsToTmpFile(gs *agonesv1.GameServer) (string, error) {
-	file, err := ioutil.TempFile(os.TempDir(), "gameserver-")
+	file, err := os.CreateTemp(os.TempDir(), "gameserver-")
 	if err != nil {
 		return file.Name(), err
 	}

diff --git a/pkg/util/apiserver/apiserver_test.go b/pkg/util/apiserver/apiserver_test.go
@@ -16,7 +16,7 @@ package apiserver
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -148,7 +148,7 @@ func TestAPIServerAddAPIResourceDiscovery(t *testing.T) {
 		assert.Equal(t, "application/vnd.kubernetes.protobuf", resp.Header.Get("Content-Type"))
 
 		list := &metav1.APIResourceList{}
-		b, err := ioutil.ReadAll(resp.Body)
+		b, err := io.ReadAll(resp.Body)
 		assert.NoError(t, err)
 
 		info, ok := k8sruntime.SerializerInfoForMediaType(Codecs.SupportedMediaTypes(), "application/vnd.kubernetes.protobuf")

diff --git a/pkg/util/https/https.go b/pkg/util/https/https.go
@@ -15,7 +15,7 @@
 package https
 
 import (
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	"agones.dev/agones/pkg/util/runtime"
@@ -30,7 +30,7 @@ type ErrorHandlerFunc func(http.ResponseWriter, *http.Request) error
 // FourZeroFour is the standard 404 handler.
 func FourZeroFour(logger *logrus.Entry, w http.ResponseWriter, r *http.Request) {
 	f := ErrorHTTPHandler(logger, func(writer http.ResponseWriter, request *http.Request) error {
-		body, err := ioutil.ReadAll(r.Body)
+		body, err := io.ReadAll(r.Body)
 		if err != nil {
 			return errors.Wrap(err, "error in default handler")
 		}

diff --git a/pkg/util/webhooks/webhooks_test.go b/pkg/util/webhooks/webhooks_test.go
@@ -17,7 +17,7 @@ package webhooks
 import (
 	"bytes"
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -217,7 +217,7 @@ func TestWebHookFleetValidationHandler(t *testing.T) {
 			assert.Nil(t, err)
 			defer resp.Body.Close() // nolint: errcheck
 			assert.Equal(t, http.StatusOK, resp.StatusCode)
-			body, err := ioutil.ReadAll(resp.Body)
+			body, err := io.ReadAll(resp.Body)
 			assert.Nil(t, err)
 
 			expected := "cannot unmarshal bool into Go struct field Container.spec.template.spec.template.spec.containers.name of type string"

diff --git a/pkg/util/workerqueue/workerqueue_test.go b/pkg/util/workerqueue/workerqueue_test.go
@@ -16,7 +16,7 @@ package workerqueue
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -139,7 +139,7 @@ func TestWorkQueueHealthCheck(t *testing.T) {
 				return false, nil
 			}
 
-			body, err := ioutil.ReadAll(resp.Body)
+			body, err := io.ReadAll(resp.Body)
 			assert.Nil(t, err)
 			assert.Equal(t, status, resp.StatusCode)
 			assert.Equal(t, []byte("{}\n"), body)

diff --git a/site/handler_test.go b/site/handler_test.go
@@ -16,7 +16,7 @@ package main
 
 import (
 	"bytes"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"sort"
@@ -111,7 +111,7 @@ func TestHandler(t *testing.T) {
 			t.Errorf("%s: http.Get: %v", test.name, err)
 			continue
 		}
-		data, err := ioutil.ReadAll(resp.Body)
+		data, err := io.ReadAll(resp.Body)
 		if err != nil {
 			t.Errorf("Could not read all: %s", err)
 			continue

diff --git a/site/main.go b/site/main.go
@@ -16,7 +16,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -40,7 +39,7 @@ func main() {
 	}
 	log.Printf("loading: %s", configPath)
 
-	vanity, err := ioutil.ReadFile(configPath)
+	vanity, err := os.ReadFile(configPath)
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/test/e2e/allocator_test.go b/test/e2e/allocator_test.go
@@ -25,7 +25,7 @@ import (
 	"encoding/json"
 	"encoding/pem"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"math/big"
 	"net"
 	"net/http"
@@ -291,7 +291,7 @@ func TestRestAllocatorWithDeprecatedRequired(t *testing.T) {
 			logrus.WithError(err).Info("failed Allocate rest request")
 			return false, nil
 		}
-		body, err := ioutil.ReadAll(resp.Body)
+		body, err := io.ReadAll(resp.Body)
 		if err != nil {
 			logrus.WithError(err).Info("failed to read Allocate response body")
 			return false, nil
@@ -355,7 +355,7 @@ func TestRestAllocatorWithSelectors(t *testing.T) {
 			logrus.WithError(err).Info("failed Allocate rest request")
 			return false, nil
 		}
-		body, err := ioutil.ReadAll(resp.Body)
+		body, err := io.ReadAll(resp.Body)
 		if err != nil {
 			logrus.WithError(err).Info("failed to read Allocate response body")
 			return false, nil

diff --git a/test/e2e/gameserver_test.go b/test/e2e/gameserver_test.go
@@ -18,8 +18,8 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
 	"net"
+	"os"
 	"os/exec"
 	"strings"
 	"sync/atomic"
@@ -928,7 +928,7 @@ spec:
         - name: simple-game-server
           image: gcr.io/agones-images/simple-game-server:0.14
 `
-	err := ioutil.WriteFile("/tmp/invalid.yaml", []byte(gsYaml), 0o644)
+	err := os.WriteFile("/tmp/invalid.yaml", []byte(gsYaml), 0o644)
 	require.NoError(t, err)
 
 	cmd := exec.Command("kubectl", "apply", "-f", "/tmp/invalid.yaml")

diff --git a/test/e2e/ping_test.go b/test/e2e/ping_test.go
@@ -17,7 +17,7 @@ package e2e
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 
@@ -52,7 +52,7 @@ func TestPingHTTP(t *testing.T) {
 	defer response.Body.Close() // nolint: errcheck
 
 	assert.Equal(t, http.StatusOK, response.StatusCode)
-	body, err := ioutil.ReadAll(response.Body)
+	body, err := io.ReadAll(response.Body)
 	assert.Nil(t, err)
 	assert.Equal(t, []byte("ok"), body)
 }

diff --git a/test/load/allocation/grpc/allocationload.go b/test/load/allocation/grpc/allocationload.go
@@ -21,7 +21,7 @@ import (
 	"crypto/x509"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"sync"
 	"time"
 
@@ -45,15 +45,15 @@ func main() {
 	flag.Parse()
 
 	endpoint := *externalIP + ":" + *port
-	cert, err := ioutil.ReadFile(*certFile)
+	cert, err := os.ReadFile(*certFile)
 	if err != nil {
 		panic(err)
 	}
-	key, err := ioutil.ReadFile(*keyFile)
+	key, err := os.ReadFile(*keyFile)
 	if err != nil {
 		panic(err)
 	}
-	cacert, err := ioutil.ReadFile(*cacertFile)
+	cacert, err := os.ReadFile(*cacertFile)
 	if err != nil {
 		panic(err)
 	}