Skip to content
This repository was archived by the owner on Feb 12, 2025. It is now read-only.

Commit be633f7

Browse files
testwilltestwill
authored
io/ioutil deprecated (#724)
1 parent c2958ac commit be633f7

28 files changed

+103
-116
lines changed

‎autorest/adal/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ if (err == nil) {
160160
```Go
161161
certificatePath := "./example-app.pfx"
162162

163-
certData, err := ioutil.ReadFile(certificatePath)
163+
certData, err := os.ReadFile(certificatePath)
164164
if err != nil {
165165
return nil, fmt.Errorf("failed to read the certificate file (%s): %v", certificatePath, err)
166166
}

‎autorest/adal/cmd/adal.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import (
1818
"flag"
1919
"fmt"
2020
"log"
21+
"os"
2122
"strings"
2223

2324
"crypto/rsa"
2425
"crypto/x509"
25-
"io/ioutil"
2626
"net/http"
2727
"os/user"
2828

@@ -203,7 +203,7 @@ func acquireTokenClientCertFlow(oauthConfig adal.OAuthConfig,
203203
resource string,
204204
callbacks ...adal.TokenRefreshCallback) (*adal.ServicePrincipalToken, error) {
205205

206-
certData, err := ioutil.ReadFile(certificatePath)
206+
certData, err := os.ReadFile(certificatePath)
207207
if err != nil {
208208
return nil, fmt.Errorf("failed to read the certificate file (%s): %v", certificatePath, err)
209209
}

‎autorest/adal/devicetoken.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"context"
2828
"encoding/json"
2929
"fmt"
30-
"io/ioutil"
30+
"io"
3131
"net/http"
3232
"net/url"
3333
"strings"
@@ -116,7 +116,7 @@ func InitiateDeviceAuthWithContext(ctx context.Context, sender Sender, oauthConf
116116
}
117117

118118
s := v.Encode()
119-
body := ioutil.NopCloser(strings.NewReader(s))
119+
body := io.NopCloser(strings.NewReader(s))
120120

121121
req, err := http.NewRequest(http.MethodPost, oauthConfig.DeviceCodeEndpoint.String(), body)
122122
if err != nil {
@@ -131,7 +131,7 @@ func InitiateDeviceAuthWithContext(ctx context.Context, sender Sender, oauthConf
131131
}
132132
defer resp.Body.Close()
133133

134-
rb, err := ioutil.ReadAll(resp.Body)
134+
rb, err := io.ReadAll(resp.Body)
135135
if err != nil {
136136
return nil, fmt.Errorf("%s %s: %s", logPrefix, errCodeHandlingFails, err.Error())
137137
}
@@ -175,7 +175,7 @@ func CheckForUserCompletionWithContext(ctx context.Context, sender Sender, code
175175
}
176176

177177
s := v.Encode()
178-
body := ioutil.NopCloser(strings.NewReader(s))
178+
body := io.NopCloser(strings.NewReader(s))
179179

180180
req, err := http.NewRequest(http.MethodPost, code.OAuthConfig.TokenEndpoint.String(), body)
181181
if err != nil {
@@ -190,7 +190,7 @@ func CheckForUserCompletionWithContext(ctx context.Context, sender Sender, code
190190
}
191191
defer resp.Body.Close()
192192

193-
rb, err := ioutil.ReadAll(resp.Body)
193+
rb, err := io.ReadAll(resp.Body)
194194
if err != nil {
195195
return nil, fmt.Errorf("%s %s: %s", logPrefix, errTokenHandlingFails, err.Error())
196196
}

‎autorest/adal/persist.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"encoding/json"
2121
"errors"
2222
"fmt"
23-
"io/ioutil"
2423
"os"
2524
"path/filepath"
2625

@@ -62,7 +61,7 @@ func SaveToken(path string, mode os.FileMode, token Token) error {
6261
return fmt.Errorf("failed to create directory (%s) to store token in: %v", dir, err)
6362
}
6463

65-
newFile, err := ioutil.TempFile(dir, "token")
64+
newFile, err := os.CreateTemp(dir, "token")
6665
if err != nil {
6766
return fmt.Errorf("failed to create the temp file to write the token: %v", err)
6867
}

‎autorest/adal/persist_test.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ package adal
1616

1717
import (
1818
"encoding/json"
19-
"io/ioutil"
2019
"os"
2120
"path"
2221
"reflect"
@@ -46,7 +45,7 @@ var TestToken = Token{
4645
}
4746

4847
func writeTestTokenFile(t *testing.T, suffix string, contents string) *os.File {
49-
f, err := ioutil.TempFile(os.TempDir(), suffix)
48+
f, err := os.CreateTemp(os.TempDir(), suffix)
5049
if err != nil {
5150
t.Fatalf("azure: unexpected error when creating temp file: %v", err)
5251
}
@@ -108,7 +107,7 @@ func token() *Token {
108107
}
109108

110109
func TestSaveToken(t *testing.T) {
111-
f, err := ioutil.TempFile("", "testloadtoken")
110+
f, err := os.CreateTemp("", "testloadtoken")
112111
if err != nil {
113112
t.Fatalf("azure: unexpected error when creating temp file: %v", err)
114113
}
@@ -135,7 +134,7 @@ func TestSaveToken(t *testing.T) {
135134

136135
json.Unmarshal([]byte(MockTokenJSON), &expectedToken)
137136

138-
contents, err := ioutil.ReadFile(f.Name())
137+
contents, err := os.ReadFile(f.Name())
139138
if err != nil {
140139
t.Fatal("!!")
141140
}

‎autorest/adal/token.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"errors"
2626
"fmt"
2727
"io"
28-
"io/ioutil"
2928
"math"
3029
"net/http"
3130
"net/url"
@@ -1061,7 +1060,7 @@ func (spt *ServicePrincipalToken) refreshInternal(ctx context.Context, resource
10611060
} else if msiSecret.clientResourceID != "" {
10621061
data.Set("msi_res_id", msiSecret.clientResourceID)
10631062
}
1064-
req.Body = ioutil.NopCloser(strings.NewReader(data.Encode()))
1063+
req.Body = io.NopCloser(strings.NewReader(data.Encode()))
10651064
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
10661065
break
10671066
case msiTypeIMDS:
@@ -1096,7 +1095,7 @@ func (spt *ServicePrincipalToken) refreshInternal(ctx context.Context, resource
10961095
}
10971096

10981097
s := v.Encode()
1099-
body := ioutil.NopCloser(strings.NewReader(s))
1098+
body := io.NopCloser(strings.NewReader(s))
11001099
req.ContentLength = int64(len(s))
11011100
req.Header.Set(contentType, mimeTypeFormPost)
11021101
req.Body = body
@@ -1113,7 +1112,7 @@ func (spt *ServicePrincipalToken) refreshInternal(ctx context.Context, resource
11131112

11141113
logger.Instance.WriteResponse(resp, logger.Filter{Body: authBodyFilter})
11151114
defer resp.Body.Close()
1116-
rb, err := ioutil.ReadAll(resp.Body)
1115+
rb, err := io.ReadAll(resp.Body)
11171116

11181117
if resp.StatusCode != http.StatusOK {
11191118
if err != nil {
@@ -1235,7 +1234,7 @@ func retryForIMDS(sender Sender, req *http.Request, maxAttempts int) (resp *http
12351234

12361235
for attempt < maxAttempts {
12371236
if resp != nil && resp.Body != nil {
1238-
io.Copy(ioutil.Discard, resp.Body)
1237+
io.Copy(io.Discard, resp.Body)
12391238
resp.Body.Close()
12401239
}
12411240
resp, err = sender.Do(req)

‎autorest/adal/token_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"crypto/x509/pkix"
2323
"encoding/json"
2424
"fmt"
25-
"io/ioutil"
25+
"io"
2626
"math/big"
2727
"net/http"
2828
"net/http/httptest"
@@ -632,7 +632,7 @@ func testServicePrincipalTokenRefreshSetsBody(t *testing.T, spt *ServicePrincipa
632632
(func() SendDecorator {
633633
return func(s Sender) Sender {
634634
return SenderFunc(func(r *http.Request) (*http.Response, error) {
635-
b, err := ioutil.ReadAll(r.Body)
635+
b, err := io.ReadAll(r.Body)
636636
if err != nil {
637637
t.Fatalf("adal: Failed to read body of Service Principal token request (%v)", err)
638638
}

‎autorest/azure/async.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"context"
2020
"encoding/json"
2121
"fmt"
22-
"io/ioutil"
22+
"io"
2323
"net/http"
2424
"net/url"
2525
"strings"
@@ -318,11 +318,11 @@ func (f Future) GetResult(sender autorest.Sender) (*http.Response, error) {
318318
if err == nil && resp.Body != nil {
319319
// copy the body and close it so callers don't have to
320320
defer resp.Body.Close()
321-
b, err := ioutil.ReadAll(resp.Body)
321+
b, err := io.ReadAll(resp.Body)
322322
if err != nil {
323323
return resp, err
324324
}
325-
resp.Body = ioutil.NopCloser(bytes.NewReader(b))
325+
resp.Body = io.NopCloser(bytes.NewReader(b))
326326
}
327327
return resp, err
328328
}
@@ -459,12 +459,12 @@ func (pt *pollingTrackerBase) updateRawBody() error {
459459
pt.rawBody = map[string]interface{}{}
460460
if pt.resp.ContentLength != 0 {
461461
defer pt.resp.Body.Close()
462-
b, err := ioutil.ReadAll(pt.resp.Body)
462+
b, err := io.ReadAll(pt.resp.Body)
463463
if err != nil {
464464
return autorest.NewErrorWithError(err, "pollingTrackerBase", "updateRawBody", nil, "failed to read response body")
465465
}
466466
// put the body back so it's available to other callers
467-
pt.resp.Body = ioutil.NopCloser(bytes.NewReader(b))
467+
pt.resp.Body = io.NopCloser(bytes.NewReader(b))
468468
// observed in 204 responses over HTTP/2.0; the content length is -1 but body is empty
469469
if len(b) == 0 {
470470
return nil
@@ -516,11 +516,11 @@ func (pt *pollingTrackerBase) updateErrorFromResponse() {
516516
re := respErr{}
517517
defer pt.resp.Body.Close()
518518
var b []byte
519-
if b, err = ioutil.ReadAll(pt.resp.Body); err != nil {
519+
if b, err = io.ReadAll(pt.resp.Body); err != nil {
520520
goto Default
521521
}
522522
// put the body back so it's available to other callers
523-
pt.resp.Body = ioutil.NopCloser(bytes.NewReader(b))
523+
pt.resp.Body = io.NopCloser(bytes.NewReader(b))
524524
if len(b) == 0 {
525525
goto Default
526526
}

‎autorest/azure/auth/auth.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"encoding/json"
2222
"errors"
2323
"fmt"
24-
"io/ioutil"
24+
"io"
2525
"log"
2626
"os"
2727
"strings"
@@ -325,7 +325,7 @@ func GetSettingsFromFile() (FileSettings, error) {
325325
return s, errors.New("environment variable AZURE_AUTH_LOCATION is not set")
326326
}
327327

328-
contents, err := ioutil.ReadFile(fileLocation)
328+
contents, err := os.ReadFile(fileLocation)
329329
if err != nil {
330330
return s, err
331331
}
@@ -488,7 +488,7 @@ func decode(b []byte) ([]byte, error) {
488488
}
489489
return []byte(string(utf16.Decode(u16))), nil
490490
}
491-
return ioutil.ReadAll(reader)
491+
return io.ReadAll(reader)
492492
}
493493

494494
func (settings FileSettings) getResourceForToken(baseURI string) (string, error) {
@@ -636,7 +636,7 @@ func (ccc ClientCertificateConfig) ServicePrincipalToken() (*adal.ServicePrincip
636636
if err != nil {
637637
return nil, err
638638
}
639-
certData, err := ioutil.ReadFile(ccc.CertificatePath)
639+
certData, err := os.ReadFile(ccc.CertificatePath)
640640
if err != nil {
641641
return nil, fmt.Errorf("failed to read the certificate file (%s): %v", ccc.CertificatePath, err)
642642
}
@@ -653,7 +653,7 @@ func (ccc ClientCertificateConfig) MultiTenantServicePrincipalToken() (*adal.Mul
653653
if err != nil {
654654
return nil, err
655655
}
656-
certData, err := ioutil.ReadFile(ccc.CertificatePath)
656+
certData, err := os.ReadFile(ccc.CertificatePath)
657657
if err != nil {
658658
return nil, fmt.Errorf("failed to read the certificate file (%s): %v", ccc.CertificatePath, err)
659659
}

‎autorest/azure/azure.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"bytes"
2121
"encoding/json"
2222
"fmt"
23-
"io/ioutil"
23+
"io"
2424
"net/http"
2525
"regexp"
2626
"strconv"
@@ -333,7 +333,7 @@ func WithErrorUnlessStatusCode(codes ...int) autorest.RespondDecorator {
333333
// Copy and replace the Body in case it does not contain an error object.
334334
// This will leave the Body available to the caller.
335335
b, decodeErr := autorest.CopyAndDecode(encodedAs, resp.Body, &e)
336-
resp.Body = ioutil.NopCloser(&b)
336+
resp.Body = io.NopCloser(&b)
337337
if decodeErr != nil {
338338
return fmt.Errorf("autorest/azure: error response cannot be parsed: %q error: %v", b, decodeErr)
339339
}

‎autorest/azure/azure_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package azure
1717
import (
1818
"encoding/json"
1919
"fmt"
20-
"io/ioutil"
20+
"io"
2121
"net/http"
2222
"reflect"
2323
"strconv"
@@ -175,7 +175,7 @@ func TestWithErrorUnlessStatusCode_NotAnAzureError(t *testing.T) {
175175

176176
// the error body should still be there
177177
defer r.Body.Close()
178-
b, err := ioutil.ReadAll(r.Body)
178+
b, err := io.ReadAll(r.Body)
179179
if err != nil {
180180
t.Fatal(err)
181181
}
@@ -226,7 +226,7 @@ func TestWithErrorUnlessStatusCode_FoundAzureErrorWithoutDetails(t *testing.T) {
226226

227227
// the error body should still be there
228228
defer r.Body.Close()
229-
b, err := ioutil.ReadAll(r.Body)
229+
b, err := io.ReadAll(r.Body)
230230
if err != nil {
231231
t.Fatal(err)
232232
}
@@ -305,7 +305,7 @@ func TestWithErrorUnlessStatusCode_FoundAzureFullError(t *testing.T) {
305305

306306
// the error body should still be there
307307
defer r.Body.Close()
308-
b, err := ioutil.ReadAll(r.Body)
308+
b, err := io.ReadAll(r.Body)
309309
if err != nil {
310310
t.Fatal(err)
311311
}
@@ -394,7 +394,7 @@ func TestWithErrorUnlessStatusCode_NoAzureError(t *testing.T) {
394394

395395
// the error body should still be there
396396
defer r.Body.Close()
397-
b, err := ioutil.ReadAll(r.Body)
397+
b, err := io.ReadAll(r.Body)
398398
if err != nil {
399399
t.Fatal(err)
400400
}
@@ -488,7 +488,7 @@ func TestWithErrorUnlessStatusCode_UnwrappedError(t *testing.T) {
488488

489489
// the error body should still be there
490490
defer r.Body.Close()
491-
b, err := ioutil.ReadAll(r.Body)
491+
b, err := io.ReadAll(r.Body)
492492
if err != nil {
493493
t.Error(err)
494494
}

‎autorest/azure/cli/profile.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"bytes"
1919
"encoding/json"
2020
"fmt"
21-
"io/ioutil"
2221
"os"
2322
"path/filepath"
2423

@@ -66,7 +65,7 @@ func ProfilePath() (string, error) {
6665
// LoadProfile restores a Profile object from a file located at 'path'.
6766
func LoadProfile(path string) (result Profile, err error) {
6867
var contents []byte
69-
contents, err = ioutil.ReadFile(path)
68+
contents, err = os.ReadFile(path)
7069
if err != nil {
7170
err = fmt.Errorf("failed to open file (%s) while loading token: %v", path, err)
7271
return

‎autorest/azure/environments.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package azure
1717
import (
1818
"encoding/json"
1919
"fmt"
20-
"io/ioutil"
2120
"os"
2221
"strings"
2322
)
@@ -315,7 +314,7 @@ func EnvironmentFromName(name string) (Environment, error) {
315314
// This function is particularly useful in the Hybrid Cloud model, where one must define their own
316315
// endpoints.
317316
func EnvironmentFromFile(location string) (unmarshaled Environment, err error) {
318-
fileContents, err := ioutil.ReadFile(location)
317+
fileContents, err := os.ReadFile(location)
319318
if err != nil {
320319
return
321320
}

0 commit comments

Comments
 (0)