chore: remove refs to deprecated io/ioutil

dnaeon · Jul 3, 2023 · ebbeaca · ebbeaca
1 parent 64ebe73
commit ebbeaca
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/cassette/cassette.go b/cassette/cassette.go
@@ -28,7 +28,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
@@ -260,7 +259,7 @@ func New(name string) *Cassette {
 // Load reads a cassette file from disk
 func Load(name string) (*Cassette, error) {
 	c := New(name)
-	data, err := ioutil.ReadFile(c.File)
+	data, err := os.ReadFile(c.File)
 	if err != nil {
 		return nil, err
 	}

diff --git a/examples/https_test.go b/examples/https_test.go
@@ -25,7 +25,7 @@
 package vcr_test
 
 import (
-	"io/ioutil"
+	"io"
 	"strings"
 	"testing"
 
@@ -51,7 +51,7 @@ func TestHTTPS(t *testing.T) {
 		t.Fatalf("Failed to get url %s: %s", url, err)
 	}
 
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		t.Fatalf("Failed to read response body: %s", err)
 	}

diff --git a/examples/simple_test.go b/examples/simple_test.go
@@ -25,7 +25,7 @@
 package vcr_test
 
 import (
-	"io/ioutil"
+	"io"
 	"strings"
 	"testing"
 
@@ -50,7 +50,7 @@ func TestSimple(t *testing.T) {
 		t.Fatalf("Failed to get url %s: %s", url, err)
 	}
 
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		t.Fatalf("Failed to read response body: %s", err)
 	}

diff --git a/recorder/recorder.go b/recorder/recorder.go
@@ -30,7 +30,6 @@ import (
 	"bytes"
 	"errors"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httputil"
 	"os"
@@ -330,7 +329,7 @@ func (rec *Recorder) requestHandler(r *http.Request) (*cassette.Interaction, err
 	requestDuration := time.Since(start)
 	defer resp.Body.Close()
 
-	respBody, err := ioutil.ReadAll(resp.Body)
+	respBody, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}

diff --git a/recorder/recorder_test.go b/recorder/recorder_test.go
@@ -30,7 +30,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -65,7 +64,7 @@ func (tc testCase) run(client *http.Client, ctx context.Context, serverUrl strin
 	}
 	defer resp.Body.Close()
 
-	respBody, err := ioutil.ReadAll(resp.Body)
+	respBody, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}
@@ -103,7 +102,7 @@ func newEchoHttpServer() *httptest.Server {
 // newCassettePath creates a new path to be used for test cassettes,
 // which reside in a temporary location.
 func newCassettePath(name string) (string, error) {
-	dir, err := ioutil.TempDir(os.TempDir(), "go-vcr-")
+	dir, err := os.MkdirTemp(os.TempDir(), "go-vcr-")
 	if err != nil {
 		return "", err
 	}
@@ -649,7 +648,7 @@ func TestPassthroughHandler(t *testing.T) {
 		if _, err := b.ReadFrom(r.Body); err != nil {
 			return false
 		}
-		r.Body = ioutil.NopCloser(&b)
+		r.Body = io.NopCloser(&b)
 
 		return r.Method == http.MethodPost && b.String() == "passthrough request"
 	})
@@ -1112,7 +1111,7 @@ func TestWithCustomMatcher(t *testing.T) {
 	defer resp.Body.Close()
 
 	// Body should be the same as the first recorded interaction
-	respBody, err := ioutil.ReadAll(resp.Body)
+	respBody, err := io.ReadAll(resp.Body)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1131,12 +1130,12 @@ func TestWithCustomMatcher(t *testing.T) {
 
 		var reqBody []byte
 		var err error
-		reqBody, err = ioutil.ReadAll(r.Body)
+		reqBody, err = io.ReadAll(r.Body)
 		if err != nil {
 			t.Fatal("failed to read request body")
 		}
 		r.Body.Close()
-		r.Body = ioutil.NopCloser(bytes.NewBuffer(reqBody))
+		r.Body = io.NopCloser(bytes.NewBuffer(reqBody))
 
 		return r.Method == i.Method && r.URL.String() == i.URL && string(reqBody) == i.Body
 	}