mirrors/go-jsonnet
1
0
Fork 0
mirror of https://github.com/google/go-jsonnet.git synced 2025-08-07 14:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove refs to deprecated io/ioutil (#716)

Browse Source
This commit is contained in:
guoguangwu 2024-06-11 04:27:07 +08:00 committed by GitHub
parent 3d9a2bfbd0
commit 04f3751f08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
c-bindings/c-bindings.go
View File

@ -2,7 +2,6 @@ package main
import ( import (
"fmt" "fmt"
"io/ioutil"
"os" "os"
"path" "path"
"unsafe" "unsafe"
@ -238,7 +237,7 @@ func jsonnet_evaluate_snippet_multi(vmRef *C.struct_JsonnetVm, filename *C.char,
//export jsonnet_evaluate_file //export jsonnet_evaluate_file
func jsonnet_evaluate_file(vmRef *C.struct_JsonnetVm, filename *C.char, e *C.int) *C.char { func jsonnet_evaluate_file(vmRef *C.struct_JsonnetVm, filename *C.char, e *C.int) *C.char {
f := C.GoString(filename) f := C.GoString(filename)
data, err := ioutil.ReadFile(f) data, err := os.ReadFile(f)
if err != nil { if err != nil {
*e = 1 *e = 1
return C.CString(fmt.Sprintf("Failed to read input file: %s: %s", f, err.Error())) return C.CString(fmt.Sprintf("Failed to read input file: %s: %s", f, err.Error()))
@ -249,7 +248,7 @@ func jsonnet_evaluate_file(vmRef *C.struct_JsonnetVm, filename *C.char, e *C.int
//export jsonnet_evaluate_file_stream //export jsonnet_evaluate_file_stream
func jsonnet_evaluate_file_stream(vmRef *C.struct_JsonnetVm, filename *C.char, e *C.int) *C.char { func jsonnet_evaluate_file_stream(vmRef *C.struct_JsonnetVm, filename *C.char, e *C.int) *C.char {
f := C.GoString(filename) f := C.GoString(filename)
data, err := ioutil.ReadFile(f) data, err := os.ReadFile(f)
if err != nil { if err != nil {
*e = 1 *e = 1
return C.CString(fmt.Sprintf("Failed to read input file: %s: %s", f, err.Error())) return C.CString(fmt.Sprintf("Failed to read input file: %s: %s", f, err.Error()))
@ -260,7 +259,7 @@ func jsonnet_evaluate_file_stream(vmRef *C.struct_JsonnetVm, filename *C.char, e
//export jsonnet_evaluate_file_multi //export jsonnet_evaluate_file_multi
func jsonnet_evaluate_file_multi(vmRef *C.struct_JsonnetVm, filename *C.char, e *C.int) *C.char { func jsonnet_evaluate_file_multi(vmRef *C.struct_JsonnetVm, filename *C.char, e *C.int) *C.char {
f := C.GoString(filename) f := C.GoString(filename)
data, err := ioutil.ReadFile(f) data, err := os.ReadFile(f)
if err != nil { if err != nil {
*e = 1 *e = 1
return C.CString(fmt.Sprintf("Failed to read input file: %s: %s", f, err.Error())) return C.CString(fmt.Sprintf("Failed to read input file: %s: %s", f, err.Error()))
@ -622,7 +621,7 @@ func jsonnet_fmt_snippet(vmRef *C.struct_JsonnetVm, filename *C.char, code *C.ch
//export jsonnet_fmt_file //export jsonnet_fmt_file
func jsonnet_fmt_file(vmRef *C.struct_JsonnetVm, filename *C.char, e *C.int) *C.char { func jsonnet_fmt_file(vmRef *C.struct_JsonnetVm, filename *C.char, e *C.int) *C.char {
f := C.GoString(filename) f := C.GoString(filename)
data, err := ioutil.ReadFile(f) data, err := os.ReadFile(f)
if err != nil { if err != nil {
*e = 1 *e = 1
return C.CString(fmt.Sprintf("Failed to read input file: %s: %s", f, err.Error())) return C.CString(fmt.Sprintf("Failed to read input file: %s: %s", f, err.Error()))

3
cmd/dumpstdlibast/dumpstdlibast.go
View File

@ -15,7 +15,6 @@ package main
import ( import (
"fmt" "fmt"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@ -29,7 +28,7 @@ func main() {
fmt.Fprintf(os.Stderr, "usage: %s <file>\n", filepath.Base(os.Args[0])) fmt.Fprintf(os.Stderr, "usage: %s <file>\n", filepath.Base(os.Args[0]))
os.Exit(2) os.Exit(2)
} }
buf, err := ioutil.ReadFile(os.Args[1]) buf, err := os.ReadFile(os.Args[1])
if err != nil { if err != nil {
panic(err) panic(err)
} }

6
cmd/internal/cmd/utils.go
View File

@ -20,7 +20,7 @@ package cmd
import ( import (
"fmt" "fmt"
"io/ioutil" "io"
"log" "log"
"os" "os"
"path/filepath" "path/filepath"
@ -81,12 +81,12 @@ func ReadInput(filenameIsCode bool, filename *string) (input string, err error)
*filename = "<cmdline>" *filename = "<cmdline>"
} else if *filename == "-" { } else if *filename == "-" {
var bytes []byte var bytes []byte
bytes, err = ioutil.ReadAll(os.Stdin) bytes, err = io.ReadAll(os.Stdin)
input = string(bytes) input = string(bytes)
*filename = "<stdin>" *filename = "<stdin>"
} else { } else {
var bytes []byte var bytes []byte
bytes, err = ioutil.ReadFile(*filename) bytes, err = os.ReadFile(*filename)
input = string(bytes) input = string(bytes)
} }
return return

3
cmd/jsonnet-lint/cmd.go
View File

@ -3,7 +3,6 @@ package main
import ( import (
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@ -166,7 +165,7 @@ func main() {
if err != nil { if err != nil {
die(err) die(err)
} }
data, err := ioutil.ReadAll(f) data, err := io.ReadAll(f)
if err != nil { if err != nil {
die(err) die(err)
} }

5
cmd/jsonnet/cmd.go
View File

@ -19,7 +19,6 @@ package main
import ( import (
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"sort" "sort"
@ -327,7 +326,7 @@ func writeMultiOutputFiles(output map[string]string, outputDir, outputFile strin
} }
if _, err := os.Stat(filename); !os.IsNotExist(err) { if _, err := os.Stat(filename); !os.IsNotExist(err) {
existingContent, err := ioutil.ReadFile(filename) existingContent, err := os.ReadFile(filename)
if err != nil { if err != nil {
return err return err
} }
@ -344,7 +343,7 @@ func writeMultiOutputFiles(output map[string]string, outputDir, outputFile strin
} }
} }
err = ioutil.WriteFile(filename, []byte(newContent), 0666) err = os.WriteFile(filename, []byte(newContent), 0666)
if err != nil { if err != nil {
return err return err
} }

3
imports.go
View File

@ -18,7 +18,6 @@ package jsonnet
import ( import (
"fmt" "fmt"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"unsafe" "unsafe"
@ -241,7 +240,7 @@ func (importer *FileImporter) tryPath(dir, importedPath string) (found bool, con
if cacheEntry, isCached := importer.fsCache[absPath]; isCached { if cacheEntry, isCached := importer.fsCache[absPath]; isCached {
entry = cacheEntry entry = cacheEntry
} else { } else {
contentBytes, err := ioutil.ReadFile(absPath) contentBytes, err := os.ReadFile(absPath)
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
entry = &fsCacheEntry{ entry = &fsCacheEntry{

5
internal/testutils/test_utils.go
View File

@ -3,7 +3,6 @@ package testutils
import ( import (
"bytes" "bytes"
"io/ioutil"
"os" "os"
"github.com/sergi/go-diff/diffmatchpatch" "github.com/sergi/go-diff/diffmatchpatch"
@ -31,7 +30,7 @@ func CompareWithGolden(result string, golden []byte) (string, bool) {
// are actually different from what is already there. It returns whether or not // are actually different from what is already there. It returns whether or not
// the overwrite was performed (i.e. the desired content was different than actual). // the overwrite was performed (i.e. the desired content was different than actual).
func UpdateGoldenFile(path string, content []byte, mode os.FileMode) (changed bool, err error) { func UpdateGoldenFile(path string, content []byte, mode os.FileMode) (changed bool, err error) {
old, err := ioutil.ReadFile(path) old, err := os.ReadFile(path)
if err != nil && !os.IsNotExist(err) { if err != nil && !os.IsNotExist(err) {
return false, err return false, err
} }
@ -39,7 +38,7 @@ func UpdateGoldenFile(path string, content []byte, mode os.FileMode) (changed bo
if bytes.Equal(old, content) && !os.IsNotExist(err) { if bytes.Equal(old, content) && !os.IsNotExist(err) {
return false, nil return false, nil
} }
if err := ioutil.WriteFile(path, content, mode); err != nil { if err := os.WriteFile(path, content, mode); err != nil {
return false, err return false, err
} }
return true, nil return true, nil

8
linter/linter_test.go
View File

@ -3,7 +3,7 @@ package linter
import ( import (
"flag" "flag"
"fmt" "fmt"
"io/ioutil" "os"
"path/filepath" "path/filepath"
"regexp" "regexp"
"strings" "strings"
@ -27,7 +27,7 @@ type ChangedGoldensList struct {
func runTest(t *testing.T, test *linterTest, changedGoldensList *ChangedGoldensList) { func runTest(t *testing.T, test *linterTest, changedGoldensList *ChangedGoldensList) {
read := func(file string) []byte { read := func(file string) []byte {
bytz, err := ioutil.ReadFile(file) bytz, err := os.ReadFile(file)
if err != nil { if err != nil {
t.Fatalf("reading file: %s: %v", file, err) t.Fatalf("reading file: %s: %v", file, err)
} }
@ -61,7 +61,7 @@ func runTest(t *testing.T, test *linterTest, changedGoldensList *ChangedGoldensL
changedGoldensList.changedGoldens = append(changedGoldensList.changedGoldens, test.output) changedGoldensList.changedGoldens = append(changedGoldensList.changedGoldens, test.output)
} }
} else { } else {
golden, err := ioutil.ReadFile(test.output) golden, err := os.ReadFile(test.output)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
@ -74,7 +74,7 @@ func runTest(t *testing.T, test *linterTest, changedGoldensList *ChangedGoldensL
func runTests(t *testing.T, tests []*linterTest) { func runTests(t *testing.T, tests []*linterTest) {
read := func(file string) []byte { read := func(file string) []byte {
bytz, err := ioutil.ReadFile(file) bytz, err := os.ReadFile(file)
if err != nil { if err != nil {
t.Fatalf("reading file: %s: %v", file, err) t.Fatalf("reading file: %s: %v", file, err)
} }

21
main_test.go
View File

@ -22,7 +22,6 @@ import (
"errors" "errors"
"flag" "flag"
"fmt" "fmt"
"io/ioutil"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
@ -229,7 +228,7 @@ func compareSingleGolden(path string, result jsonnetResult) []error {
if result.outputMulti != nil { if result.outputMulti != nil {
return []error{fmt.Errorf("outputMulti is populated in a single-file test for %v", path)} return []error{fmt.Errorf("outputMulti is populated in a single-file test for %v", path)}
} }
golden, err := ioutil.ReadFile(path) golden, err := os.ReadFile(path)
if err != nil { if err != nil {
return []error{fmt.Errorf("reading file %s: %v", path, err)} return []error{fmt.Errorf("reading file %s: %v", path, err)}
} }
@ -254,14 +253,14 @@ func updateSingleGolden(path string, result jsonnetResult) (updated []string, er
} }
func compareMultifileGolden(path string, result jsonnetResult) []error { func compareMultifileGolden(path string, result jsonnetResult) []error {
expectFiles, err := ioutil.ReadDir(path) expectFiles, err := os.ReadDir(path)
if err != nil { if err != nil {
return []error{fmt.Errorf("reading golden dir %v: %v", path, err)} return []error{fmt.Errorf("reading golden dir %v: %v", path, err)}
} }
goldenContent := map[string][]byte{} goldenContent := map[string][]byte{}
var errs []error var errs []error
for _, f := range expectFiles { for _, f := range expectFiles {
golden, err := ioutil.ReadFile(filepath.Join(path, f.Name())) golden, err := os.ReadFile(filepath.Join(path, f.Name()))
if err != nil { if err != nil {
return []error{fmt.Errorf("reading file %s: %v", f.Name(), err)} return []error{fmt.Errorf("reading file %s: %v", f.Name(), err)}
} }
@ -284,7 +283,7 @@ func compareMultifileGolden(path string, result jsonnetResult) []error {
} }
func updateMultifileGolden(path string, result jsonnetResult) ([]string, error) { func updateMultifileGolden(path string, result jsonnetResult) ([]string, error) {
expectFiles, err := ioutil.ReadDir(path) expectFiles, err := os.ReadDir(path)
if err != nil { if err != nil {
return nil, fmt.Errorf("reading golden directory %v: %v", path, err) return nil, fmt.Errorf("reading golden directory %v: %v", path, err)
} }
@ -312,7 +311,7 @@ func updateMultifileGolden(path string, result jsonnetResult) ([]string, error)
func runTest(t *testing.T, test *mainTest) { func runTest(t *testing.T, test *mainTest) {
read := func(file string) []byte { read := func(file string) []byte {
bytz, err := ioutil.ReadFile(file) bytz, err := os.ReadFile(file)
if err != nil { if err != nil {
t.Fatalf("reading file: %s: %v", file, err) t.Fatalf("reading file: %s: %v", file, err)
} }
@ -413,7 +412,7 @@ func TestEvalUnusualFilenames(t *testing.T) {
dir := os.Getenv("TEST_TMPDIR") dir := os.Getenv("TEST_TMPDIR")
if len(dir) == 0 { if len(dir) == 0 {
var err error var err error
if dir, err = ioutil.TempDir("", "jsonnet"); err != nil { if dir, err = os.MkdirTemp("", "jsonnet"); err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer func() { defer func() {
@ -425,11 +424,11 @@ func TestEvalUnusualFilenames(t *testing.T) {
} }
copySmallFile := func(t *testing.T, dst, src string) { copySmallFile := func(t *testing.T, dst, src string) {
b, err := ioutil.ReadFile(src) b, err := os.ReadFile(src)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if err := ioutil.WriteFile(dst, b, 0444); err != nil { if err := os.WriteFile(dst, b, 0444); err != nil {
t.Fatal(err) t.Fatal(err)
} }
} }
@ -502,10 +501,10 @@ func TestEvalUnusualFilenames(t *testing.T) {
`), `),
}, },
} { } {
if err := ioutil.WriteFile(f.name+".jsonnet", f.content, 0444); err != nil { if err := os.WriteFile(f.name+".jsonnet", f.content, 0444); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if err := ioutil.WriteFile(f.name+".golden", f.golden, 0444); err != nil { if err := os.WriteFile(f.name+".golden", f.golden, 0444); err != nil {
t.Fatal(err) t.Fatal(err)
} }
t.Run(f.name, func(t *testing.T) { t.Run(f.name, func(t *testing.T) {