refactor: Replace use of deprecated io/ioutil to proper package.

closes edgexfoundry#883 Signed-off-by: lenny <[email protected]>
lenny-goodell · Jun 10, 2021 · fbe9468 · fbe9468
1 parent b500d5f
commit fbe9468
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/internal/trigger/http/rest.go b/internal/trigger/http/rest.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"sync"
 
@@ -73,7 +73,7 @@ func (trigger *Trigger) requestHandler(writer http.ResponseWriter, r *http.Reque
 
 	contentType := r.Header.Get(common.ContentType)
 
-	data, err := ioutil.ReadAll(r.Body)
+	data, err := io.ReadAll(r.Body)
 	if err != nil {
 		lc.Error("Error reading HTTP Body", "error", err)
 		writer.WriteHeader(http.StatusBadRequest)

diff --git a/pkg/transforms/compression_test.go b/pkg/transforms/compression_test.go
@@ -22,7 +22,7 @@ import (
 	"compress/gzip"
 	"compress/zlib"
 	"encoding/base64"
-	"io/ioutil"
+	"io"
 	"testing"
 
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/common"
@@ -50,7 +50,7 @@ func TestGzip(t *testing.T) {
 	zr, err := gzip.NewReader(&buf)
 	require.NoError(t, err)
 
-	decoded, err := ioutil.ReadAll(zr)
+	decoded, err := io.ReadAll(zr)
 	require.NoError(t, err)
 	require.Equal(t, clearString, string(decoded))
 
@@ -76,7 +76,7 @@ func TestZlib(t *testing.T) {
 	zr, err := zlib.NewReader(&buf)
 	require.NoError(t, err)
 
-	decoded, err := ioutil.ReadAll(zr)
+	decoded, err := io.ReadAll(zr)
 	require.NoError(t, err)
 	require.Equal(t, clearString, string(decoded))
 

diff --git a/pkg/transforms/http.go b/pkg/transforms/http.go
@@ -20,7 +20,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 
@@ -219,7 +219,7 @@ func (sender HTTPSender) httpSend(ctx interfaces.AppFunctionContext, data interf
 	}
 
 	defer func() { _ = response.Body.Close() }()
-	responseData, errReadingBody := ioutil.ReadAll(response.Body)
+	responseData, errReadingBody := io.ReadAll(response.Body)
 	if errReadingBody != nil {
 		// Can't have continueOnSendError=true when returnInputData=false, so no need to check for it here
 		sender.setRetryData(ctx, exportData)

diff --git a/pkg/transforms/http_test.go b/pkg/transforms/http_test.go
@@ -18,7 +18,7 @@ package transforms
 
 import (
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -56,7 +56,7 @@ func TestHTTPPostPut(t *testing.T) {
 
 		w.WriteHeader(http.StatusOK)
 
-		readMsg, _ := ioutil.ReadAll(r.Body)
+		readMsg, _ := io.ReadAll(r.Body)
 		_ = r.Body.Close()
 		if strings.Compare((string)(readMsg), msgStr) != 0 {
 			t.Errorf("Invalid msg received %v, expected %v", readMsg, msgStr)