replace ioutil with io and os (#2327)

set the go version to 1.16 in pr.yml and tests.yml, so as to be consistent with the version in go.mod.
micro · Oct 30, 2021 · 5d5aee1 · 5d5aee1
1 parent ed690ed
commit 5d5aee1
Show file tree

Hide file tree

Showing 36 changed files with 84 additions and 95 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -8,10 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.15
+    - name: Set up Go 1.16
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
       id: go
 
     - name: Check out code into the Go module directory

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,10 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.15
+    - name: Set up Go 1.16
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
       id: go
 
     - name: Check out code into the Go module directory

diff --git a/api/server/http/http_test.go b/api/server/http/http_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"go-micro.dev/v4/api/server"
 	"go-micro.dev/v4/api/server/cors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 )
@@ -28,7 +28,7 @@ func TestHTTPServer(t *testing.T) {
 	}
 	defer rsp.Body.Close()
 
-	b, err := ioutil.ReadAll(rsp.Body)
+	b, err := io.ReadAll(rsp.Body)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -73,7 +73,7 @@ func TestCORSHTTPServer(t *testing.T) {
 	}
 	defer rsp.Body.Close()
 
-	b, err := ioutil.ReadAll(rsp.Body)
+	b, err := io.ReadAll(rsp.Body)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/broker/http.go b/broker/http.go
@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"net"
 	"net/http"
@@ -300,7 +299,7 @@ func (h *httpBroker) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 
 	req.ParseForm()
 
-	b, err := ioutil.ReadAll(req.Body)
+	b, err := io.ReadAll(req.Body)
 	if err != nil {
 		errr := merr.InternalServerError("go.micro.broker", "Error reading request body: %v", err)
 		w.WriteHeader(500)
@@ -558,7 +557,7 @@ func (h *httpBroker) Publish(topic string, msg *Message, opts ...PublishOption)
 		}
 
 		// discard response body
-		io.Copy(ioutil.Discard, r.Body)
+		io.Copy(io.Discard, r.Body)
 		r.Body.Close()
 		return nil
 	}

