Skip to content

Commit a96c50a

Browse files
Merge pull request #14 from tranhoangvuit/chore/update-deprecated-ioutil-functions
chore: update deprecated ioutil functions
2 parents d1fd24c + 2a33eaa commit a96c50a

File tree

4 files changed

+18
-21
lines changed

4 files changed

+18
-21
lines changed

bucket.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"bytes"
55
"encoding/json"
66
"io"
7-
"io/ioutil"
87
"net/http"
98
)
109

@@ -21,7 +20,7 @@ func (c *Client) ListBuckets() ([]Bucket, BucketResponseError) {
2120
}
2221
}(res.Body)
2322

24-
body, err := ioutil.ReadAll(res.Body)
23+
body, err := io.ReadAll(res.Body)
2524
if err != nil {
2625
panic(err)
2726
}
@@ -41,7 +40,7 @@ func (c *Client) GetBucket(id string) (Bucket, BucketResponseError) {
4140
panic(err)
4241
}
4342

44-
body, err := ioutil.ReadAll(res.Body)
43+
body, err := io.ReadAll(res.Body)
4544
var data Bucket
4645
var error_ BucketResponseError
4746
err = json.Unmarshal(body, &data)
@@ -72,7 +71,7 @@ func (c *Client) CreateBucket(id string, options BucketOptions) (Bucket, BucketR
7271
panic(err)
7372
}
7473

75-
body, err := ioutil.ReadAll(res.Body)
74+
body, err := io.ReadAll(res.Body)
7675
var data Bucket
7776
var error_ BucketResponseError
7877
err = json.Unmarshal(body, &data)
@@ -103,7 +102,7 @@ func (c *Client) UpdateBucket(id string, options BucketOptions) (MessageResponse
103102
panic(err)
104103
}
105104

106-
body, err := ioutil.ReadAll(res.Body)
105+
body, err := io.ReadAll(res.Body)
107106
var data MessageResponse
108107
var error_ BucketResponseError
109108
err = json.Unmarshal(body, &data)
@@ -119,7 +118,7 @@ func (c *Client) EmptyBucket(id string) (MessageResponse, BucketResponseError) {
119118
panic(err)
120119
}
121120

122-
body, err := ioutil.ReadAll(res.Body)
121+
body, err := io.ReadAll(res.Body)
123122
var data MessageResponse
124123
var error_ BucketResponseError
125124
err = json.Unmarshal(body, &data)
@@ -136,7 +135,7 @@ func (c *Client) DeleteBucket(id string) (MessageResponse, BucketResponseError)
136135
panic(err)
137136
}
138137

139-
body, err := ioutil.ReadAll(res.Body)
138+
body, err := io.ReadAll(res.Body)
140139
var data MessageResponse
141140
var error_ BucketResponseError
142141
err = json.Unmarshal(body, &data)

client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"net/url"
66
)
77

8-
var version = "v0.5.6"
8+
var version = "v0.6.9"
99

1010
type Client struct {
1111
clientError error

storage.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"bytes"
66
"encoding/json"
77
"io"
8-
"io/ioutil"
98
"net/http"
109
"net/url"
1110
"regexp"
@@ -48,7 +47,7 @@ func (c *Client) UploadOrUpdateFile(bucketId string, relativePath string, data i
4847
panic(err)
4948
}
5049

51-
body_, err := ioutil.ReadAll(res.Body)
50+
body_, err := io.ReadAll(res.Body)
5251
var response FileUploadResponse
5352
err = json.Unmarshal(body_, &response)
5453

@@ -80,7 +79,7 @@ func (c *Client) MoveFile(bucketId string, sourceKey string, destinationKey stri
8079
panic(err)
8180
}
8281

83-
body, err := ioutil.ReadAll(res.Body)
82+
body, err := io.ReadAll(res.Body)
8483
var response FileUploadResponse
8584
err = json.Unmarshal(body, &response)
8685

@@ -102,7 +101,7 @@ func (c *Client) CreateSignedUrl(bucketId string, filePath string, expiresIn int
102101
panic(err)
103102
}
104103

105-
body, err := ioutil.ReadAll(res.Body)
104+
body, err := io.ReadAll(res.Body)
106105
var response SignedUrlResponse
107106
err = json.Unmarshal(body, &response)
108107
response.SignedURL = c.clientTransport.baseUrl.String() + response.SignedURL
@@ -123,7 +122,7 @@ func (c *Client) CreateSignedUploadUrl(bucketId string, filePath string) (Signed
123122
return SignedUploadUrlResponse{}, err
124123
}
125124

126-
body, err := ioutil.ReadAll(res.Body)
125+
body, err := io.ReadAll(res.Body)
127126
if err != nil {
128127
return SignedUploadUrlResponse{}, err
129128
}
@@ -150,7 +149,7 @@ func (c *Client) UploadToSignedUrl(filePath string, fileBody io.Reader) (*Upload
150149
return nil, err
151150
}
152151

153-
body, err := ioutil.ReadAll(resp.Body)
152+
body, err := io.ReadAll(resp.Body)
154153
if err != nil {
155154
return nil, err
156155
}
@@ -194,7 +193,7 @@ func (c *Client) RemoveFile(bucketId string, paths []string) FileUploadResponse
194193
panic(err)
195194
}
196195

197-
body, err := ioutil.ReadAll(res.Body)
196+
body, err := io.ReadAll(res.Body)
198197
var response FileUploadResponse
199198
err = json.Unmarshal(body, &response)
200199
response.Data = body
@@ -240,7 +239,7 @@ func (c *Client) ListFiles(bucketId string, queryPath string, options FileSearch
240239
panic(err)
241240
}
242241

243-
body, err := ioutil.ReadAll(res.Body)
242+
body, err := io.ReadAll(res.Body)
244243
var response []FileObject
245244

246245
err = json.Unmarshal(body, &response)
@@ -270,7 +269,7 @@ func (c *Client) DownloadFile(bucketId string, filePath string, urlOptions ...Ur
270269
return nil, err
271270
}
272271
defer res.Body.Close()
273-
body, err := ioutil.ReadAll(res.Body)
272+
body, err := io.ReadAll(res.Body)
274273
return body, err
275274
}
276275

@@ -325,8 +324,8 @@ type FileUploadResponse struct {
325324
Key string `json:"Key"`
326325
Message string `json:"message"`
327326
Data []byte
328-
Code string `json:"statusCode"`
329-
Error string `json:"error"`
327+
Code string `json:"statusCode"`
328+
Error string `json:"error"`
330329
}
331330

332331
type SignedUrlResponse struct {

test/fileupload_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package test
22

33
import (
44
"fmt"
5-
"io/ioutil"
65
"os"
76
"testing"
87

@@ -105,7 +104,7 @@ func TestDownloadFile(t *testing.T) {
105104
t.Fatalf("DownloadFile failed: %v", err)
106105
}
107106

108-
err = ioutil.WriteFile("book.pdf", resp, 0644)
107+
err = os.WriteFile("book.pdf", resp, 0644)
109108
if err != nil {
110109
t.Fatalf("WriteFile failed: %v", err)
111110
}

0 commit comments

Comments
 (0)