Skip to content

Commit 6fe05ef

Browse files
testwilltestwill
committed
chore: remove refs to deprecated io/ioutil
Signed-off-by: guoguangwu <[email protected]>
1 parent 8187952 commit 6fe05ef

File tree

11 files changed

+22
-29
lines changed

11 files changed

+22
-29
lines changed

‎api-service/node/services/hugepages.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ package services
1515

1616
import (
1717
"context"
18-
"io/ioutil"
18+
"os"
1919
"strconv"
2020
"strings"
2121

@@ -41,7 +41,7 @@ func (n *Node) SetHugepages(ctx context.Context, h *protos.Hugepages) (*protos.H
4141
}
4242

4343
msg := []byte(strconv.Itoa(int(hugepages.Pages)))
44-
err := ioutil.WriteFile(hugepagesPath, msg, 0644)
44+
err := os.WriteFile(hugepagesPath, msg, 0644)
4545
if err != nil {
4646
klog.Errorf("Error setting huge pages: %v", err)
4747
return nil, status.Errorf(codes.Internal, "Error setting hugepages")
@@ -55,7 +55,7 @@ func (n *Node) GetHugepages(ctx context.Context, null *protos.Null) (*protos.Hug
5555

5656
klog.Info("Getting the number of hugepages")
5757

58-
hugepages, err := ioutil.ReadFile(hugepagesPath)
58+
hugepages, err := os.ReadFile(hugepagesPath)
5959
if err != nil {
6060
klog.Errorf("Error fetching number of hugepages %v", err)
6161
return nil, status.Errorf(codes.Internal, "Error fetching the number of hugepages set on the node")

‎cmd/ndm_daemonset/controller/ndmconfig.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package controller
1818

1919
import (
2020
"encoding/json"
21-
"io/ioutil"
21+
"os"
2222

2323
"k8s.io/klog/v2"
2424
"sigs.k8s.io/yaml"
@@ -73,7 +73,7 @@ type MetaConfig struct {
7373
// SetNDMConfig sets config for probes and filters which user provides via configmap. If
7474
// no configmap present then ndm will load default config for each probes and filters.
7575
func (c *Controller) SetNDMConfig(opts NDMOptions) {
76-
data, err := ioutil.ReadFile(opts.ConfigFilePath)
76+
data, err := os.ReadFile(opts.ConfigFilePath)
7777
if err != nil {
7878
c.NDMConfig = nil
7979
klog.Error("unable to set ndm config : ", err)

‎cmd/ndm_daemonset/controller/ndmconfig_test.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package controller
1818

1919
import (
20-
"io/ioutil"
2120
"os"
2221
"testing"
2322

@@ -47,7 +46,7 @@ func TestSetNDMConfig(t *testing.T) {
4746
},
4847
]
4948
}`)
50-
err := ioutil.WriteFile(fakeConfigFilePath, fileContent, 0644)
49+
err := os.WriteFile(fakeConfigFilePath, fileContent, 0644)
5150
if err != nil {
5251
t.Fatal(err)
5352
}
@@ -88,7 +87,7 @@ func TestSetNDMConfig(t *testing.T) {
8887
expectedNDMConfig.FilterConfigs = append(expectedNDMConfig.FilterConfigs, expectedFilterConfig)
8988
expectedNDMConfig.ProbeConfigs = append(expectedNDMConfig.ProbeConfigs, expectedProbeConfig)
9089

91-
err = ioutil.WriteFile(fakeConfigFilePath, fileContent, 0644)
90+
err = os.WriteFile(fakeConfigFilePath, fileContent, 0644)
9291
if err != nil {
9392
t.Fatal(err)
9493
}
@@ -135,6 +134,6 @@ filterconfigs:
135134
exclude: /,/etc/hosts,/boot
136135
`
137136

138-
err := ioutil.WriteFile(fpath, []byte(data), 0644)
137+
err := os.WriteFile(fpath, []byte(data), 0644)
139138
assert.NoError(t, err)
140139
}

‎cmd/ndm_daemonset/controller/sparsefilegenerator.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package controller
1818

1919
import (
20-
"io/ioutil"
2120
"strings"
2221

2322
"github.com/openebs/node-disk-manager/blockdevice"
@@ -183,7 +182,7 @@ func GetSparseBlockDeviceUUID(hostname, sparseFile string) string {
183182
func GetActiveSparseBlockDevicesUUID(hostname string) []string {
184183
sparseFileLocation := GetSparseFileDir()
185184
sparseUuids := make([]string, 0)
186-
files, err := ioutil.ReadDir(sparseFileLocation)
185+
files, err := os.ReadDir(sparseFileLocation)
187186
if err != nil {
188187
klog.Error("Failed to read sparse file names : ", err)
189188
return sparseUuids

‎cmd/ndm_daemonset/probe/mountprobe_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package probe
1818

1919
import (
20-
"io/ioutil"
2120
"os"
2221
"path"
2322
"syscall"
@@ -141,5 +140,5 @@ func exitFakeRoot() error {
141140
}
142141

143142
func createMountsFile(dest string) error {
144-
return ioutil.WriteFile(dest, []byte(sampleMountsFile), 0444)
143+
return os.WriteFile(dest, []byte(sampleMountsFile), 0444)
145144
}

‎integration_tests/sanity/mount_change_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package sanity
1818

1919
import (
20-
"io/ioutil"
20+
"os"
2121

2222
. "github.com/onsi/ginkgo"
2323
. "github.com/onsi/gomega"
@@ -78,7 +78,7 @@ func tearDown(kcli *k8s.K8sClient, disk *udev.Disk) func() {
7878

7979
func generateMountPath(mountPath *string) func() {
8080
return func() {
81-
mp, err := ioutil.TempDir("", "ndm-integration-tests")
81+
mp, err := os.MkdirTemp("", "ndm-integration-tests")
8282
Expect(err).ToNot(HaveOccurred())
8383
*mountPath = mp
8484
}

‎integration_tests/utils/file.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@ package utils
1818

1919
import (
2020
"fmt"
21-
"io/ioutil"
2221
"os"
2322
"path/filepath"
2423
)
2524

2625
// GetYAMLString gets the yaml-string from the given YAML file
2726
func GetYAMLString(fileName string) (string, error) {
28-
fileBytes, err := ioutil.ReadFile(filepath.Clean(fileName))
27+
fileBytes, err := os.ReadFile(filepath.Clean(fileName))
2928
if err != nil {
3029
return "", err
3130
}

‎pkg/mount/mountutil_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package mount
1818

1919
import (
2020
"errors"
21-
"io/ioutil"
2221
"os"
2322
"path/filepath"
2423
"strings"
@@ -164,7 +163,7 @@ func TestGetMountAttr(t *testing.T) {
164163
mountUtil := NewMountUtil(filePath, test.devPath, test.mountPoint)
165164

166165
// create the temp file which will be read for getting attributes
167-
err := ioutil.WriteFile(filePath, test.fileContent, 0644)
166+
err := os.WriteFile(filePath, test.fileContent, 0644)
168167
if err != nil {
169168
t.Fatal(err)
170169
}

‎pkg/sysfs/syspath.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package sysfs
1818

1919
import (
2020
"fmt"
21-
"io/ioutil"
2221
"os"
2322
"path/filepath"
2423
"strings"
@@ -112,7 +111,7 @@ func (s Device) getPartitions() ([]string, bool) {
112111

113112
partitions := make([]string, 0)
114113

115-
files, err := ioutil.ReadDir(s.sysPath)
114+
files, err := os.ReadDir(s.sysPath)
116115
if err != nil {
117116
return nil, false
118117
}
@@ -135,7 +134,7 @@ func (s Device) getHolders() ([]string, bool) {
135134
return nil, false
136135
}
137136

138-
files, err := ioutil.ReadDir(holderPath)
137+
files, err := os.ReadDir(holderPath)
139138
if err != nil {
140139
return nil, false
141140
}
@@ -157,7 +156,7 @@ func (s Device) getSlaves() ([]string, bool) {
157156
return nil, false
158157
}
159158

160-
files, err := ioutil.ReadDir(slavePath)
159+
files, err := os.ReadDir(slavePath)
161160
if err != nil {
162161
return nil, false
163162
}

‎pkg/sysfs/util.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package sysfs
1818

1919
import (
20-
"io/ioutil"
20+
"os"
2121
"path/filepath"
2222
"strconv"
2323
"strings"
@@ -26,7 +26,7 @@ import (
2626
// readSysFSFileAsInt64 reads a file and
2727
// converts that content into int64
2828
func readSysFSFileAsInt64(sysFilePath string) (int64, error) {
29-
b, err := ioutil.ReadFile(filepath.Clean(sysFilePath))
29+
b, err := os.ReadFile(filepath.Clean(sysFilePath))
3030
if err != nil {
3131
return 0, err
3232
}
@@ -35,7 +35,7 @@ func readSysFSFileAsInt64(sysFilePath string) (int64, error) {
3535
}
3636

3737
func readSysFSFileAsString(sysFilePath string) (string, error) {
38-
b, err := ioutil.ReadFile(filepath.Clean(sysFilePath))
38+
b, err := os.ReadFile(filepath.Clean(sysFilePath))
3939
if err != nil {
4040
return "", err
4141
}

‎pkg/udev/mockdata.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ package udev
2525
import "C"
2626
import (
2727
"bufio"
28-
"io/ioutil"
2928
"os"
3029
"path"
3130
"path/filepath"
@@ -145,7 +144,7 @@ func OsDiskName() (string, string, error) {
145144

146145
// getSyspathOfOsDisk returns syspath of os disk in success
147146
func getSyspathOfOsDisk(osDiskName string) (string, error) {
148-
data, err := ioutil.ReadFile(filepath.Clean(path.Join("/sys/class/block/", osDiskName, "dev")))
147+
data, err := os.ReadFile(filepath.Clean(path.Join("/sys/class/block/", osDiskName, "dev")))
149148
if err != nil {
150149
return "", err
151150
}
@@ -154,7 +153,7 @@ func getSyspathOfOsDisk(osDiskName string) (string, error) {
154153

155154
// getOsDiskSize returns size of os disk in success
156155
func getOsDiskSize(osDiskName string) (string, error) {
157-
sizeByte, err := ioutil.ReadFile(filepath.Clean(path.Join("/sys/class/block/", osDiskName, "size")))
156+
sizeByte, err := os.ReadFile(filepath.Clean(path.Join("/sys/class/block/", osDiskName, "size")))
158157
if err != nil {
159158
return "", err
160159
}

0 commit comments

Comments
 (0)