Skip to content

Commit a43b6ca

Browse files
committed
remove deprecated ioutils package
1 parent d8f6ba4 commit a43b6ca

3 files changed

Lines changed: 12 additions & 11 deletions

File tree

cmd/dblock/dblock.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"encoding/json"
55
"flag"
66
"fmt"
7-
"io/ioutil"
87
"log"
98
"os"
109

@@ -42,15 +41,18 @@ func persistModel(m *model.DatabaseSchema) {
4241
if err != nil {
4342
glog.Fatal(err)
4443
}
45-
err = ioutil.WriteFile(*schemaLockFile, b, 0644)
44+
err = os.WriteFile(*schemaLockFile, b, 0644)
4645
if err != nil {
4746
glog.Fatal(err)
4847
}
4948
glog.Info("Database schemas has been writen successfully.")
5049
}
5150

5251
func main() {
53-
flag.Set("logtostderr", "true")
52+
err := flag.Set("logtostderr", "true")
53+
if err != nil {
54+
glog.Fatal(err.Error())
55+
}
5456
flag.Usage = func() {
5557
fmt.Fprintf(os.Stderr, BANNER, version.VERSION, version.GITCOMMIT)
5658
flag.PrintDefaults()
@@ -75,7 +77,7 @@ func main() {
7577
if err != nil {
7678
glog.Fatal(err)
7779
}
78-
b, err := ioutil.ReadFile(*schemaLockFile)
80+
b, err := os.ReadFile(*schemaLockFile)
7981
if err != nil {
8082
glog.Fatal(err)
8183
}
@@ -100,7 +102,7 @@ func main() {
100102
if err != nil {
101103
log.Fatal(err)
102104
}
103-
err = ioutil.WriteFile(*errorFile, b, 0644)
105+
err = os.WriteFile(*errorFile, b, 0644)
104106
if err != nil {
105107
log.Fatal(err)
106108
}

pkg/provider/file/file.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package file
33
import (
44
"encoding/json"
55
"flag"
6-
"io/ioutil"
6+
"os"
77

88
"github.com/ryarnyah/dblock/pkg/model"
99
"github.com/ryarnyah/dblock/pkg/provider"
@@ -20,7 +20,7 @@ func init() {
2020
}
2121

2222
func (s fileProvider) GetCurrentModel() (*model.DatabaseSchema, error) {
23-
b, err := ioutil.ReadFile(*fileSource)
23+
b, err := os.ReadFile(*fileSource)
2424
if err != nil {
2525
return nil, err
2626
}

pkg/provider/file/file_test.go

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

33
import (
44
"encoding/json"
5-
"io/ioutil"
65
"os"
76
"reflect"
87
"testing"
@@ -22,14 +21,14 @@ func TestFileNotFound(t *testing.T) {
2221

2322
func TestDefunctFile(t *testing.T) {
2423
fileProvider := fileProvider{}
25-
f, err := ioutil.TempFile("", "test-file")
24+
f, err := os.CreateTemp("", "test-file")
2625
if err != nil {
2726
t.Fatal(err)
2827
}
2928
defer os.Remove(f.Name())
3029
*fileSource = f.Name()
3130

32-
f.WriteString("very bad file")
31+
_, _ = f.WriteString("very bad file")
3332
_, err = fileProvider.GetCurrentModel()
3433
if err == nil {
3534
t.Fatal("must be unable to parse file")
@@ -38,7 +37,7 @@ func TestDefunctFile(t *testing.T) {
3837

3938
func TestLoadModelFromFile(t *testing.T) {
4039
fileProvider := fileProvider{}
41-
f, err := ioutil.TempFile("", "test-file")
40+
f, err := os.CreateTemp("", "test-file")
4241
if err != nil {
4342
t.Fatal(err)
4443
}

0 commit comments

Comments
 (0)