Skip to content

Commit

Permalink
Merge pull request #1220 from stefafafan/fix-ioutil-deprecations
Browse files Browse the repository at this point in the history 
Stop using the methods from io/ioutil as they are deprecated since Go 1.16
  • Loading branch information
@stephenafamo
stephenafamo committed Nov 18, 2022
2 parents f6f4805 + ac3043d commit 22497a8
Show file tree
Hide file tree
Showing 16 changed files with 32 additions and 39 deletions.
3 changes: 1 addition & 2 deletions boilingcore/boilingcore_test.go
View file
Expand Up @@ -4,7 +4,6 @@ import (
"bufio"
"bytes"
"fmt"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
Expand Down Expand Up @@ -62,7 +61,7 @@ func testNew(t *testing.T, aliases Aliases) {
}

var err error
out, err := ioutil.TempDir("", "boil_templates")
out, err := os.MkdirTemp("", "boil_templates")
if err != nil {
t.Fatalf("unable to create tempdir: %s", err)
}
Expand Down
3 changes: 1 addition & 2 deletions boilingcore/output.go
View file
Expand Up @@ -5,7 +5,6 @@ import (
"bytes"
"fmt"
"go/format"
"io/ioutil"
"os"
"path/filepath"
"regexp"
Expand Down Expand Up @@ -42,7 +41,7 @@ var (
rgxRemoveNumberedPrefix = regexp.MustCompile(`^[0-9]+_`)
rgxSyntaxError = regexp.MustCompile(`(\d+):\d+: `)

testHarnessWriteFile = ioutil.WriteFile
testHarnessWriteFile = os.WriteFile
)

type executeTemplateData struct {
Expand Down
4 changes: 2 additions & 2 deletions boilingcore/templates.go
View file
Expand Up @@ -6,7 +6,7 @@ import (
"encoding/base64"
"fmt"
"io/fs"
"io/ioutil"
"os"
"path/filepath"
"sort"
"strings"
Expand Down Expand Up @@ -175,7 +175,7 @@ type fileLoader string

func (f fileLoader) Load() ([]byte, error) {
fname := string(f)
b, err := ioutil.ReadFile(fname)
b, err := os.ReadFile(fname)
if err != nil {
return nil, errors.Wrapf(err, "failed to load template: %s", fname)
}
Expand Down
8 changes: 4 additions & 4 deletions drivers/binary_driver_test.go
View file
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"io/ioutil"
"os"
"reflect"
"runtime"
"strings"
Expand All @@ -31,7 +31,7 @@ func TestBinaryDriver(t *testing.T) {
t.Fatal(err)
}

bin, err := ioutil.TempFile("", "test_binary_driver")
bin, err := os.CreateTemp("", "test_binary_driver")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -61,7 +61,7 @@ func TestBinaryWarningDriver(t *testing.T) {
t.Skip("cannot run binary test on windows (needs bin/sh)")
}

bin, err := ioutil.TempFile("", "test_binary_driver")
bin, err := os.CreateTemp("", "test_binary_driver")
if err != nil {
t.Fatal(err)
}
Expand All @@ -87,7 +87,7 @@ func TestBinaryBadDriver(t *testing.T) {
t.Skip("cannot run binary test on windows (needs bin/sh)")
}

bin, err := ioutil.TempFile("", "test_binary_driver")
bin, err := os.CreateTemp("", "test_binary_driver")
if err != nil {
t.Fatal(err)
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/driver_main.go
View file
Expand Up @@ -3,7 +3,7 @@ package drivers
import (
"encoding/json"
"fmt"
"io/ioutil"
"io"
"os"
)

Expand All @@ -14,7 +14,7 @@ func DriverMain(driver Interface) {

switch method {
case "assemble":
b, err := ioutil.ReadAll(os.Stdin)
b, err := io.ReadAll(os.Stdin)
if err != nil {
fmt.Fprintln(os.Stderr, "failed to read from stdin")
os.Exit(1)
Expand Down
6 changes: 3 additions & 3 deletions drivers/sqlboiler-mssql/driver/mssql_test.go
View file
Expand Up @@ -26,7 +26,7 @@ import (
"bytes"
"encoding/json"
"flag"
"io/ioutil"
"os"
"os/exec"
"regexp"
"testing"
Expand Down Expand Up @@ -91,14 +91,14 @@ func TestDriver(t *testing.T) {
}

if *flagOverwriteGolden {
if err = ioutil.WriteFile("mssql.golden.json", got, 0664); err != nil {
if err = os.WriteFile("mssql.golden.json", got, 0664); err != nil {
t.Fatal(err)
}
t.Log("wrote:", string(got))
return
}

want, err := ioutil.ReadFile("mssql.golden.json")
want, err := os.ReadFile("mssql.golden.json")
if err != nil {
t.Fatal(err)
}
Expand Down
1 change: 0 additions & 1 deletion drivers/sqlboiler-mysql/driver/mysql.go
View file
Expand Up @@ -603,7 +603,6 @@ func (MySQLDriver) Imports() (col importers.Collection, err error) {
`"database/sql"`,
`"fmt"`,
`"io"`,
`"io/ioutil"`,
`"os"`,
`"os/exec"`,
`"regexp"`,
Expand Down
8 changes: 4 additions & 4 deletions drivers/sqlboiler-mysql/driver/mysql_test.go
View file
Expand Up @@ -14,7 +14,7 @@ import (
"encoding/json"
"flag"
"fmt"
"io/ioutil"
"os"
"os/exec"
"testing"

Expand All @@ -33,7 +33,7 @@ var (
)

func TestDriver(t *testing.T) {
b, err := ioutil.ReadFile("testdatabase.sql")
b, err := os.ReadFile("testdatabase.sql")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -98,14 +98,14 @@ func TestDriver(t *testing.T) {
}

if *flagOverwriteGolden {
if err = ioutil.WriteFile(tt.goldenJson, got, 0664); err != nil {
if err = os.WriteFile(tt.goldenJson, got, 0664); err != nil {
t.Fatal(err)
}
t.Log("wrote:", string(got))
return
}

want, err := ioutil.ReadFile(tt.goldenJson)
want, err := os.ReadFile(tt.goldenJson)
if err != nil {
t.Fatal(err)
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/sqlboiler-mysql/driver/override/test/singleton/mysql_main_test.go.tpl
View file
Expand Up @@ -120,7 +120,7 @@ func (m *mysqlTester) defaultsFile() string {
}

func (m *mysqlTester) makeOptionFile() error {
tmp, err := ioutil.TempFile("", "optionfile")
tmp, err := os.CreateTemp("", "optionfile")
if err != nil {
return errors.Wrap(err, "failed to create option file")
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/sqlboiler-psql/driver/override/test/singleton/psql_main_test.go.tpl
View file
Expand Up @@ -141,7 +141,7 @@ func (p *pgTester) pgEnv() []string {
}

func (p *pgTester) makePGPassFile() error {
tmp, err := ioutil.TempFile("", "pgpass")
tmp, err := os.CreateTemp("", "pgpass")
if err != nil {
return errors.Wrap(err, "failed to create option file")
}
Expand Down
1 change: 0 additions & 1 deletion drivers/sqlboiler-psql/driver/psql.go
View file
Expand Up @@ -972,7 +972,6 @@ func (p PostgresDriver) Imports() (importers.Collection, error) {
`"database/sql"`,
`"fmt"`,
`"io"`,
`"io/ioutil"`,
`"os"`,
`"os/exec"`,
`"regexp"`,
Expand Down
7 changes: 3 additions & 4 deletions drivers/sqlboiler-psql/driver/psql_test.go
View file
Expand Up @@ -13,7 +13,6 @@ import (
"encoding/json"
"flag"
"fmt"
"io/ioutil"
"os"
"os/exec"
"testing"
Expand All @@ -34,7 +33,7 @@ var (
)

func TestAssemble(t *testing.T) {
b, err := ioutil.ReadFile("testdatabase.sql")
b, err := os.ReadFile("testdatabase.sql")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -100,14 +99,14 @@ func TestAssemble(t *testing.T) {
}

if *flagOverwriteGolden {
if err = ioutil.WriteFile(tt.goldenJson, got, 0664); err != nil {
if err = os.WriteFile(tt.goldenJson, got, 0664); err != nil {
t.Fatal(err)
}
t.Log("wrote:", string(got))
return
}

want, err := ioutil.ReadFile(tt.goldenJson)
want, err := os.ReadFile(tt.goldenJson)
if err != nil {
t.Fatal(err)
}
Expand Down
7 changes: 3 additions & 4 deletions drivers/sqlboiler-sqlite3/driver/sqlite3_test.go
View file
Expand Up @@ -5,7 +5,6 @@ import (
"encoding/json"
"flag"
"fmt"
"io/ioutil"
"math/rand"
"os"
"os/exec"
Expand All @@ -24,7 +23,7 @@ var (

func TestDriver(t *testing.T) {
rand.Seed(time.Now().Unix())
b, err := ioutil.ReadFile("testdatabase.sql")
b, err := os.ReadFile("testdatabase.sql")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -72,14 +71,14 @@ func TestDriver(t *testing.T) {
}

if *flagOverwriteGolden {
if err = ioutil.WriteFile(tt.goldenJson, got, 0664); err != nil {
if err = os.WriteFile(tt.goldenJson, got, 0664); err != nil {
t.Fatal(err)
}
t.Log("wrote:", string(got))
return
}

want, err := ioutil.ReadFile(tt.goldenJson)
want, err := os.ReadFile(tt.goldenJson)
if err != nil {
t.Fatal(err)
}
Expand Down
1 change: 0 additions & 1 deletion importers/imports.go
View file
Expand Up @@ -267,7 +267,6 @@ func NewDefaultImports() Collection {
`"bytes"`,
`"fmt"`,
`"io"`,
`"io/ioutil"`,
`"math/rand"`,
`"regexp"`,
},
Expand Down
12 changes: 6 additions & 6 deletions queries/query_builders_test.go
View file
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"flag"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"reflect"
"strings"
Expand Down Expand Up @@ -138,15 +138,15 @@ func TestBuildQuery(t *testing.T) {
out, args := BuildQuery(test.q)

if *writeGoldenFiles {
err := ioutil.WriteFile(filename, []byte(out), 0664)
err := os.WriteFile(filename, []byte(out), 0664)
if err != nil {
t.Fatalf("Failed to write golden file %s: %s\n", filename, err)
}
t.Logf("wrote golden file: %s\n", filename)
continue
}

byt, err := ioutil.ReadFile(filename)
byt, err := os.ReadFile(filename)
if err != nil {
t.Fatalf("Failed to read golden file %q: %v", filename, err)
}
Expand Down Expand Up @@ -516,11 +516,11 @@ func TestLimitClause(t *testing.T) {
t.Parallel()

tests := []struct {
limit *int
limit *int
expectPredicate func(sql string) bool
}{
{nil, func(sql string) bool {
return !strings.Contains(sql,"LIMIT")
return !strings.Contains(sql, "LIMIT")
}},
{newIntPtr(0), func(sql string) bool {
return strings.Contains(sql, "LIMIT 0")
Expand All @@ -532,7 +532,7 @@ func TestLimitClause(t *testing.T) {

for i, test := range tests {
q := &Query{
limit: test.limit,
limit: test.limit,
dialect: &drivers.Dialect{LQ: '"', RQ: '"', UseIndexPlaceholders: true, UseTopClause: false},
}
sql, _ := BuildQuery(q)
Expand Down
2 changes: 1 addition & 1 deletion templates/test/singleton/boil_queries_test.go.tpl
View file
Expand Up @@ -31,7 +31,7 @@ type fKeyDestroyer struct {

func (f *fKeyDestroyer) Read(b []byte) (int, error) {
if f.buf == nil {
all, err := ioutil.ReadAll(f.reader)
all, err := io.ReadAll(f.reader)
if err != nil {
return 0, err
}
Expand Down

0 comments on commit 22497a8

Please sign in to comment.