refactor: move from io/ioutil to io and os package

The io/ioutil package has been deprecated as of Go 1.16, see https://golang.org/doc/go1.16#ioutil. This commit replaces the existing io/ioutil functions with their new definitions in io and os packages. Signed-off-by: Eng Zer Jun <[email protected]>
yogorobot · Oct 18, 2021 · d7ab773 · d7ab773
1 parent c062121
commit d7ab773
Show file tree

Hide file tree

Showing 34 changed files with 82 additions and 93 deletions.
diff --git a/pkg/components/standalone_loader.go b/pkg/components/standalone_loader.go
@@ -8,7 +8,7 @@ package components
 import (
 	"bufio"
 	"bytes"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -38,7 +38,7 @@ func NewStandaloneComponents(configuration config.StandaloneConfig) *StandaloneC
 
 // LoadComponents loads dapr components from a given directory.
 func (s *StandaloneComponents) LoadComponents() ([]components_v1alpha1.Component, error) {
-	files, err := ioutil.ReadDir(s.config.ComponentsPath)
+	files, err := os.ReadDir(s.config.ComponentsPath)
 	if err != nil {
 		return nil, err
 	}
@@ -63,7 +63,7 @@ func (s *StandaloneComponents) loadComponentsFromFile(filename string) []compone
 	components := []components_v1alpha1.Component{}
 	path := filepath.Join(s.config.ComponentsPath, filename)
 
-	b, err := ioutil.ReadFile(path)
+	b, err := os.ReadFile(path)
 	if err != nil {
 		log.Warnf("daprd load components error when reading file %s : %s", path, err)
 		return components

diff --git a/pkg/config/configuration.go b/pkg/config/configuration.go
@@ -8,7 +8,6 @@ package config
 import (
 	"context"
 	"encoding/json"
-	"io/ioutil"
 	"os"
 	"sort"
 	"strings"
@@ -220,7 +219,7 @@ func LoadStandaloneConfiguration(config string) (*Configuration, string, error)
 		return nil, "", err
 	}
 
-	b, err := ioutil.ReadFile(config)
+	b, err := os.ReadFile(config)
 	if err != nil {
 		return nil, "", err
 	}

diff --git a/pkg/credentials/certchain.go b/pkg/credentials/certchain.go
@@ -1,7 +1,7 @@
 package credentials
 
 import (
-	"io/ioutil"
+	"os"
 )
 
 const (
@@ -22,15 +22,15 @@ type CertChain struct {
 
 // LoadFromDisk retruns a CertChain from a given directory.
 func LoadFromDisk(rootCertPath, issuerCertPath, issuerKeyPath string) (*CertChain, error) {
-	rootCert, err := ioutil.ReadFile(rootCertPath)
+	rootCert, err := os.ReadFile(rootCertPath)
 	if err != nil {
 		return nil, err
 	}
-	cert, err := ioutil.ReadFile(issuerCertPath)
+	cert, err := os.ReadFile(issuerCertPath)
 	if err != nil {
 		return nil, err
 	}
-	key, err := ioutil.ReadFile(issuerKeyPath)
+	key, err := os.ReadFile(issuerKeyPath)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/http/api_test.go b/pkg/http/api_test.go
@@ -11,7 +11,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	gohttp "net/http"
 	"os"
@@ -2185,7 +2185,7 @@ func (f *fakeHTTPServer) doRequest(basicAuth, method, path string, body []byte,
 		panic(fmt.Errorf("failed to request: %v", err))
 	}
 
-	bodyBytes, _ := ioutil.ReadAll(res.Body)
+	bodyBytes, _ := io.ReadAll(res.Body)
 	defer res.Body.Close()
 	response := fakeHTTPResponse{
 		StatusCode:  res.StatusCode,

diff --git a/pkg/injector/injector.go b/pkg/injector/injector.go
@@ -9,7 +9,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"time"
 
@@ -172,7 +172,7 @@ func (i *injector) handleRequest(w http.ResponseWriter, r *http.Request) {
 
 	var body []byte
 	if r.Body != nil {
-		if data, err := ioutil.ReadAll(r.Body); err == nil {
+		if data, err := io.ReadAll(r.Body); err == nil {
 			body = data
 		}
 	}

diff --git a/pkg/injector/injector_test.go b/pkg/injector/injector_test.go
@@ -8,7 +8,7 @@ package injector
 import (
 	"bytes"
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -615,7 +615,7 @@ func TestHandleRequest(t *testing.T) {
 			assert.Equal(t, tc.expectStatusCode, resp.StatusCode)
 
 			if resp.StatusCode == http.StatusOK {
-				body, err := ioutil.ReadAll(resp.Body)
+				body, err := io.ReadAll(resp.Body)
 				assert.NoError(t, err)
 
 				var ar v1.AdmissionReview

diff --git a/pkg/placement/raft/fsm_test.go b/pkg/placement/raft/fsm_test.go
@@ -7,7 +7,7 @@ package raft
 
 import (
 	"bytes"
-	"io/ioutil"
+	"io"
 	"testing"
 
 	"github.com/hashicorp/raft"
@@ -81,7 +81,7 @@ func TestRestore(t *testing.T) {
 	assert.NoError(t, err)
 
 	// act
-	err = fsm.Restore(ioutil.NopCloser(buf))
+	err = fsm.Restore(io.NopCloser(buf))
 
 	// assert
 	assert.NoError(t, err)

diff --git a/pkg/placement/raft/logger.go b/pkg/placement/raft/logger.go
@@ -7,7 +7,6 @@ package raft
 
 import (
 	"io"
-	"io/ioutil"
 	"log"
 
 	"github.com/hashicorp/go-hclog"
@@ -84,5 +83,5 @@ func (l *loggerAdapter) StandardLogger(opts *hclog.StandardLoggerOptions) *log.L
 }
 
 func (l *loggerAdapter) StandardWriter(opts *hclog.StandardLoggerOptions) io.Writer {
-	return ioutil.Discard
+	return io.Discard
 }
diff --git a/pkg/runtime/pubsub/subscriptions.go b/pkg/runtime/pubsub/subscriptions.go
@@ -3,7 +3,6 @@ package pubsub
 import (
 	"context"
 	"encoding/json"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -175,7 +174,7 @@ func DeclarativeSelfHosted(componentsPath string, log logger.Logger) []Subscript
 		return subs
 	}
 
-	files, err := ioutil.ReadDir(componentsPath)
+	files, err := os.ReadDir(componentsPath)
 	if err != nil {
 		log.Errorf("failed to read subscriptions from path %s: %s", err)
 		return subs
@@ -184,7 +183,7 @@ func DeclarativeSelfHosted(componentsPath string, log logger.Logger) []Subscript
 	for _, f := range files {
 		if !f.IsDir() {
 			filePath := filepath.Join(componentsPath, f.Name())
-			b, err := ioutil.ReadFile(filePath)
+			b, err := os.ReadFile(filePath)
 			if err != nil {
 				log.Errorf("failed to read file %s: %s", filePath, err)
 				continue

diff --git a/pkg/runtime/pubsub/subscriptions_test.go b/pkg/runtime/pubsub/subscriptions_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -108,7 +107,7 @@ func testDeclarativeSubscriptionV2() subscriptionsapi_v2alpha1.Subscription {
 
 func writeSubscriptionToDisk(subscription interface{}, filePath string) {
 	b, _ := yaml.Marshal(subscription)
-	ioutil.WriteFile(filePath, b, 0600)
+	os.WriteFile(filePath, b, 0600)
 }
 
 func TestDeclarativeSubscriptionsV1(t *testing.T) {

diff --git a/pkg/runtime/runtime_test.go b/pkg/runtime/runtime_test.go
@@ -11,7 +11,6 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/http/httptest"
@@ -207,7 +206,7 @@ func testDeclarativeSubscription() subscriptionsapi.Subscription {
 
 func writeSubscriptionToDisk(subscription subscriptionsapi.Subscription, filePath string) {
 	b, _ := yaml.Marshal(subscription)
-	ioutil.WriteFile(filePath, b, 0600)
+	os.WriteFile(filePath, b, 0600)
 }
 
 func TestProcessComponentsAndDependents(t *testing.T) {

diff --git a/pkg/runtime/security/auth.go b/pkg/runtime/security/auth.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"crypto/x509"
 	"encoding/pem"
-	"io/ioutil"
 	"os"
 	"sync"
 	"time"
@@ -155,7 +154,7 @@ func (a *authenticator) CreateSignedWorkloadCert(id, namespace, trustDomain stri
 
 // currently we support Kubernetes identities.
 func getToken() string {
-	b, _ := ioutil.ReadFile(kubeTknPath)
+	b, _ := os.ReadFile(kubeTknPath)
 	return string(b)
 }
 

diff --git a/pkg/runtime/wait.go b/pkg/runtime/wait.go
@@ -7,7 +7,7 @@ package runtime
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"time"
 )
@@ -59,7 +59,7 @@ func checkIfOutboundReady(client *http.Client, outboundReadyHealthURL string) er
 		return err
 	}
 	defer func() { _ = resp.Body.Close() }()
-	_, err = ioutil.ReadAll(resp.Body)
+	_, err = io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/sentry/ca/certificate_authority_test.go b/pkg/sentry/ca/certificate_authority_test.go
@@ -8,7 +8,6 @@ import (
 	"crypto/x509/pkix"
 	"encoding/asn1"
 	"encoding/pem"
-	"io/ioutil"
 	"os"
 	"strings"
 	"sync"
@@ -80,11 +79,10 @@ func getTestCertAuth() CertificateAuthority {
 	return certAuth
 }
 
-// nolint:gosec
 func writeTestCredentialsToDisk() {
-	ioutil.WriteFile("ca.crt", []byte(rootCert), 0644)
-	ioutil.WriteFile("issuer.crt", []byte(issuerCert), 0644)
-	ioutil.WriteFile("issuer.key", []byte(issuerKey), 0644)
+	os.WriteFile("ca.crt", []byte(rootCert), 0644)
+	os.WriteFile("issuer.crt", []byte(issuerCert), 0644)
+	os.WriteFile("issuer.key", []byte(issuerKey), 0644)
 }
 
 func cleanupCredentials() {

diff --git a/pkg/sentry/certs/store.go b/pkg/sentry/certs/store.go
@@ -2,7 +2,6 @@ package certs
 
 import (
 	"context"
-	"io/ioutil"
 	"os"
 
 	"github.com/pkg/errors"
@@ -82,17 +81,17 @@ func CredentialsExist(conf config.SentryConfig) (bool, error) {
 
 /* #nosec. */
 func storeSelfhosted(rootCertPem, issuerCertPem, issuerKeyPem []byte, rootCertPath, issuerCertPath, issuerKeyPath string) error {
-	err := ioutil.WriteFile(rootCertPath, rootCertPem, 0644)
+	err := os.WriteFile(rootCertPath, rootCertPem, 0644)
 	if err != nil {
 		return errors.Wrapf(err, "failed saving file to %s", rootCertPath)
 	}
 
-	err = ioutil.WriteFile(issuerCertPath, issuerCertPem, 0644)
+	err = os.WriteFile(issuerCertPath, issuerCertPem, 0644)
 	if err != nil {
 		return errors.Wrapf(err, "failed saving file to %s", issuerCertPath)
 	}
 
-	err = ioutil.WriteFile(issuerKeyPath, issuerKeyPem, 0644)
+	err = os.WriteFile(issuerKeyPath, issuerKeyPem, 0644)
 	if err != nil {
 		return errors.Wrapf(err, "failed saving file to %s", issuerKeyPath)
 	}

diff --git a/pkg/testing/app_mock.go b/pkg/testing/app_mock.go
@@ -10,7 +10,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"os"
@@ -87,7 +87,7 @@ func (a *MockApp) handler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	defer r.Body.Close()
-	body, _ := ioutil.ReadAll(r.Body)
+	body, _ := io.ReadAll(r.Body)
 
 	var msg Event
 	if err := json.Unmarshal(body, &msg); err != nil {

diff --git a/tests/apps/actorapp/app.go b/tests/apps/actorapp/app.go
@@ -9,7 +9,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"sync"
@@ -181,7 +181,7 @@ func testCallActorHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	defer res.Body.Close()
-	body, err := ioutil.ReadAll(res.Body)
+	body, err := io.ReadAll(res.Body)
 	if err != nil {
 		log.Printf("Could not read actor's test response: %s", err.Error())
 		w.WriteHeader(http.StatusInternalServerError)

diff --git a/tests/apps/actorclientapp/app.go b/tests/apps/actorclientapp/app.go
@@ -9,7 +9,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"time"
@@ -97,7 +97,7 @@ func httpCall(method string, url string, requestBody interface{}, expectedHTTPSt
 		return nil, t
 	}
 
-	resBody, err := ioutil.ReadAll(res.Body)
+	resBody, err := io.ReadAll(res.Body)
 	if err != nil {
 		return nil, err
 	}

diff --git a/tests/apps/actorfeatures/app.go b/tests/apps/actorfeatures/app.go
@@ -10,7 +10,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"os"
@@ -304,7 +304,7 @@ func testCallActorHandler(w http.ResponseWriter, r *http.Request) {
 	case "timers":
 		fallthrough
 	case "reminders":
-		body, err := ioutil.ReadAll(r.Body)
+		body, err := io.ReadAll(r.Body)
 		defer r.Body.Close()
 		if err != nil {
 			log.Printf("Could not get reminder request: %s", err.Error())
@@ -517,7 +517,7 @@ func httpCall(method string, url string, requestBody interface{}, expectedHTTPSt
 	defer res.Body.Close()
 
 	if res.StatusCode != expectedHTTPStatusCode {
-		errBody, err := ioutil.ReadAll(res.Body)
+		errBody, err := io.ReadAll(res.Body)
 		if err == nil {
 			t := fmt.Errorf("Expected http status %d, received %d, payload ='%s'", expectedHTTPStatusCode, res.StatusCode, string(errBody))
 			return nil, t
@@ -527,7 +527,7 @@ func httpCall(method string, url string, requestBody interface{}, expectedHTTPSt
 		return nil, t
 	}
 
-	resBody, err := ioutil.ReadAll(res.Body)
+	resBody, err := io.ReadAll(res.Body)
 	if err != nil {
 		return nil, err
 	}