zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

io/ioutil deprecated (#3217)

Browse Source
This commit is contained in:
guangwu
2023-05-06 17:50:54 +08:00
committed by GitHub
parent 4f13fe8188
commit 63368d8b0c
27 changed files with 85 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/goctl/model/sql/command/command_test.go
View File

@@ -2,7 +2,6 @@ package command
import (
_ "embed"
"io/ioutil"
"os"
"path/filepath"
"sort"
@@ -76,12 +75,12 @@ func TestFromDDl(t *testing.T) {
user1Sql := filepath.Join(tempDir, "user1.sql")
user2Sql := filepath.Join(tempDir, "user2.sql")
err = ioutil.WriteFile(user1Sql, []byte(sql), os.ModePerm)
err = os.WriteFile(user1Sql, []byte(sql), os.ModePerm)
if err != nil {
return
}
err = ioutil.WriteFile(user2Sql, []byte(sql), os.ModePerm)
err = os.WriteFile(user2Sql, []byte(sql), os.ModePerm)
if err != nil {
return
}

4
tools/goctl/model/sql/command/migrationnotes/v1.3.4.go
View File

@@ -2,7 +2,7 @@ package migrationnotes
import (
"fmt"
"io/ioutil"
"os"
"strings"
)
@@ -24,7 +24,7 @@ func migrateBefore1_3_4(dir, style string) error {
}
func needShow1_3_4(dir, style string) (bool, error) {
files, err := ioutil.ReadDir(dir)
files, err := os.ReadDir(dir)
if err != nil {
return false, nil
}

7
tools/goctl/model/sql/command/migrationnotes/v1.3.4_test.go
View File

@@ -2,7 +2,6 @@ package migrationnotes
import (
"io/fs"
"io/ioutil"
"os"
"path"
"path/filepath"
@@ -18,15 +17,15 @@ func Test_needShow1_3_4(t *testing.T) {
dir1 := path.Join(root, "dir1")
require.NoError(t, os.Mkdir(dir1, fs.ModePerm))
ioutil.WriteFile(filepath.Join(dir1, "foo_gen.go"), nil, fs.ModePerm)
os.WriteFile(filepath.Join(dir1, "foo_gen.go"), nil, fs.ModePerm)
dir2 := path.Join(root, "dir2")
require.NoError(t, os.Mkdir(dir2, fs.ModePerm))
ioutil.WriteFile(filepath.Join(dir2, "foomodel.go"), nil, fs.ModePerm)
os.WriteFile(filepath.Join(dir2, "foomodel.go"), nil, fs.ModePerm)
dir3 := path.Join(root, "dir3")
require.NoError(t, os.Mkdir(dir3, fs.ModePerm))
ioutil.WriteFile(filepath.Join(dir3, "irrelevant.go"), nil, fs.ModePerm)
os.WriteFile(filepath.Join(dir3, "irrelevant.go"), nil, fs.ModePerm)
type args struct {
dir string

5
tools/goctl/model/sql/gen/gen.go
View File

@@ -3,7 +3,6 @@ package gen
import (
"bytes"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
@@ -168,7 +167,7 @@ func (g *defaultGenerator) createFile(modelList map[string]*codeTuple) error {
name := util.SafeString(modelFilename) + "_gen.go"
filename := filepath.Join(dirAbs, name)
err = ioutil.WriteFile(filename, []byte(codes.modelCode), os.ModePerm)
err = os.WriteFile(filename, []byte(codes.modelCode), os.ModePerm)
if err != nil {
return err
}
@@ -179,7 +178,7 @@ func (g *defaultGenerator) createFile(modelList map[string]*codeTuple) error {
g.Warning("%s already exists, ignored.", name)
continue
}
err = ioutil.WriteFile(filename, []byte(codes.modelCustomCode), os.ModePerm)
err = os.WriteFile(filename, []byte(codes.modelCustomCode), os.ModePerm)
if err != nil {
return err
}

9
tools/goctl/model/sql/gen/gen_test.go
View File

@@ -3,7 +3,6 @@ package gen
import (
"database/sql"
_ "embed"
"io/ioutil"
"os"
"path"
"path/filepath"
@@ -30,7 +29,7 @@ func TestCacheModel(t *testing.T) {
_ = Clean()
sqlFile := filepath.Join(pathx.MustTempDir(), "tmp.sql")
err := ioutil.WriteFile(sqlFile, []byte(source), 0o777)
err := os.WriteFile(sqlFile, []byte(source), 0o777)
assert.Nil(t, err)
dir := filepath.Join(pathx.MustTempDir(), "./testmodel")
@@ -65,7 +64,7 @@ func TestNamingModel(t *testing.T) {
_ = Clean()
sqlFile := filepath.Join(pathx.MustTempDir(), "tmp.sql")
err := ioutil.WriteFile(sqlFile, []byte(source), 0o777)
err := os.WriteFile(sqlFile, []byte(source), 0o777)
assert.Nil(t, err)
dir, _ := filepath.Abs("./testmodel")
@@ -103,7 +102,7 @@ func TestFolderName(t *testing.T) {
_ = Clean()
sqlFile := filepath.Join(pathx.MustTempDir(), "tmp.sql")
err := ioutil.WriteFile(sqlFile, []byte(source), 0o777)
err := os.WriteFile(sqlFile, []byte(source), 0o777)
assert.Nil(t, err)
dir, _ := filepath.Abs("./testmodel")
@@ -179,7 +178,7 @@ func Test_genPublicModel(t *testing.T) {
defer os.RemoveAll(dir)
modelFilename := filepath.Join(modelDir, "foo.sql")
err = ioutil.WriteFile(modelFilename, []byte(source), 0o777)
err = os.WriteFile(modelFilename, []byte(source), 0o777)
require.NoError(t, err)
g, err := NewDefaultGenerator(modelDir, &config.Config{

8
tools/goctl/model/sql/parser/parser_test.go
View File

@@ -2,7 +2,7 @@ package parser
import (
_ "embed"
"io/ioutil"
"os"
"path/filepath"
"testing"
@@ -15,7 +15,7 @@ import (
func TestParsePlainText(t *testing.T) {
sqlFile := filepath.Join(pathx.MustTempDir(), "tmp.sql")
err := ioutil.WriteFile(sqlFile, []byte("plain text"), 0o777)
err := os.WriteFile(sqlFile, []byte("plain text"), 0o777)
assert.Nil(t, err)
_, err = Parse(sqlFile, "go_zero", false)
@@ -24,7 +24,7 @@ func TestParsePlainText(t *testing.T) {
func TestParseSelect(t *testing.T) {
sqlFile := filepath.Join(pathx.MustTempDir(), "tmp.sql")
err := ioutil.WriteFile(sqlFile, []byte("select * from user"), 0o777)
err := os.WriteFile(sqlFile, []byte("select * from user"), 0o777)
assert.Nil(t, err)
tables, err := Parse(sqlFile, "go_zero", false)
@@ -37,7 +37,7 @@ var user string
func TestParseCreateTable(t *testing.T) {
sqlFile := filepath.Join(pathx.MustTempDir(), "tmp.sql")
err := ioutil.WriteFile(sqlFile, []byte(user), 0o777)
err := os.WriteFile(sqlFile, []byte(user), 0o777)
assert.Nil(t, err)
tables, err := Parse(sqlFile, "go_zero", false)

4
tools/goctl/model/sql/util/matcher.go
View File

@@ -1,7 +1,7 @@
package util
import (
"io/ioutil"
"os"
"path/filepath"
)
@@ -13,7 +13,7 @@ func MatchFiles(in string) ([]string, error) {
return nil, err
}
files, err := ioutil.ReadDir(abs)
files, err := os.ReadDir(abs)
if err != nil {
return nil, err
}