Merge pull request #270 from testwill/ioutil

chore: remove refs to deprecated io/ioutil

internal/cmd/route.go

@@ -17,7 +17,7 @@
 package cmd
 
 import (
-	"io/ioutil"
+	"io"
 	"os"
 
 	"github.com/BBVA/kapow/internal/client"
@@ -62,9 +62,9 @@ func init() {
 				var buf []byte
 				var err error
 				if commandFile == "-" {
-					buf, err = ioutil.ReadAll(os.Stdin)
+					buf, err = io.ReadAll(os.Stdin)
 				} else {
-					buf, err = ioutil.ReadFile(commandFile)
+					buf, err = os.ReadFile(commandFile)
 				}
 				if err != nil {
 					logger.L.Fatal(err)

internal/http/reason.go

@@ -19,7 +19,7 @@ package http
 import (
 	"encoding/json"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	"github.com/BBVA/kapow/internal/server/httperror"
@@ -28,7 +28,7 @@ import (
 // Reason returns the reason phrase embedded within the JSON error
 // body, or an error if no reason can be extracted
 func Reason(r *http.Response) (string, error) {
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		return "", errors.New("error reading response's body")
 	}

internal/http/reason_test.go

@@ -17,7 +17,7 @@
 package http
 
 import (
-	"io/ioutil"
+	"io"
 	nethttp "net/http"
 	"strings"
 	"testing"
@@ -26,7 +26,7 @@ import (
 func TestReasonExtractsReasonFromJSON(t *testing.T) {
 	r := &nethttp.Response{
 		Status: "200 OK",
-		Body: ioutil.NopCloser(
+		Body: io.NopCloser(
 			strings.NewReader(
 				`{"reason": "Because reasons", "foo": "bar"}`,
 			),
@@ -43,7 +43,7 @@ func TestReasonExtractsReasonFromJSON(t *testing.T) {
 func TestReasonErrorsOnJSONWithNoReason(t *testing.T) {
 	r := &nethttp.Response{
 		Status: "200 OK",
-		Body: ioutil.NopCloser(
+		Body: io.NopCloser(
 			strings.NewReader(
 				`{"madness": "Because madness", "foo": "bar"}`,
 			),
@@ -59,7 +59,7 @@ func TestReasonErrorsOnJSONWithNoReason(t *testing.T) {
 
 func TestReasonErrorsOnJSONWithEmptyReason(t *testing.T) {
 	r := &nethttp.Response{
-		Body: ioutil.NopCloser(
+		Body: io.NopCloser(
 			strings.NewReader(
 				`{"reason": "", "foo": "bar"}`,
 			),
@@ -75,7 +75,7 @@ func TestReasonErrorsOnJSONWithEmptyReason(t *testing.T) {
 
 func TestReasonErrorsOnNoJSON(t *testing.T) {
 	r := &nethttp.Response{
-		Body: ioutil.NopCloser(
+		Body: io.NopCloser(
 			strings.NewReader(""),
 		),
 	}
@@ -89,7 +89,7 @@ func TestReasonErrorsOnNoJSON(t *testing.T) {
 
 func TestReasonErrorsOnInvalidJSON(t *testing.T) {
 	r := &nethttp.Response{
-		Body: ioutil.NopCloser(
+		Body: io.NopCloser(
 			strings.NewReader(
 				`{"reason": "Because reasons", "cliffhanger...`,
 			),

internal/http/request.go

@@ -21,7 +21,6 @@ import (
 	"crypto/x509"
 	"errors"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 
@@ -54,7 +53,7 @@ func Delete(url string, r io.Reader, w io.Writer, clientGenerator func() *http.C
 	return Request("DELETE", url, r, w, clientGenerator, reqTuner...)
 }
 
-var devnull = ioutil.Discard
+var devnull = io.Discard
 
 // Request will perform the request to the given url and method sending the
 // content of the given reader as the body and writing all the contents

internal/server/control/control.go

@@ -18,7 +18,7 @@ package control
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	"github.com/google/uuid"
@@ -103,7 +103,7 @@ var pathValidator func(string) error = func(path string) error {
 func addRoute(res http.ResponseWriter, req *http.Request) {
 	var route model.Route
 
-	payload, _ := ioutil.ReadAll(req.Body)
+	payload, _ := io.ReadAll(req.Body)
 	err := json.Unmarshal(payload, &route)
 	if err != nil {
 		httperror.ErrorJSON(res, "Malformed JSON", http.StatusBadRequest)

internal/server/control/control_test.go

@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"reflect"
@@ -47,7 +47,7 @@ func checkErrorResponse(r *http.Response, expectedErrcode int, expectedReason st
 	}
 
 	errMsg := httperror.ServerErrMessage{}
-	if bodyBytes, err := ioutil.ReadAll(r.Body); err != nil {
+	if bodyBytes, err := io.ReadAll(r.Body); err != nil {
 		errList = append(errList, fmt.Errorf("Unexpected error reading response body: %v", err))
 	} else if err := json.Unmarshal(bodyBytes, &errMsg); err != nil {
 		errList = append(errList, fmt.Errorf("Response body contains invalid JSON entity: %v", err))
@@ -434,7 +434,7 @@ func TestGetRouteReturnsTheRequestedRoute(t *testing.T) {
 		t.Errorf("HTTP status mismatch. Expected: %d, got: %d", http.StatusOK, resp.StatusCode)
 	}
 
-	bBytes, _ := ioutil.ReadAll(resp.Body)
+	bBytes, _ := io.ReadAll(resp.Body)
 	if err := json.Unmarshal(bBytes, &respJson); err != nil {
 		t.Errorf("Invalid JSON response. %s", string(bBytes))
 	}

internal/server/data/resource.go

@@ -18,11 +18,10 @@ package data
 
 import (
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/textproto"
 	"strconv"
-  "strings"
+	"strings"
 
 	"github.com/BBVA/kapow/internal/logger"
 	"github.com/BBVA/kapow/internal/server/httperror"
@@ -183,7 +182,7 @@ func getRouteId(w http.ResponseWriter, r *http.Request, h *model.Handler) {
 // FIXME: Allow any  HTTP status code. Now we are limited by WriteHeader
 // capabilities
 func setResponseStatus(w http.ResponseWriter, r *http.Request, h *model.Handler) {
-	sb, err := ioutil.ReadAll(r.Body)
+	sb, err := io.ReadAll(r.Body)
 	if err != nil {
 		httperror.ErrorJSON(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
@@ -200,7 +199,7 @@ func setResponseStatus(w http.ResponseWriter, r *http.Request, h *model.Handler)
 
 func setResponseHeaders(w http.ResponseWriter, r *http.Request, h *model.Handler) {
 	name := mux.Vars(r)["name"]
-	vb, err := ioutil.ReadAll(r.Body)
+	vb, err := io.ReadAll(r.Body)
 	if err != nil {
 		httperror.ErrorJSON(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
@@ -212,7 +211,7 @@ func setResponseHeaders(w http.ResponseWriter, r *http.Request, h *model.Handler
 
 func setResponseCookies(w http.ResponseWriter, r *http.Request, h *model.Handler) {
 	name := mux.Vars(r)["name"]
-	vb, err := ioutil.ReadAll(r.Body)
+	vb, err := io.ReadAll(r.Body)
 	if err != nil {
 		httperror.ErrorJSON(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
@@ -242,7 +241,7 @@ func setResponseBody(w http.ResponseWriter, r *http.Request, h *model.Handler) {
 }
 
 func setServerLog(w http.ResponseWriter, r *http.Request, h *model.Handler) {
-	msg, err := ioutil.ReadAll(r.Body)
+	msg, err := io.ReadAll(r.Body)
 	if err != nil {
 		httperror.ErrorJSON(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return