Skip to content

Commit

Permalink
Stop using io/ioutil
Browse files Browse the repository at this point in the history
  • Loading branch information
@fsouza
fsouza committed Apr 26, 2022
1 parent ee6da38 commit 363349d
Show file tree
Hide file tree
Showing 13 changed files with 46 additions and 55 deletions.
2 changes: 1 addition & 1 deletion examples/go/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func downloadFile(client *storage.Client, bucketName, fileKey string) ([]byte, e
return nil, err
}
defer reader.Close()
return ioutil.ReadAll(reader)
return io.ReadAll(reader)
}

func deleteFile(client *storage.Client, bucketName, fileKey string) error {
Expand Down
3 changes: 1 addition & 2 deletions fakestorage/bucket_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package fakestorage

import (
"context"
"io/ioutil"
"os"
"runtime"
"testing"
Expand Down Expand Up @@ -237,7 +236,7 @@ func TestServerClientListObjects(t *testing.T) {
{ObjectAttrs: ObjectAttrs{BucketName: "some-bucket", Name: "img/hi-res/party-02.jpg"}},
{ObjectAttrs: ObjectAttrs{BucketName: "some-bucket", Name: "img/hi-res/party-03.jpg"}},
}
dir, err := ioutil.TempDir(tempDir(), "fakestorage-test-root-")
dir, err := os.MkdirTemp(tempDir(), "fakestorage-test-root-")
if err != nil {
t.Fatal(err)
}
Expand Down
6 changes: 3 additions & 3 deletions fakestorage/example_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package fakestorage_test
import (
"context"
"fmt"
"io/ioutil"
"io"

"github.com/fsouza/fake-gcs-server/fakestorage"
)
Expand All @@ -30,7 +30,7 @@ func ExampleServer_Client() {
panic(err)
}
defer reader.Close()
data, err := ioutil.ReadAll(reader)
data, err := io.ReadAll(reader)
if err != nil {
panic(err)
}
Expand Down Expand Up @@ -63,7 +63,7 @@ func ExampleServer_with_host_port() {
panic(err)
}
defer reader.Close()
data, err := ioutil.ReadAll(reader)
data, err := io.ReadAll(reader)
if err != nil {
panic(err)
}
Expand Down
14 changes: 7 additions & 7 deletions fakestorage/object_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"errors"
"fmt"
"hash/crc32"
"io/ioutil"
"io"
"net/http"
"reflect"
"testing"
Expand Down Expand Up @@ -348,7 +348,7 @@ func TestServerClientObjectReader(t *testing.T) {
t.Fatal(err)
}
defer reader.Close()
data, err := ioutil.ReadAll(reader)
data, err := io.ReadAll(reader)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -416,7 +416,7 @@ func TestServerClientObjectRangeReader(t *testing.T) {
t.Fatal(err)
}
defer reader.Close()
data, err := ioutil.ReadAll(reader)
data, err := io.ReadAll(reader)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -455,7 +455,7 @@ func TestServerClientObjectReaderAfterCreateObject(t *testing.T) {
t.Fatal(err)
}
defer reader.Close()
data, err := ioutil.ReadAll(reader)
data, err := io.ReadAll(reader)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -511,7 +511,7 @@ func TestServerClientObjectReaderAgainstSpecificGenerations(t *testing.T) {
if err != nil {
t.Fatal(err)
}
data, err := ioutil.ReadAll(reader)
data, err := io.ReadAll(reader)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -595,7 +595,7 @@ func TestServerClientObjectReadBucketCNAME(t *testing.T) {
t.Errorf("wrong value for header %q:\nwant %q\ngot %q", k, expectedV, v)
}
}
data, err := ioutil.ReadAll(resp.Body)
data, err := io.ReadAll(resp.Body)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -1488,7 +1488,7 @@ func TestParseRangeRequest(t *testing.T) {
if err != nil {
t.Fatal(err)
}
out, _ := ioutil.ReadAll(rng)
out, _ := io.ReadAll(rng)
rng.Close()

if length < 0 {
Expand Down
3 changes: 1 addition & 2 deletions fakestorage/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"crypto/tls"
"fmt"
"io"
"io/ioutil"
"mime"
"mime/multipart"
"net"
Expand Down Expand Up @@ -360,7 +359,7 @@ func (s *Server) handleBatchCall(w http.ResponseWriter, r *http.Request) {
continue
}

content, err := ioutil.ReadAll(part)
content, err := io.ReadAll(part)
part.Close()
if err != nil {
http.Error(partResponseWriter, "unable to process request", http.StatusBadRequest)
Expand Down
9 changes: 4 additions & 5 deletions fakestorage/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"bytes"
"context"
"io"
"io/ioutil"
"net/http"
"net/url"
"os"
Expand Down Expand Up @@ -83,7 +82,7 @@ func TestNewServerLogging(t *testing.T) {
t.Fatal(err)
}
defer res.Body.Close()
io.Copy(ioutil.Discard, res.Body)
io.Copy(io.Discard, res.Body)
if buf.Len() == 0 {
t.Error("Log was not written to buffer.")
}
Expand Down Expand Up @@ -329,7 +328,7 @@ func testDownloadObject(t *testing.T, server *Server) {
t.Errorf("wrong value for header %q:\nwant %q\ngot %q", k, expectedV, v)
}
}
data, err := ioutil.ReadAll(resp.Body)
data, err := io.ReadAll(resp.Body)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -371,7 +370,7 @@ func testDownloadObjectRange(t *testing.T, server *Server) {
if resp.StatusCode != test.expectedStatus {
t.Errorf("wrong status returned\nwant %d\ngot %d", test.expectedStatus, resp.StatusCode)
}
data, err := ioutil.ReadAll(resp.Body)
data, err := io.ReadAll(resp.Body)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -516,7 +515,7 @@ func TestDownloadObjectAlternatePublicHost(t *testing.T) {
t.Errorf("wrong value for header %q:\nwant %q\ngot %q", k, expectedV, v)
}
}
data, err := ioutil.ReadAll(resp.Body)
data, err := io.ReadAll(resp.Body)
if err != nil {
t.Fatal(err)
}
Expand Down
9 changes: 4 additions & 5 deletions fakestorage/upload.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"mime"
"mime/multipart"
"net/http"
Expand Down Expand Up @@ -123,7 +122,7 @@ func (s *Server) insertFormObject(r *http.Request) xmlResponse {
if err != nil {
return xmlResponse{errorMessage: err.Error()}
}
data, err := ioutil.ReadAll(infile)
data, err := io.ReadAll(infile)
if err != nil {
return xmlResponse{errorMessage: err.Error()}
}
Expand Down Expand Up @@ -217,7 +216,7 @@ func (s *Server) simpleUpload(bucketName string, r *http.Request) jsonResponse {
errorMessage: "name is required for simple uploads",
}
}
data, err := ioutil.ReadAll(r.Body)
data, err := io.ReadAll(r.Body)
if err != nil {
return jsonResponse{errorMessage: err.Error()}
}
Expand Down Expand Up @@ -261,7 +260,7 @@ func (s *Server) signedUpload(bucketName string, r *http.Request) jsonResponse {
}
}

data, err := ioutil.ReadAll(r.Body)
data, err := io.ReadAll(r.Body)
if err != nil {
return jsonResponse{errorMessage: err.Error()}
}
Expand Down Expand Up @@ -580,7 +579,7 @@ func loadMetadata(rc io.ReadCloser) (*multipartMetadata, error) {

func loadContent(rc io.ReadCloser) ([]byte, error) {
defer rc.Close()
return ioutil.ReadAll(rc)
return io.ReadAll(rc)
}

func generateUploadID() (string, error) {
Expand Down
21 changes: 10 additions & 11 deletions fakestorage/upload_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"mime/multipart"
"net/http"
"reflect"
Expand Down Expand Up @@ -108,7 +107,7 @@ func TestServerClientObjectWriter(t *testing.T) {
if err != nil {
t.Fatal(err)
}
data, err := ioutil.ReadAll(reader)
data, err := io.ReadAll(reader)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -189,7 +188,7 @@ func TestServerClientObjectWriterWithDoesNotExistPrecondition(t *testing.T) {
if err != nil {
t.Fatal(err)
}
objectContent, err := ioutil.ReadAll(firstReader)
objectContent, err := io.ReadAll(firstReader)
if err != nil {
t.Fatal(err)
}
Expand All @@ -212,7 +211,7 @@ func TestServerClientObjectWriterWithDoesNotExistPrecondition(t *testing.T) {
if err != nil {
t.Fatal(err)
}
objectContentAfterFailedPrecondition, err := ioutil.ReadAll(secondReader)
objectContentAfterFailedPrecondition, err := io.ReadAll(secondReader)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -251,7 +250,7 @@ func TestServerClientObjectOperationsWithIfGenerationMatchPrecondition(t *testin
if err != nil {
t.Fatal(err)
}
objectContent, err := ioutil.ReadAll(firstReader)
objectContent, err := io.ReadAll(firstReader)
if err != nil {
t.Fatal(err)
}
Expand All @@ -272,7 +271,7 @@ func TestServerClientObjectOperationsWithIfGenerationMatchPrecondition(t *testin
if err != nil {
t.Fatal(err)
}
objectContentAfterMatchedPrecondition, err := ioutil.ReadAll(secondReader)
objectContentAfterMatchedPrecondition, err := io.ReadAll(secondReader)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -311,7 +310,7 @@ func TestServerClientObjectOperationsWithIfGenerationNotMatchPrecondition(t *tes
if err != nil {
t.Fatal(err)
}
objectContent, err := ioutil.ReadAll(firstReader)
objectContent, err := io.ReadAll(firstReader)
if err != nil {
t.Fatal(err)
}
Expand All @@ -334,7 +333,7 @@ func TestServerClientObjectOperationsWithIfGenerationNotMatchPrecondition(t *tes
if err != nil {
t.Fatal(err)
}
objectContentAfterFailedPrecondition, err := ioutil.ReadAll(secondReader)
objectContentAfterFailedPrecondition, err := io.ReadAll(secondReader)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -506,7 +505,7 @@ func TestServerClientSignedUploadBucketCNAME(t *testing.T) {
if resp.StatusCode != http.StatusOK {
t.Errorf("wrong status returned\nwant %d\ngot %d", http.StatusOK, resp.StatusCode)
}
data, err := ioutil.ReadAll(resp.Body)
data, err := io.ReadAll(resp.Body)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -714,7 +713,7 @@ func resumableUploadTest(t *testing.T, server *Server, bucketName string, upload
}

defer func() {
_, _ = io.Copy(ioutil.Discard, resp.Body)
_, _ = io.Copy(io.Discard, resp.Body)
_ = resp.Body.Close()
}()

Expand Down Expand Up @@ -745,7 +744,7 @@ func resumableUploadTest(t *testing.T, server *Server, bucketName string, upload
}

defer func() {
_, _ = io.Copy(ioutil.Discard, resp2.Body)
_, _ = io.Copy(io.Discard, resp2.Body)
_ = resp2.Body.Close()
}()

Expand Down
3 changes: 1 addition & 2 deletions internal/backend/backend_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ package backend
import (
"bytes"
"fmt"
"io/ioutil"
"os"
"reflect"
"runtime"
Expand All @@ -24,7 +23,7 @@ func tempDir() string {
}

func makeStorageBackends(t *testing.T) (map[string]Storage, func()) {
tempDir, err := ioutil.TempDir(tempDir(), "fakegcstest")
tempDir, err := os.MkdirTemp(tempDir(), "fakegcstest")
if err != nil {
t.Fatal(err)
}
Expand Down
18 changes: 9 additions & 9 deletions internal/backend/fs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"net/url"
"os"
"path/filepath"
Expand All @@ -26,10 +25,11 @@ import (
// The layout is the following:
//
// - rootDir
// |- bucket1
// \- bucket2
// |- object1
// \- object2
//
// |- bucket1
// \- bucket2
// |- object1
// \- object2
//
// Bucket and object names are url path escaped, so there's no special meaning of forward slashes.
type storageFS struct {
Expand Down Expand Up @@ -87,7 +87,7 @@ func (s *storageFS) createBucket(name string) error {
func (s *storageFS) ListBuckets() ([]Bucket, error) {
s.mtx.RLock()
defer s.mtx.RUnlock()
infos, err := ioutil.ReadDir(s.rootDir)
infos, err := os.ReadDir(s.rootDir)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -149,7 +149,7 @@ func (s *storageFS) CreateObject(obj Object) (Object, error) {

path := filepath.Join(s.rootDir, url.PathEscape(obj.BucketName), url.PathEscape(obj.Name))

if err = ioutil.WriteFile(path, obj.Content, 0o600); err != nil {
if err = os.WriteFile(path, obj.Content, 0o600); err != nil {
return Object{}, err
}

Expand All @@ -172,7 +172,7 @@ func (s *storageFS) ListObjects(bucketName string, prefix string, versions bool)
s.mtx.RLock()
defer s.mtx.RUnlock()

infos, err := ioutil.ReadDir(filepath.Join(s.rootDir, url.PathEscape(bucketName)))
infos, err := os.ReadDir(filepath.Join(s.rootDir, url.PathEscape(bucketName)))
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -224,7 +224,7 @@ func (s *storageFS) getObject(bucketName, objectName string) (Object, error) {
return Object{}, err
}

obj.Content, err = ioutil.ReadFile(path)
obj.Content, err = os.ReadFile(path)
if err != nil {
return Object{}, err
}
Expand Down
Loading

0 comments on commit 363349d

Please sign in to comment.