diff --git a/cmd/protoc-gen-micro/main.go b/cmd/protoc-gen-micro/main.go
@@ -49,7 +49,7 @@
 package main
 
 import (
-	"io/ioutil"
+	"io"
 	"os"
 
 	"go-micro.dev/v4/cmd/protoc-gen-micro/generator"
@@ -63,7 +63,7 @@ func main() {
 	// report failure.
 	g := generator.New()
 
-	data, err := ioutil.ReadAll(os.Stdin)
+	data, err := io.ReadAll(os.Stdin)
 	if err != nil {
 		g.Error(err, "reading input")
 	}

diff --git a/codec/bytes/bytes.go b/codec/bytes/bytes.go
@@ -4,7 +4,6 @@ package bytes
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 
 	"go-micro.dev/v4/codec"
 )
@@ -24,7 +23,7 @@ func (c *Codec) ReadHeader(m *codec.Message, t codec.MessageType) error {
 
 func (c *Codec) ReadBody(b interface{}) error {
 	// read bytes
-	buf, err := ioutil.ReadAll(c.Conn)
+	buf, err := io.ReadAll(c.Conn)
 	if err != nil {
 		return err
 	}

diff --git a/codec/proto/proto.go b/codec/proto/proto.go
@@ -3,7 +3,6 @@ package proto
 
 import (
 	"io"
-	"io/ioutil"
 
 	"go-micro.dev/v4/codec"
 	"github.com/golang/protobuf/proto"
@@ -21,7 +20,7 @@ func (c *Codec) ReadBody(b interface{}) error {
 	if b == nil {
 		return nil
 	}
-	buf, err := ioutil.ReadAll(c.Conn)
+	buf, err := io.ReadAll(c.Conn)
 	if err != nil {
 		return err
 	}

diff --git a/codec/text/text.go b/codec/text/text.go
@@ -4,7 +4,6 @@ package text
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 
 	"go-micro.dev/v4/codec"
 )
@@ -24,7 +23,7 @@ func (c *Codec) ReadHeader(m *codec.Message, t codec.MessageType) error {
 
 func (c *Codec) ReadBody(b interface{}) error {
 	// read bytes
-	buf, err := ioutil.ReadAll(c.Conn)
+	buf, err := io.ReadAll(c.Conn)
 	if err != nil {
 		return err
 	}

diff --git a/config/source/cli/cli.go b/config/source/cli/cli.go
@@ -2,7 +2,7 @@ package cli
 
 import (
 	"flag"
-	"io/ioutil"
+	"io"
 	"os"
 	"strings"
 	"time"
@@ -119,7 +119,7 @@ func NewSource(opts ...source.Option) source.Source {
 		}
 
 		// parse flags
-		set.SetOutput(ioutil.Discard)
+		set.SetOutput(io.Discard)
 		set.Parse(os.Args[1:])
 
 		// normalise flags

diff --git a/config/source/file/file.go b/config/source/file/file.go
@@ -2,7 +2,7 @@
 package file
 
 import (
-	"io/ioutil"
+	"io"
 	"os"
 
 	"go-micro.dev/v4/config/source"
@@ -23,7 +23,7 @@ func (f *file) Read() (*source.ChangeSet, error) {
 		return nil, err
 	}
 	defer fh.Close()
-	b, err := ioutil.ReadAll(fh)
+	b, err := io.ReadAll(fh)
 	if err != nil {
 		return nil, err
 	}

diff --git a/examples/config/modify/modify.go b/examples/config/modify/modify.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	"go-micro.dev/v4/config"
 	"github.com/asim/go-micro/plugins/config/encoder/toml/v4"
@@ -51,7 +51,7 @@ func main() {
 	}
 
 	// write the file
-	if err := ioutil.WriteFile("./example.conf", v, 0644); err != nil {
+	if err := os.WriteFile("./example.conf", v, 0644); err != nil {
 		fmt.Println(err)
 		return
 	}

diff --git a/examples/greeter/cli/sidecar/sidecar.go b/examples/greeter/cli/sidecar/sidecar.go
@@ -3,7 +3,7 @@ package main
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	"github.com/golang/protobuf/proto"
@@ -24,7 +24,7 @@ func main() {
 	}
 	defer r.Body.Close()
 
-	b, err := ioutil.ReadAll(r.Body)
+	b, err := io.ReadAll(r.Body)
 	if err != nil {
 		fmt.Println(err)
 		return

diff --git a/plugins/auth/jwt/token/jwt_test.go b/plugins/auth/jwt/token/jwt_test.go
@@ -1,15 +1,15 @@
 package token
 
 import (
-	"io/ioutil"
+	"os"
 	"testing"
 	"time"
 
 	"go-micro.dev/v4/auth"
 )
 
 func TestGenerate(t *testing.T) {
-	privKey, err := ioutil.ReadFile("test/sample_key")
+	privKey, err := os.ReadFile("test/sample_key")
 	if err != nil {
 		t.Fatalf("Unable to read private key: %v", err)
 	}
@@ -25,11 +25,11 @@ func TestGenerate(t *testing.T) {
 }
 
 func TestInspect(t *testing.T) {
-	pubKey, err := ioutil.ReadFile("test/sample_key.pub")
+	pubKey, err := os.ReadFile("test/sample_key.pub")
 	if err != nil {
 		t.Fatalf("Unable to read public key: %v", err)
 	}
-	privKey, err := ioutil.ReadFile("test/sample_key")
+	privKey, err := os.ReadFile("test/sample_key")
 	if err != nil {
 		t.Fatalf("Unable to read private key: %v", err)
 	}

diff --git a/plugins/broker/http/http.go b/plugins/broker/http/http.go
@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"net"
 	"net/http"
@@ -304,7 +303,7 @@ func (h *httpBroker) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 
 	req.ParseForm()
 
-	b, err := ioutil.ReadAll(req.Body)
+	b, err := io.ReadAll(req.Body)
 	if err != nil {
 		errr := merr.InternalServerError("go.micro.broker", "Error reading request body: %v", err)
 		w.WriteHeader(500)
@@ -562,7 +561,7 @@ func (h *httpBroker) Publish(topic string, msg *broker.Message, opts ...broker.P
 		}
 
 		// discard response body
-		io.Copy(ioutil.Discard, r.Body)
+		io.Copy(io.Discard, r.Body)
 		r.Body.Close()
 		return nil
 	}

diff --git a/plugins/broker/proxy/proxy.go b/plugins/broker/proxy/proxy.go
@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 
 	"go-micro.dev/v4/broker"
@@ -109,7 +108,7 @@ func (s *sidecar) Publish(topic string, msg *broker.Message, opts ...broker.Publ
 		}
 
 		// discard response
-		io.Copy(ioutil.Discard, rsp.Body)
+		io.Copy(io.Discard, rsp.Body)
 		rsp.Body.Close()
 
 		return nil

diff --git a/plugins/client/http/http.go b/plugins/client/http/http.go
@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"net/url"
@@ -137,7 +137,7 @@ func (h *httpClient) call(ctx context.Context, node *registry.Node, req client.R
 	defer hrsp.Body.Close()
 
 	// parse response
-	b, err = ioutil.ReadAll(hrsp.Body)
+	b, err = io.ReadAll(hrsp.Body)
 	if err != nil {
 		return errors.InternalServerError("go.micro.client", err.Error())
 	}

diff --git a/plugins/client/http/http_test.go b/plugins/client/http/http_test.go
@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"testing"
@@ -41,7 +41,7 @@ func TestHTTPClient(t *testing.T) {
 			http.Error(w, "codec not found", 500)
 			return
 		}
-		b, err := ioutil.ReadAll(r.Body)
+		b, err := io.ReadAll(r.Body)
 		if err != nil {
 			http.Error(w, err.Error(), 500)
 			return
@@ -146,7 +146,7 @@ func TestHTTPClientStream(t *testing.T) {
 			http.Error(w, "codec not found", 500)
 			return
 		}
-		b, err := ioutil.ReadAll(r.Body)
+		b, err := io.ReadAll(r.Body)
 		if err != nil {
 			http.Error(w, err.Error(), 500)
 			return
@@ -191,7 +191,7 @@ func TestHTTPClientStream(t *testing.T) {
 				return
 			}
 
-			b, err = ioutil.ReadAll(r.Body)
+			b, err = io.ReadAll(r.Body)
 			if err != nil {
 				http.Error(w, err.Error(), 500)
 				return

diff --git a/plugins/client/http/stream.go b/plugins/client/http/stream.go
@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"context"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"net/url"
@@ -102,7 +102,7 @@ func (h *httpStream) Recv(msg interface{}) error {
 	}
 	defer rsp.Body.Close()
 
-	b, err := ioutil.ReadAll(rsp.Body)
+	b, err := io.ReadAll(rsp.Body)
 	if err != nil {
 		return err
 	}

diff --git a/plugins/config/source/pkger/pkger.go b/plugins/config/source/pkger/pkger.go
@@ -1,7 +1,7 @@
 package pkger
 
 import (
-	"io/ioutil"
+	"io"
 
 	"github.com/markbates/pkger"
 	"go-micro.dev/v4/config/source"
@@ -22,7 +22,7 @@ func (f *file) Read() (*source.ChangeSet, error) {
 		return nil, err
 	}
 	defer fh.Close()
-	b, err := ioutil.ReadAll(fh)
+	b, err := io.ReadAll(fh)
 	if err != nil {
 		return nil, err
 	}