Skip to content

Commit e7f266b

Browse files
chore: remove refs to deprecated io/ioutil (#1559)
Co-authored-by: Akshay Gupta <aksgupta@microsoft.com>
1 parent f3d4d39 commit e7f266b

File tree

8 files changed

+18
-21
lines changed

8 files changed

+18
-21
lines changed

functional_tests/helpers.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ package functests
88
import (
99
"encoding/json"
1010
"fmt"
11-
"io/ioutil"
1211
"os"
1312
"strings"
1413

@@ -49,10 +48,10 @@ func check(cbCtx *appgw.ConfigBuilderContext, expectedFilename string, stopChan
4948

5049
// Repair tests
5150
if os.Getenv("RENDER_SNAPSHOTS") != "" {
52-
ioutil.WriteFile(expectedFilename, []byte(actualJSONTxt), 0644)
51+
os.WriteFile(expectedFilename, []byte(actualJSONTxt), 0644)
5352
}
5453

55-
expectedBytes, err := ioutil.ReadFile(expectedFilename)
54+
expectedBytes, err := os.ReadFile(expectedFilename)
5655
expectedJSON := strings.Trim(string(expectedBytes), "\n")
5756
gomega.Expect(err).ToNot(gomega.HaveOccurred())
5857

helm/ingress-azure/tests/snapshots.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"bufio"
1010
"fmt"
1111
"io"
12-
"io/ioutil"
1312
"os"
1413
"os/exec"
1514
"path/filepath"
@@ -73,7 +72,7 @@ func RenderChart(chart, values, dir string) error {
7372

7473
// CaptureSnapshot renders a new snapshot from a given Helm chart and values file.
7574
func CaptureSnapshot(chart, values string) (*Snapshot, error) {
76-
dir, err := ioutil.TempDir("", "")
75+
dir, err := os.MkdirTemp("", "")
7776
if err != nil {
7877
return nil, fmt.Errorf("creating tempdir: %v", err)
7978
}
@@ -163,7 +162,7 @@ func StripNonDeterministic(path string) error {
163162
lines = append(lines, text)
164163
}
165164

166-
return ioutil.WriteFile(path, []byte(strings.Join(lines, "\n")), 0644)
165+
return os.WriteFile(path, []byte(strings.Join(lines, "\n")), 0644)
167166
})
168167
}
169168

pkg/appgw/appgw_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package appgw
88
import (
99
"context"
1010
"fmt"
11-
"io/ioutil"
11+
"os"
1212
"time"
1313

1414
n "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-03-01/network"
@@ -606,11 +606,11 @@ var _ = Describe("Tests `appgw.ConfigBuilder`", func() {
606606
Data: make(map[string][]byte),
607607
}
608608

609-
key, err := ioutil.ReadFile("../../tests/data/k8s.cert.key")
609+
key, err := os.ReadFile("../../tests/data/k8s.cert.key")
610610
Ω(err).ToNot(HaveOccurred(), "Unable to read the cert key: %v", err)
611611
ingressSecret.Data["tls.key"] = key
612612

613-
cert, err := ioutil.ReadFile("../../tests/data/k8s.x509.cert")
613+
cert, err := os.ReadFile("../../tests/data/k8s.x509.cert")
614614
Ω(err).ToNot(HaveOccurred(), "Unable to read the cert key: %v", err)
615615
ingressSecret.Data["tls.crt"] = cert
616616

pkg/azure/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"bytes"
55
"encoding/json"
66
"errors"
7-
"io/ioutil"
7+
"io"
88
"net/http"
99
"time"
1010

@@ -29,7 +29,7 @@ func (fs *FakeSender) Do(request *http.Request) (response *http.Response, err er
2929
if fs.body != nil {
3030
b, err := json.Marshal(fs.body)
3131
if err == nil {
32-
response.Body = ioutil.NopCloser(bytes.NewReader(b))
32+
response.Body = io.NopCloser(bytes.NewReader(b))
3333
}
3434
}
3535
}

pkg/azure/cloudproviderconfig.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package azure
88
import (
99
"encoding/json"
1010
"fmt"
11-
"io/ioutil"
11+
"os"
1212
)
1313

1414
// CloudProviderConfig represent the CloudProvider Context file such as Azure
@@ -29,7 +29,7 @@ type CloudProviderConfig struct {
2929

3030
// NewCloudProviderConfig returns an CloudProviderConfig struct from file path
3131
func NewCloudProviderConfig(path string) (*CloudProviderConfig, error) {
32-
b, err := ioutil.ReadFile(path)
32+
b, err := os.ReadFile(path)
3333
if err != nil {
3434
return nil, fmt.Errorf("Reading Az Context file %q failed: %v", path, err)
3535
}

pkg/k8scontext/secretstore.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ package k8scontext
77

88
import (
99
"bytes"
10-
"io/ioutil"
1110
"os"
1211
"os/exec"
1312
"sync"
@@ -81,7 +80,7 @@ func (s *SecretsStore) ConvertSecret(secretKey string, secret *v1.Secret) error
8180
)
8281
}
8382

84-
tempfileCert, err := ioutil.TempFile("", "appgw-ingress-cert")
83+
tempfileCert, err := os.CreateTemp("", "appgw-ingress-cert")
8584
if err != nil {
8685
return controllererrors.NewErrorWithInnerErrorf(
8786
controllererrors.ErrorCreatingFile,
@@ -91,7 +90,7 @@ func (s *SecretsStore) ConvertSecret(secretKey string, secret *v1.Secret) error
9190
}
9291
defer os.Remove(tempfileCert.Name())
9392

94-
tempfileKey, err := ioutil.TempFile("", "appgw-ingress-key")
93+
tempfileKey, err := os.CreateTemp("", "appgw-ingress-key")
9594
if err != nil {
9695
return controllererrors.NewErrorWithInnerErrorf(
9796
controllererrors.ErrorCreatingFile,

pkg/tests/fixtures.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package tests
77

88
import (
99
"fmt"
10-
"io/ioutil"
10+
"os"
1111

1212
n "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-03-01/network"
1313
"github.com/Azure/go-autorest/autorest/to"
@@ -150,7 +150,7 @@ func GetIngressNamespaced() (*[]networking.Ingress, error) {
150150

151151
// GetIngressV1FromFile reads an ingress V1 from file
152152
func GetIngressV1FromFile(fileName string) (*networking.Ingress, error) {
153-
ingr, err := ioutil.ReadFile(fileName)
153+
ingr, err := os.ReadFile(fileName)
154154
if err != nil {
155155
fmt.Print(err)
156156
}
@@ -164,7 +164,7 @@ func GetIngressV1FromFile(fileName string) (*networking.Ingress, error) {
164164

165165
// GetIngressV1Beta1FromFile reads an ingress V1Beta1 from file
166166
func GetIngressV1Beta1FromFile(fileName string) (*extensions.Ingress, error) {
167-
ingr, err := ioutil.ReadFile(fileName)
167+
ingr, err := os.ReadFile(fileName)
168168
if err != nil {
169169
fmt.Print(err)
170170
}

pkg/utils/utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"crypto/md5"
1010
"encoding/json"
1111
"fmt"
12-
"io/ioutil"
12+
"os"
1313
"math/rand"
1414
"strings"
1515
"time"
@@ -43,7 +43,7 @@ func GetLastChunkOfSlashed(s string) string {
4343

4444
// SaveToFile saves the content into a file named "fileName" - a tool primarily used for debugging purposes.
4545
func SaveToFile(fileName string, content []byte) (string, error) {
46-
tempFile, err := ioutil.TempFile("", fileName)
46+
tempFile, err := os.CreateTemp("", fileName)
4747
if err != nil {
4848
klog.Error(err)
4949
return tempFile.Name(), err

0 commit comments

Comments
 (0)