Skip to content

Commit 58cd01a

Browse files
NanamiNakanoaustinvazquez
NanamiNakano
authored and
austinvazquez
committed
chore: Replaced deprecated methods in ioutil using io and os packages
Signed-off-by: NanamiNakano <[email protected]>
1 parent 53f5ca4 commit 58cd01a

File tree

6 files changed

+41
-46
lines changed

6 files changed

+41
-46
lines changed

‎benchmark_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,20 @@ import (
1616
"bufio"
1717
"context"
1818
"fmt"
19-
"io/ioutil"
2019
"os"
2120
"path/filepath"
2221
"strings"
2322
"testing"
2423

2524
"github.com/sirupsen/logrus"
2625

27-
models "github.com/firecracker-microvm/firecracker-go-sdk/client/models"
26+
"github.com/firecracker-microvm/firecracker-go-sdk/client/models"
2827
)
2928

3029
const numberOfVMs = 200
3130

3231
func createMachine(ctx context.Context, name string, forwardSignals []os.Signal) (*Machine, func(), error) {
33-
dir, err := ioutil.TempDir("", name)
32+
dir, err := os.MkdirTemp("", name)
3433
if err != nil {
3534
return nil, nil, err
3635
}
@@ -50,9 +49,9 @@ func createMachine(ctx context.Context, name string, forwardSignals []os.Signal)
5049
MetricsFifo: metrics,
5150
LogLevel: "Info",
5251
MachineCfg: models.MachineConfiguration{
53-
VcpuCount: Int64(1),
54-
MemSizeMib: Int64(256),
55-
Smt: Bool(false),
52+
VcpuCount: Int64(1),
53+
MemSizeMib: Int64(256),
54+
Smt: Bool(false),
5655
},
5756
Drives: []models.Drive{
5857
{

‎examples/cmd/snapshotting/example_demo.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"context"
1919
"errors"
2020
"fmt"
21-
"io/ioutil"
2221
"log"
2322
"os"
2423
"path/filepath"
@@ -45,7 +44,7 @@ const (
4544
)
4645

4746
func writeCNIConfWithHostLocalSubnet(path, networkName, subnet string) error {
48-
return ioutil.WriteFile(path, []byte(fmt.Sprintf(`{
47+
return os.WriteFile(path, []byte(fmt.Sprintf(`{
4948
"cniVersion": "0.3.1",
5049
"name": "%s",
5150
"plugins": [
@@ -60,7 +59,7 @@ func writeCNIConfWithHostLocalSubnet(path, networkName, subnet string) error {
6059
"type": "tc-redirect-tap"
6160
}
6261
]
63-
}`, networkName, subnet)), 0644)
62+
}`, networkName, subnet)), 0644)
6463
}
6564

6665
type configOpt func(*sdk.Config)
@@ -111,7 +110,7 @@ func createNewConfig(socketPath string, opts ...configOpt) sdk.Config {
111110
}
112111

113112
func connectToVM(m *sdk.Machine, sshKeyPath string) (*ssh.Client, error) {
114-
key, err := ioutil.ReadFile(sshKeyPath)
113+
key, err := os.ReadFile(sshKeyPath)
115114
if err != nil {
116115
return nil, err
117116
}
@@ -405,7 +404,7 @@ func main() {
405404
defer os.Remove(cniConfDir)
406405

407406
// Setup socket and snapshot + memory paths
408-
tempdir, err := ioutil.TempDir("", "FCGoSDKSnapshotExample")
407+
tempdir, err := os.MkdirTemp("", "FCGoSDKSnapshotExample")
409408
if err != nil {
410409
log.Fatal(err)
411410
}

‎jailer.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"context"
1818
"fmt"
1919
"io"
20-
"io/ioutil"
2120
"os"
2221
"os/exec"
2322
"path/filepath"
@@ -124,7 +123,7 @@ func NewJailerCommandBuilder() JailerCommandBuilder {
124123

125124
// getNumaCpuset returns the CPU list assigned to a NUMA node
126125
func getNumaCpuset(node int) string {
127-
if cpus, err := ioutil.ReadFile(fmt.Sprintf("/sys/devices/system/node/node%d/cpulist", node)); err == nil {
126+
if cpus, err := os.ReadFile(fmt.Sprintf("/sys/devices/system/node/node%d/cpulist", node)); err == nil {
128127
return strings.TrimSuffix(string(cpus), "\n")
129128
}
130129
return ""

‎machine_test.go

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"flag"
2121
"fmt"
2222
"io"
23-
"io/ioutil"
2423
"net"
2524
"os"
2625
"os/exec"
@@ -95,7 +94,7 @@ var fsSafeTestName = strings.NewReplacer("/", "_")
9594
func makeSocketPath(tb testing.TB) (string, func()) {
9695
tb.Helper()
9796

98-
dir, err := ioutil.TempDir("", fsSafeTestName.Replace(tb.Name()))
97+
dir, err := os.MkdirTemp("", fsSafeTestName.Replace(tb.Name()))
9998
require.NoError(tb, err)
10099

101100
return filepath.Join(dir, "fc.sock"), func() { os.RemoveAll(dir) }
@@ -157,7 +156,7 @@ func TestJailerMicroVMExecution(t *testing.T) {
157156

158157
// uses temp directory due to testdata's path being too long which causes a
159158
// SUN_LEN error.
160-
tmpDir, err := ioutil.TempDir(os.TempDir(), "jailer-test")
159+
tmpDir, err := os.MkdirTemp(os.TempDir(), "jailer-test")
161160
if err != nil {
162161
t.Fatalf("Failed to create temporary directory: %v", err)
163162
}
@@ -298,7 +297,7 @@ func TestMicroVMExecution(t *testing.T) {
298297
var nCpus int64 = 2
299298
var memSz int64 = 256
300299

301-
dir, err := ioutil.TempDir("", t.Name())
300+
dir, err := os.MkdirTemp("", t.Name())
302301
require.NoError(t, err)
303302
defer os.RemoveAll(dir)
304303

@@ -484,7 +483,7 @@ func TestLogAndMetrics(t *testing.T) {
484483
func testLogAndMetrics(t *testing.T, logLevel string) string {
485484
const vmID = "UserSuppliedVMID"
486485

487-
dir, err := ioutil.TempDir("", strings.Replace(t.Name(), "/", "_", -1))
486+
dir, err := os.MkdirTemp("", strings.Replace(t.Name(), "/", "_", -1))
488487
require.NoError(t, err)
489488
defer os.RemoveAll(dir)
490489

@@ -534,7 +533,7 @@ func testLogAndMetrics(t *testing.T, logLevel string) string {
534533
require.NoError(t, err)
535534
assert.NotEqual(t, 0, log.Size())
536535

537-
content, err := ioutil.ReadFile(cfg.LogPath)
536+
content, err := os.ReadFile(cfg.LogPath)
538537
require.NoError(t, err)
539538
return string(content)
540539
}
@@ -806,7 +805,7 @@ func TestStopVMMCleanup(t *testing.T) {
806805
socketPath, cleanup := makeSocketPath(t)
807806
defer cleanup()
808807

809-
dir, err := ioutil.TempDir("", t.Name())
808+
dir, err := os.MkdirTemp("", t.Name())
810809
require.NoError(t, err)
811810
defer os.RemoveAll(dir)
812811

@@ -939,7 +938,7 @@ func TestMicroVMExecutionWithMmdsV2(t *testing.T) {
939938
var nCpus int64 = 2
940939
var memSz int64 = 256
941940

942-
dir, err := ioutil.TempDir("", t.Name())
941+
dir, err := os.MkdirTemp("", t.Name())
943942
require.NoError(t, err)
944943
defer os.RemoveAll(dir)
945944

@@ -1156,7 +1155,7 @@ func TestLogFiles(t *testing.T) {
11561155
}
11571156

11581157
func TestCaptureFifoToFile(t *testing.T) {
1159-
dir, err := ioutil.TempDir("", t.Name())
1158+
dir, err := os.MkdirTemp("", t.Name())
11601159
require.NoError(t, err)
11611160
defer os.RemoveAll(dir)
11621161

@@ -1207,13 +1206,13 @@ func TestCaptureFifoToFile(t *testing.T) {
12071206
wg.Wait()
12081207
_, err = os.Stat(logPath)
12091208
assert.NoError(t, err, "failed to stat file")
1210-
b, err := ioutil.ReadFile(logPath)
1209+
b, err := os.ReadFile(logPath)
12111210
assert.NoError(t, err, "failed to read logPath")
12121211
assert.Equal(t, expectedBytes, b)
12131212
}
12141213

12151214
func TestCaptureFifoToFile_nonblock(t *testing.T) {
1216-
dir, err := ioutil.TempDir("", t.Name())
1215+
dir, err := os.MkdirTemp("", t.Name())
12171216
require.NoError(t, err)
12181217
defer os.RemoveAll(dir)
12191218

@@ -1270,7 +1269,7 @@ func TestCaptureFifoToFile_nonblock(t *testing.T) {
12701269
wg.Wait()
12711270
_, err = os.Stat(logPath)
12721271
assert.NoError(t, err, "failed to stat file")
1273-
b, err := ioutil.ReadFile(logPath)
1272+
b, err := os.ReadFile(logPath)
12741273
assert.NoError(t, err, "failed to read logPath")
12751274
assert.Equal(t, expectedBytes, b)
12761275
}
@@ -1335,7 +1334,7 @@ func TestPID(t *testing.T) {
13351334
t.Errorf("expected an error, but received none")
13361335
}
13371336

1338-
dir, err := ioutil.TempDir("", t.Name())
1337+
dir, err := os.MkdirTemp("", t.Name())
13391338
require.NoError(t, err)
13401339
defer os.RemoveAll(dir)
13411340

@@ -1346,10 +1345,10 @@ func TestPID(t *testing.T) {
13461345

13471346
vmlinuxPath := getVmlinuxPath(t)
13481347

1349-
rootfsBytes, err := ioutil.ReadFile(testRootfs)
1348+
rootfsBytes, err := os.ReadFile(testRootfs)
13501349
require.NoError(t, err, "failed to read rootfs file")
13511350
rootfsPath := filepath.Join(dir, "TestPID.img")
1352-
err = ioutil.WriteFile(rootfsPath, rootfsBytes, 0666)
1351+
err = os.WriteFile(rootfsPath, rootfsBytes, 0666)
13531352
require.NoError(t, err, "failed to copy vm rootfs to %s", rootfsPath)
13541353

13551354
cfg := Config{
@@ -1414,7 +1413,7 @@ func TestCaptureFifoToFile_leak(t *testing.T) {
14141413
exitCh: make(chan struct{}),
14151414
}
14161415

1417-
dir, err := ioutil.TempDir("", t.Name())
1416+
dir, err := os.MkdirTemp("", t.Name())
14181417
require.NoError(t, err)
14191418
defer os.RemoveAll(dir)
14201419

@@ -1799,7 +1798,7 @@ func TestPauseResume(t *testing.T) {
17991798
fctesting.RequiresKVM(t)
18001799
fctesting.RequiresRoot(t)
18011800

1802-
dir, err := ioutil.TempDir("", t.Name())
1801+
dir, err := os.MkdirTemp("", t.Name())
18031802
require.NoError(t, err)
18041803
defer os.RemoveAll(dir)
18051804

@@ -1911,7 +1910,7 @@ func TestCreateSnapshot(t *testing.T) {
19111910
fctesting.RequiresKVM(t)
19121911
fctesting.RequiresRoot(t)
19131912

1914-
dir, err := ioutil.TempDir("", t.Name())
1913+
dir, err := os.MkdirTemp("", t.Name())
19151914
require.NoError(t, err)
19161915
defer os.RemoveAll(dir)
19171916

@@ -1975,7 +1974,7 @@ func TestCreateSnapshot(t *testing.T) {
19751974
}
19761975

19771976
func connectToVM(m *Machine, sshKeyPath string) (*ssh.Client, error) {
1978-
key, err := ioutil.ReadFile(sshKeyPath)
1977+
key, err := os.ReadFile(sshKeyPath)
19791978
if err != nil {
19801979
return nil, err
19811980
}
@@ -2004,7 +2003,7 @@ func connectToVM(m *Machine, sshKeyPath string) (*ssh.Client, error) {
20042003
}
20052004

20062005
func writeCNIConfWithHostLocalSubnet(path, networkName, subnet string) error {
2007-
return ioutil.WriteFile(path, []byte(fmt.Sprintf(`{
2006+
return os.WriteFile(path, []byte(fmt.Sprintf(`{
20082007
"cniVersion": "0.3.1",
20092008
"name": "%s",
20102009
"plugins": [
@@ -2026,7 +2025,7 @@ func TestLoadSnapshot(t *testing.T) {
20262025
fctesting.RequiresKVM(t)
20272026
fctesting.RequiresRoot(t)
20282027

2029-
dir, err := ioutil.TempDir("", t.Name())
2028+
dir, err := os.MkdirTemp("", t.Name())
20302029
require.NoError(t, err)
20312030
defer os.RemoveAll(dir)
20322031

@@ -2036,16 +2035,16 @@ func TestLoadSnapshot(t *testing.T) {
20362035

20372036
cniBinPath := []string{testDataBin}
20382037

2039-
rootfsBytes, err := ioutil.ReadFile(testRootfsWithSSH)
2038+
rootfsBytes, err := os.ReadFile(testRootfsWithSSH)
20402039
require.NoError(t, err)
20412040
rootfsPath := filepath.Join(dir, "rootfs.img")
2042-
err = ioutil.WriteFile(rootfsPath, rootfsBytes, 0666)
2041+
err = os.WriteFile(rootfsPath, rootfsBytes, 0666)
20432042
require.NoError(t, err)
20442043

2045-
sshKeyBytes, err := ioutil.ReadFile(testSSHKey)
2044+
sshKeyBytes, err := os.ReadFile(testSSHKey)
20462045
require.NoError(t, err)
20472046
sshKeyPath := filepath.Join(dir, "id_rsa")
2048-
err = ioutil.WriteFile(sshKeyPath, sshKeyBytes, 0600)
2047+
err = os.WriteFile(sshKeyPath, sshKeyBytes, 0600)
20492048
require.NoError(t, err)
20502049

20512050
// Using default cache directory to ensure collision avoidance on IP allocations

‎network_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ package firecracker
1616
import (
1717
"context"
1818
"fmt"
19-
"io/ioutil"
2019
"net"
2120
"os"
2221
"path/filepath"
@@ -26,7 +25,7 @@ import (
2625
"time"
2726

2827
"github.com/containernetworking/cni/libcni"
29-
models "github.com/firecracker-microvm/firecracker-go-sdk/client/models"
28+
"github.com/firecracker-microvm/firecracker-go-sdk/client/models"
3029
"github.com/firecracker-microvm/firecracker-go-sdk/fctesting"
3130
"github.com/go-ping/ping"
3231
"github.com/stretchr/testify/assert"
@@ -256,7 +255,7 @@ func testNetworkMachineCNI(t *testing.T, useConfFile bool) {
256255

257256
cniBinPath := []string{testDataBin, "/opt/cni/bin"}
258257

259-
dir, err := ioutil.TempDir("", fsSafeTestName.Replace(t.Name()))
258+
dir, err := os.MkdirTemp("", fsSafeTestName.Replace(t.Name()))
260259
require.NoError(t, err)
261260
defer os.RemoveAll(dir)
262261

@@ -300,7 +299,7 @@ func testNetworkMachineCNI(t *testing.T, useConfFile bool) {
300299
cniConfPath := filepath.Join(cniConfDir, fmt.Sprintf("%s.conflist", networkName))
301300
if useConfFile {
302301
require.NoError(t,
303-
ioutil.WriteFile(cniConfPath, []byte(cniConf), 0666), // broad permissions for tests
302+
os.WriteFile(cniConfPath, []byte(cniConf), 0666), // broad permissions for tests
304303
"failed to write cni conf file")
305304
} else {
306305
// make sure config file doesn't exist
@@ -389,9 +388,9 @@ func newCNIMachine(t *testing.T,
389388
cniBinPath []string,
390389
networkConf *libcni.NetworkConfigList,
391390
) *Machine {
392-
rootfsBytes, err := ioutil.ReadFile(testRootfs)
391+
rootfsBytes, err := os.ReadFile(testRootfs)
393392
require.NoError(t, err, "failed to read rootfs file")
394-
err = ioutil.WriteFile(rootfsPath, rootfsBytes, 0666)
393+
err = os.WriteFile(rootfsPath, rootfsBytes, 0666)
395394
require.NoError(t, err, "failed to copy vm rootfs to %s", rootfsPath)
396395

397396
if networkConf != nil {

‎vsock/dial.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"context"
1919
"errors"
2020
"fmt"
21-
"io/ioutil"
21+
"io"
2222
"net"
2323
"strings"
2424
"time"
@@ -37,7 +37,7 @@ type config struct {
3737

3838
func defaultConfig() config {
3939
noop := logrus.New()
40-
noop.Out = ioutil.Discard
40+
noop.Out = io.Discard
4141

4242
return config{
4343
DialTimeout: 100 * time.Millisecond,

0 commit comments

Comments
 (0)