diff --git a/go/libraries/doltcore/sqle/enginetest/testgen_test.go b/go/libraries/doltcore/sqle/enginetest/testgen_test.go index 07d4801f6d..721e18468d 100644 --- a/go/libraries/doltcore/sqle/enginetest/testgen_test.go +++ b/go/libraries/doltcore/sqle/enginetest/testgen_test.go @@ -17,7 +17,6 @@ package enginetest import ( "bufio" "fmt" - "io/ioutil" "os" "path/filepath" "strings" @@ -39,12 +38,7 @@ func TestGenNewFormatQueryPlans(t *testing.T) { engine, err := harness.NewEngine(t) require.NoError(t, err) - tmp, err := ioutil.TempDir("", "*") - if err != nil { - return - } - - outputPath := filepath.Join(tmp, "queryPlans.txt") + outputPath := filepath.Join(t.TempDir(), "queryPlans.txt") f, err := os.Create(outputPath) require.NoError(t, err) diff --git a/go/libraries/doltcore/sqle/mysql_file_handler/file_handler.go b/go/libraries/doltcore/sqle/mysql_file_handler/file_handler.go index 93ab04809e..4624a46f98 100644 --- a/go/libraries/doltcore/sqle/mysql_file_handler/file_handler.go +++ b/go/libraries/doltcore/sqle/mysql_file_handler/file_handler.go @@ -16,7 +16,6 @@ package mysql_file_handler import ( "errors" - "io/ioutil" "os" "sync" @@ -53,7 +52,7 @@ func (p *Persister) Persist(ctx *sql.Context, data []byte) error { } } - return ioutil.WriteFile(p.privsFilePath, data, 0777) + return os.WriteFile(p.privsFilePath, data, 0777) } // LoadData reads the mysql.db file, returns nil if empty or not found @@ -67,7 +66,7 @@ func (p Persister) LoadData() ([]byte, error) { defer p.fileMutex.Unlock() // read from mysqldbFilePath, error if something other than not-exists - buf, err := ioutil.ReadFile(p.privsFilePath) + buf, err := os.ReadFile(p.privsFilePath) if err != nil && !errors.Is(err, os.ErrNotExist) { return nil, err } diff --git a/go/libraries/doltcore/table/typed/parquet/writer_test.go b/go/libraries/doltcore/table/typed/parquet/writer_test.go index 65ab18489c..fe9f3bac98 100644 --- a/go/libraries/doltcore/table/typed/parquet/writer_test.go +++ b/go/libraries/doltcore/table/typed/parquet/writer_test.go @@ -17,8 +17,7 @@ package parquet import ( "context" "fmt" - "io/ioutil" - "os" + "path" "testing" "github.com/dolthub/go-mysql-server/sql" @@ -83,12 +82,7 @@ John Johnson,21, Andy Anderson,27, ` - file, err := ioutil.TempFile("", "parquet") - if err != nil { - t.Fatal(err) - } - defer os.Remove(file.Name()) - path := file.Name() + path := path.Join(t.TempDir(), "parquet") rows := getSampleRows() diff --git a/go/libraries/utils/jwtauth/jwks.go b/go/libraries/utils/jwtauth/jwks.go index a71e172fc6..10ccee12ba 100644 --- a/go/libraries/utils/jwtauth/jwks.go +++ b/go/libraries/utils/jwtauth/jwks.go @@ -17,7 +17,7 @@ package jwtauth import ( "errors" "fmt" - "io/ioutil" + "io" "net/http" "os" "sync" @@ -89,7 +89,7 @@ func (f *fetchedJWKS) GetJWKS() (*jose.JSONWebKeySet, error) { return nil, errors.New("FetchedJWKS: Non-2xx status code from JWKS fetch") } else { defer response.Body.Close() - contents, err := ioutil.ReadAll(response.Body) + contents, err := io.ReadAll(response.Body) if err != nil { return nil, err } @@ -229,7 +229,7 @@ func (t *MultiJWKS) fetch(i int) error { if response.StatusCode/100 != 2 { return fmt.Errorf("http request failed: StatusCode: %d", response.StatusCode) } - contents, err := ioutil.ReadAll(response.Body) + contents, err := io.ReadAll(response.Body) if err != nil { return err } diff --git a/go/performance/microsysbench/sysbench_test.go b/go/performance/microsysbench/sysbench_test.go index 8015851153..aac481ac39 100644 --- a/go/performance/microsysbench/sysbench_test.go +++ b/go/performance/microsysbench/sysbench_test.go @@ -18,7 +18,7 @@ import ( "context" "fmt" "io" - "io/ioutil" + "os" "math/rand" "strconv" "strings" @@ -129,7 +129,7 @@ func setupBenchmark(t *testing.B, dEnv *env.DoltEnv) (*sql.Context, *engine.SqlE } func readTestData(file string) string { - data, err := ioutil.ReadFile(file) + data, err := os.ReadFile(file) if err != nil { panic(err) } diff --git a/go/performance/utils/sysbench_runner/config.go b/go/performance/utils/sysbench_runner/config.go index 9f99a14e46..3949c283f4 100644 --- a/go/performance/utils/sysbench_runner/config.go +++ b/go/performance/utils/sysbench_runner/config.go @@ -19,7 +19,6 @@ import ( "errors" "fmt" "io/fs" - "io/ioutil" "os" "path/filepath" "runtime" @@ -448,7 +447,7 @@ func GetTests(config *Config, serverConfig *ServerConfig, testIdFunc func() stri // FromFileConfig returns a validated Config based on the config file at the configPath func FromFileConfig(configPath string) (*Config, error) { - data, err := ioutil.ReadFile(configPath) + data, err := os.ReadFile(configPath) if err != nil { return nil, err } diff --git a/go/performance/utils/sysbench_runner/csv_test.go b/go/performance/utils/sysbench_runner/csv_test.go index 7c88f0d6b6..718c6a1b74 100644 --- a/go/performance/utils/sysbench_runner/csv_test.go +++ b/go/performance/utils/sysbench_runner/csv_test.go @@ -16,7 +16,6 @@ package sysbench_runner import ( "fmt" - "io/ioutil" "os" "path/filepath" "testing" @@ -26,9 +25,8 @@ import ( ) func TestWriteReadResultsCsv(t *testing.T) { - tmpDir, err := ioutil.TempDir("", "TestWriteResultsCsv") - require.NoError(t, err) - err = os.MkdirAll(tmpDir, os.ModePerm) + tmpDir := t.TempDir() + err := os.MkdirAll(tmpDir, os.ModePerm) require.NoError(t, err) expectedOne := genRandomResult() diff --git a/go/performance/utils/sysbench_runner/json.go b/go/performance/utils/sysbench_runner/json.go index 5a0fca38db..389acd8c63 100644 --- a/go/performance/utils/sysbench_runner/json.go +++ b/go/performance/utils/sysbench_runner/json.go @@ -17,7 +17,6 @@ package sysbench_runner import ( "encoding/json" "io" - "io/ioutil" "os" "path/filepath" ) @@ -72,7 +71,7 @@ func ReadResultsJson(filename string) (Results, error) { var textInput io.Reader = file - b, err := ioutil.ReadAll(textInput) + b, err := io.ReadAll(textInput) if err != nil { return nil, err } diff --git a/go/performance/utils/sysbench_runner/json_test.go b/go/performance/utils/sysbench_runner/json_test.go index 3e15060b8c..c49b1b8d98 100644 --- a/go/performance/utils/sysbench_runner/json_test.go +++ b/go/performance/utils/sysbench_runner/json_test.go @@ -16,7 +16,6 @@ package sysbench_runner import ( "fmt" - "io/ioutil" "os" "path/filepath" "testing" @@ -26,8 +25,7 @@ import ( ) func TestWriteReadResultsJson(t *testing.T) { - tmpDir, err := ioutil.TempDir("", "TestWriteResultsJson") - require.NoError(t, err) + tmpDir := t.TempDir() defer os.RemoveAll(tmpDir) expected := &Result{ @@ -36,7 +34,7 @@ func TestWriteReadResultsJson(t *testing.T) { } filename := filepath.Join(tmpDir, fmt.Sprintf("test-results%s", JsonExt)) - err = WriteResultsJson(filename, []*Result{expected}) + err := WriteResultsJson(filename, []*Result{expected}) require.NoError(t, err) actual, err := ReadResultsJson(filename) diff --git a/go/performance/utils/sysbench_runner/run_test.go b/go/performance/utils/sysbench_runner/run_test.go index 042de5c560..dd85db622c 100644 --- a/go/performance/utils/sysbench_runner/run_test.go +++ b/go/performance/utils/sysbench_runner/run_test.go @@ -15,7 +15,6 @@ package sysbench_runner import ( - "io/ioutil" "log" "os" "testing" @@ -23,12 +22,9 @@ import ( func TestRunner(t *testing.T) { t.Skip() - dir, err := ioutil.TempDir("", "prefix") - if err != nil { - log.Fatal(err) - } + dir := t.TempDir() log.Println(dir) - err = os.Chdir(dir) + err := os.Chdir(dir) if err != nil { log.Fatal(err) } diff --git a/go/performance/utils/tpcc_runner/config.go b/go/performance/utils/tpcc_runner/config.go index a1f3239584..51cb7316a5 100644 --- a/go/performance/utils/tpcc_runner/config.go +++ b/go/performance/utils/tpcc_runner/config.go @@ -18,7 +18,6 @@ import ( "context" "encoding/json" "fmt" - "io/ioutil" "os" "os/exec" "path/filepath" @@ -132,7 +131,7 @@ func (c *TpccBenchmarkConfig) validateServerConfigs() error { // FromFileConfig returns a validated Config based on the config file at the configPath func FromFileConfig(configPath string) (*TpccBenchmarkConfig, error) { - data, err := ioutil.ReadFile(configPath) + data, err := os.ReadFile(configPath) if err != nil { return nil, err } diff --git a/go/utils/batsee/main.go b/go/utils/batsee/main.go index 68bf6b6bc1..7d5b93c160 100644 --- a/go/utils/batsee/main.go +++ b/go/utils/batsee/main.go @@ -21,7 +21,6 @@ import ( "context" "fmt" "io" - "io/ioutil" "os" "os/exec" "os/signal" @@ -167,7 +166,7 @@ func main() { } // Get a list of all files in this directory which end in ".bats" - files, err := ioutil.ReadDir(cwd) + files, err := os.ReadDir(cwd) if err != nil { cli.Println("Error reading directory:", err) os.Exit(1)