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/api/dartgen/genvars.go
View File

@@ -2,7 +2,6 @@ package dartgen
import (
"fmt"
"io/ioutil"
"os"
)
@@ -83,7 +82,7 @@ func genVars(dir string, isLegacy bool, scheme string, hostname string) error {
}
if !fileExists(dir + "vars.dart") {
err = ioutil.WriteFile(dir+"vars.dart", []byte(fmt.Sprintf(`const serverHost='%s://%s';`, scheme, hostname)), 0o644)
err = os.WriteFile(dir+"vars.dart", []byte(fmt.Sprintf(`const serverHost='%s://%s';`, scheme, hostname)), 0o644)
if err != nil {
return err
}
@@ -94,7 +93,7 @@ func genVars(dir string, isLegacy bool, scheme string, hostname string) error {
if isLegacy {
tpl = varTemplate
}
err = ioutil.WriteFile(dir+"kv.dart", []byte(tpl), 0o644)
err = os.WriteFile(dir+"kv.dart", []byte(tpl), 0o644)
if err != nil {
return err
}

5
tools/goctl/api/format/format_test.go
View File

@@ -3,7 +3,6 @@ package format
import (
"fmt"
"io/fs"
"io/ioutil"
"os"
"path"
"testing"
@@ -71,11 +70,11 @@ func Test_apiFormatReader_issue1721(t *testing.T) {
require.NoError(t, err)
importedFilename := path.Join(dir, "foo.api")
err = ioutil.WriteFile(importedFilename, []byte{}, fs.ModePerm)
err = os.WriteFile(importedFilename, []byte{}, fs.ModePerm)
require.NoError(t, err)
filename := path.Join(subDir, "bar.api")
err = ioutil.WriteFile(filename, []byte(fmt.Sprintf(`import "%s"`, importedFilename)), 0o644)
err = os.WriteFile(filename, []byte(fmt.Sprintf(`import "%s"`, importedFilename)), 0o644)
require.NoError(t, err)
f, err := os.Open(filename)

19
tools/goctl/api/parser/g4/ast/apiparser_test.go
View File

@@ -1,7 +1,6 @@
package ast
import (
"io/ioutil"
"os"
"path/filepath"
"testing"
@@ -25,13 +24,13 @@ func Test_ImportCycle(t *testing.T) {
defer os.RemoveAll(dir)
mainPath := filepath.Join(dir, mainFilename)
err = ioutil.WriteFile(mainPath, []byte(mainSrc), 0o777)
err = os.WriteFile(mainPath, []byte(mainSrc), 0o777)
require.NoError(t, err)
subAPath := filepath.Join(dir, subAFilename)
err = ioutil.WriteFile(subAPath, []byte(subASrc), 0o777)
err = os.WriteFile(subAPath, []byte(subASrc), 0o777)
require.NoError(t, err)
subBPath := filepath.Join(dir, subBFilename)
err = ioutil.WriteFile(subBPath, []byte(subBSrc), 0o777)
err = os.WriteFile(subBPath, []byte(subBSrc), 0o777)
require.NoError(t, err)
_, err = NewParser().Parse(mainPath)
@@ -55,13 +54,13 @@ func Test_MultiImportedShouldAllowed(t *testing.T) {
defer os.RemoveAll(dir)
mainPath := filepath.Join(dir, mainFilename)
err = ioutil.WriteFile(mainPath, []byte(mainSrc), 0o777)
err = os.WriteFile(mainPath, []byte(mainSrc), 0o777)
require.NoError(t, err)
subAPath := filepath.Join(dir, subAFilename)
err = ioutil.WriteFile(subAPath, []byte(subASrc), 0o777)
err = os.WriteFile(subAPath, []byte(subASrc), 0o777)
require.NoError(t, err)
subBPath := filepath.Join(dir, subBFilename)
err = ioutil.WriteFile(subBPath, []byte(subBSrc), 0o777)
err = os.WriteFile(subBPath, []byte(subBSrc), 0o777)
require.NoError(t, err)
_, err = NewParser().Parse(mainPath)
@@ -84,13 +83,13 @@ func Test_RedundantDeclarationShouldNotBeAllowed(t *testing.T) {
defer os.RemoveAll(dir)
mainPath := filepath.Join(dir, mainFilename)
err = ioutil.WriteFile(mainPath, []byte(mainSrc), 0o777)
err = os.WriteFile(mainPath, []byte(mainSrc), 0o777)
require.NoError(t, err)
subAPath := filepath.Join(dir, subAFilename)
err = ioutil.WriteFile(subAPath, []byte(subASrc), 0o777)
err = os.WriteFile(subAPath, []byte(subASrc), 0o777)
require.NoError(t, err)
subBPath := filepath.Join(dir, subBFilename)
err = ioutil.WriteFile(subBPath, []byte(subBSrc), 0o777)
err = os.WriteFile(subBPath, []byte(subBSrc), 0o777)
require.NoError(t, err)
_, err = NewParser().Parse(mainPath)

15
tools/goctl/api/parser/g4/test/apiparser_test.go
View File

@@ -2,7 +2,6 @@ package test
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"testing"
@@ -120,7 +119,7 @@ func TestApiParser(t *testing.T) {
t.Run("nestedImport", func(t *testing.T) {
file := filepath.Join(pathx.MustTempDir(), "foo.api")
err := ioutil.WriteFile(file, []byte(nestedAPIImport), os.ModePerm)
err := os.WriteFile(file, []byte(nestedAPIImport), os.ModePerm)
if err != nil {
return
}
@@ -150,7 +149,7 @@ func TestApiParser(t *testing.T) {
t.Run("ambiguousSyntax", func(t *testing.T) {
file := filepath.Join(pathx.MustTempDir(), "foo.api")
err := ioutil.WriteFile(file, []byte(ambiguousSyntax), os.ModePerm)
err := os.WriteFile(file, []byte(ambiguousSyntax), os.ModePerm)
if err != nil {
return
}
@@ -164,7 +163,7 @@ func TestApiParser(t *testing.T) {
t.Run("ambiguousSyntax", func(t *testing.T) {
file := filepath.Join(pathx.MustTempDir(), "foo.api")
err := ioutil.WriteFile(file, []byte(ambiguousSyntax), os.ModePerm)
err := os.WriteFile(file, []byte(ambiguousSyntax), os.ModePerm)
if err != nil {
return
}
@@ -178,7 +177,7 @@ func TestApiParser(t *testing.T) {
t.Run("ambiguousService", func(t *testing.T) {
file := filepath.Join(pathx.MustTempDir(), "foo.api")
err := ioutil.WriteFile(file, []byte(ambiguousService), os.ModePerm)
err := os.WriteFile(file, []byte(ambiguousService), os.ModePerm)
if err != nil {
return
}
@@ -208,7 +207,7 @@ func TestApiParser(t *testing.T) {
assert.Error(t, err)
file := filepath.Join(pathx.MustTempDir(), "foo.api")
err = ioutil.WriteFile(file, []byte(duplicateHandler), os.ModePerm)
err = os.WriteFile(file, []byte(duplicateHandler), os.ModePerm)
if err != nil {
return
}
@@ -237,7 +236,7 @@ func TestApiParser(t *testing.T) {
assert.Error(t, err)
file := filepath.Join(pathx.MustTempDir(), "foo.api")
err = ioutil.WriteFile(file, []byte(duplicateRoute), os.ModePerm)
err = os.WriteFile(file, []byte(duplicateRoute), os.ModePerm)
if err != nil {
return
}
@@ -261,7 +260,7 @@ func TestApiParser(t *testing.T) {
assert.Error(t, err)
file := filepath.Join(pathx.MustTempDir(), "foo.api")
err = ioutil.WriteFile(file, []byte(duplicateType), os.ModePerm)
err = os.WriteFile(file, []byte(duplicateType), os.ModePerm)
if err != nil {
return
}