refactor: remove deprecated ioutil (#72)

Since go 1.16, `ioutil` has been deprecated. Its use triggers warnings when linting with `golangci-lint`. Migrate from `ioutil` to `io` and `os`, as specified at: https://go.dev/doc/go1.16#ioutil
jschaf · Aug 18, 2022 · 0abc883 · 0abc883
1 parent 176eeb1
commit 0abc883
Show file tree

Hide file tree

Showing 23 changed files with 63 additions and 65 deletions.
diff --git a/example/author/codegen_test.go b/example/author/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -30,11 +30,11 @@ func TestGenerate_Go_Example_Author(t *testing.T) {
 	gotQueriesFile := filepath.Join(tmpDir, "query.sql.go")
 	assert.FileExists(t, gotQueriesFile,
 		"Generate() should emit query.sql.go")
-	wantQueries, err := ioutil.ReadFile(wantQueriesFile)
+	wantQueries, err := os.ReadFile(wantQueriesFile)
 	if err != nil {
 		t.Fatalf("read wanted query.go.sql: %s", err)
 	}
-	gotQueries, err := ioutil.ReadFile(gotQueriesFile)
+	gotQueries, err := os.ReadFile(gotQueriesFile)
 	if err != nil {
 		t.Fatalf("read generated query.go.sql: %s", err)
 	}

diff --git a/example/complex_params/codegen_test.go b/example/complex_params/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -33,11 +33,11 @@ func TestGenerate_Go_Example_ComplexParams(t *testing.T) {
 	wantQueriesFile := "query.sql.go"
 	gotQueriesFile := filepath.Join(tmpDir, "query.sql.go")
 	assert.FileExists(t, gotQueriesFile, "Generate() should emit query.sql.go")
-	wantQueries, err := ioutil.ReadFile(wantQueriesFile)
+	wantQueries, err := os.ReadFile(wantQueriesFile)
 	if err != nil {
 		t.Fatalf("read wanted query.go.sql: %s", err)
 	}
-	gotQueries, err := ioutil.ReadFile(gotQueriesFile)
+	gotQueries, err := os.ReadFile(gotQueriesFile)
 	if err != nil {
 		t.Fatalf("read generated query.go.sql: %s", err)
 	}

diff --git a/example/composite/codegen_test.go b/example/composite/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -38,11 +38,11 @@ func TestGenerate_Go_Example_Composite(t *testing.T) {
 	gotQueriesFile := filepath.Join(tmpDir, "query.sql.go")
 	assert.FileExists(t, gotQueriesFile,
 		"Generate() should emit query.sql.go")
-	wantQueries, err := ioutil.ReadFile(wantQueriesFile)
+	wantQueries, err := os.ReadFile(wantQueriesFile)
 	if err != nil {
 		t.Fatalf("read wanted query.go.sql: %s", err)
 	}
-	gotQueries, err := ioutil.ReadFile(gotQueriesFile)
+	gotQueries, err := os.ReadFile(gotQueriesFile)
 	if err != nil {
 		t.Fatalf("read generated query.go.sql: %s", err)
 	}

diff --git a/example/custom_types/codegen_test.go b/example/custom_types/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -35,11 +35,11 @@ func TestGenerate_Go_Example_CustomTypes(t *testing.T) {
 	wantQueriesFile := "query.sql.go"
 	gotQueriesFile := filepath.Join(tmpDir, "query.sql.go")
 	assert.FileExists(t, gotQueriesFile, "Generate() should emit query.sql.go")
-	wantQueries, err := ioutil.ReadFile(wantQueriesFile)
+	wantQueries, err := os.ReadFile(wantQueriesFile)
 	if err != nil {
 		t.Fatalf("read wanted query.go.sql: %s", err)
 	}
-	gotQueries, err := ioutil.ReadFile(gotQueriesFile)
+	gotQueries, err := os.ReadFile(gotQueriesFile)
 	if err != nil {
 		t.Fatalf("read generated query.go.sql: %s", err)
 	}

diff --git a/example/device/codegen_test.go b/example/device/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -29,11 +29,11 @@ func TestGenerate_Go_Example_Device(t *testing.T) {
 	wantQueriesFile := "query.sql.go"
 	gotQueriesFile := filepath.Join(tmpDir, "query.sql.go")
 	assert.FileExists(t, gotQueriesFile, "Generate() should emit query.sql.go")
-	wantQueries, err := ioutil.ReadFile(wantQueriesFile)
+	wantQueries, err := os.ReadFile(wantQueriesFile)
 	if err != nil {
 		t.Fatalf("read wanted query.go.sql: %s", err)
 	}
-	gotQueries, err := ioutil.ReadFile(gotQueriesFile)
+	gotQueries, err := os.ReadFile(gotQueriesFile)
 	if err != nil {
 		t.Fatalf("read generated query.go.sql: %s", err)
 	}

diff --git a/example/domain/codegen_test.go b/example/domain/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -29,11 +29,11 @@ func TestGenerate_Go_Example_Domain(t *testing.T) {
 	wantQueriesFile := "query.sql.go"
 	gotQueriesFile := filepath.Join(tmpDir, "query.sql.go")
 	assert.FileExists(t, gotQueriesFile, "Generate() should emit query.sql.go")
-	wantQueries, err := ioutil.ReadFile(wantQueriesFile)
+	wantQueries, err := os.ReadFile(wantQueriesFile)
 	if err != nil {
 		t.Fatalf("read wanted query.go.sql: %s", err)
 	}
-	gotQueries, err := ioutil.ReadFile(gotQueriesFile)
+	gotQueries, err := os.ReadFile(gotQueriesFile)
 	if err != nil {
 		t.Fatalf("read generated query.go.sql: %s", err)
 	}

diff --git a/example/enums/codegen_test.go b/example/enums/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -29,11 +29,11 @@ func TestGenerate_Go_Example_Enums(t *testing.T) {
 	wantQueriesFile := "query.sql.go"
 	gotQueriesFile := filepath.Join(tmpDir, "query.sql.go")
 	assert.FileExists(t, gotQueriesFile, "Generate() should emit query.sql.go")
-	wantQueries, err := ioutil.ReadFile(wantQueriesFile)
+	wantQueries, err := os.ReadFile(wantQueriesFile)
 	if err != nil {
 		t.Fatalf("read wanted query.go.sql: %s", err)
 	}
-	gotQueries, err := ioutil.ReadFile(gotQueriesFile)
+	gotQueries, err := os.ReadFile(gotQueriesFile)
 	if err != nil {
 		t.Fatalf("read generated query.go.sql: %s", err)
 	}

diff --git a/example/erp/order/codegen_test.go b/example/erp/order/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -35,14 +35,14 @@ func TestGenerate_Go_Example_Order(t *testing.T) {
 	}
 
 	for _, file := range []string{"customer.sql.go", "price.sql.go"} {
-		wantQueries, err := ioutil.ReadFile(file)
+		wantQueries, err := os.ReadFile(file)
 		if err != nil {
 			t.Fatalf("read wanted file %s: %s", file, err)
 		}
 
 		gotFile := filepath.Join(tmpDir, file)
 		assert.FileExists(t, gotFile, "Generate() should emit "+file)
-		gotQueries, err := ioutil.ReadFile(gotFile)
+		gotQueries, err := os.ReadFile(gotFile)
 		if err != nil {
 			t.Fatalf("read generated %s: %s", file, err)
 		}

diff --git a/example/function/codegen_test.go b/example/function/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -30,11 +30,11 @@ func TestGenerate_Go_Example_Function(t *testing.T) {
 	gotQueriesFile := filepath.Join(tmpDir, "query.sql.go")
 	assert.FileExists(t, gotQueriesFile,
 		"Generate() should emit query.sql.go")
-	wantQueries, err := ioutil.ReadFile(wantQueriesFile)
+	wantQueries, err := os.ReadFile(wantQueriesFile)
 	if err != nil {
 		t.Fatalf("read wanted query.go.sql: %s", err)
 	}
-	gotQueries, err := ioutil.ReadFile(gotQueriesFile)
+	gotQueries, err := os.ReadFile(gotQueriesFile)
 	if err != nil {
 		t.Fatalf("read generated query.go.sql: %s", err)
 	}

diff --git a/example/go_pointer_types/codegen_test.go b/example/go_pointer_types/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -36,11 +36,11 @@ func TestGenerate_Go_Example_GoPointerTypes(t *testing.T) {
 	wantQueriesFile := "query.sql.go"
 	gotQueriesFile := filepath.Join(tmpDir, "query.sql.go")
 	assert.FileExists(t, gotQueriesFile, "Generate() should emit query.sql.go")
-	wantQueries, err := ioutil.ReadFile(wantQueriesFile)
+	wantQueries, err := os.ReadFile(wantQueriesFile)
 	if err != nil {
 		t.Fatalf("read wanted query.go.sql: %s", err)
 	}
-	gotQueries, err := ioutil.ReadFile(gotQueriesFile)
+	gotQueries, err := os.ReadFile(gotQueriesFile)
 	if err != nil {
 		t.Fatalf("read generated query.go.sql: %s", err)
 	}

diff --git a/example/ltree/codegen_test.go b/example/ltree/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -33,11 +33,11 @@ func TestGenerate_Go_Example_ltree(t *testing.T) {
 	wantQueriesFile := "query.sql.go"
 	gotQueriesFile := filepath.Join(tmpDir, "query.sql.go")
 	assert.FileExists(t, gotQueriesFile, "Generate() should emit query.sql.go")
-	wantQueries, err := ioutil.ReadFile(wantQueriesFile)
+	wantQueries, err := os.ReadFile(wantQueriesFile)
 	if err != nil {
 		t.Fatalf("read wanted query.go.sql: %s", err)
 	}
-	gotQueries, err := ioutil.ReadFile(gotQueriesFile)
+	gotQueries, err := os.ReadFile(gotQueriesFile)
 	if err != nil {
 		t.Fatalf("read generated query.go.sql: %s", err)
 	}

diff --git a/example/nested/codegen_test.go b/example/nested/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -33,11 +33,11 @@ func TestGenerate_Go_Example_nested(t *testing.T) {
 	wantQueriesFile := "query.sql.go"
 	gotQueriesFile := filepath.Join(tmpDir, "query.sql.go")
 	assert.FileExists(t, gotQueriesFile, "Generate() should emit query.sql.go")
-	wantQueries, err := ioutil.ReadFile(wantQueriesFile)
+	wantQueries, err := os.ReadFile(wantQueriesFile)
 	if err != nil {
 		t.Fatalf("read wanted query.go.sql: %s", err)
 	}
-	gotQueries, err := ioutil.ReadFile(gotQueriesFile)
+	gotQueries, err := os.ReadFile(gotQueriesFile)
 	if err != nil {
 		t.Fatalf("read generated query.go.sql: %s", err)
 	}

diff --git a/example/numeric_external/codegen_test.go b/example/numeric_external/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -36,11 +36,11 @@ func TestGenerate_Go_Example_Numeric_External(t *testing.T) {
 	gotQueriesFile := filepath.Join(tmpDir, "query.sql.go")
 	assert.FileExists(t, gotQueriesFile,
 		"Generate() should emit query.sql.go")
-	wantQueries, err := ioutil.ReadFile(wantQueriesFile)
+	wantQueries, err := os.ReadFile(wantQueriesFile)
 	if err != nil {
 		t.Fatalf("read wanted query.go.sql: %s", err)
 	}
-	gotQueries, err := ioutil.ReadFile(gotQueriesFile)
+	gotQueries, err := os.ReadFile(gotQueriesFile)
 	if err != nil {
 		t.Fatalf("read generated query.go.sql: %s", err)
 	}

diff --git a/example/pgcrypto/codegen_test.go b/example/pgcrypto/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -29,11 +29,11 @@ func TestGenerate_Go_Example_Pgcrypto(t *testing.T) {
 	wantQueriesFile := "query.sql.go"
 	gotQueriesFile := filepath.Join(tmpDir, "query.sql.go")
 	assert.FileExists(t, gotQueriesFile, "Generate() should emit query.sql.go")
-	wantQueries, err := ioutil.ReadFile(wantQueriesFile)
+	wantQueries, err := os.ReadFile(wantQueriesFile)
 	if err != nil {
 		t.Fatalf("read wanted query.go.sql: %s", err)
 	}
-	gotQueries, err := ioutil.ReadFile(gotQueriesFile)
+	gotQueries, err := os.ReadFile(gotQueriesFile)
 	if err != nil {
 		t.Fatalf("read generated query.go.sql: %s", err)
 	}

diff --git a/example/separate_out_dir/out/codegen_test.go b/example/separate_out_dir/out/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -37,14 +37,14 @@ func TestGenerate_Go_Example_SeparateOutDir(t *testing.T) {
 		"alpha_query.sql.1.go",
 		"bravo_query.sql.go",
 	} {
-		wantQueries, err := ioutil.ReadFile(file)
+		wantQueries, err := os.ReadFile(file)
 		if err != nil {
 			t.Fatalf("read wanted file %s: %s", file, err)
 		}
 
 		gotFile := filepath.Join(tmpDir, file)
 		assert.FileExists(t, gotFile, "Generate() should emit "+file)
-		gotQueries, err := ioutil.ReadFile(gotFile)
+		gotQueries, err := os.ReadFile(gotFile)
 		if err != nil {
 			t.Fatalf("read generated %s: %s", file, err)
 		}

diff --git a/example/syntax/codegen_test.go b/example/syntax/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -31,11 +31,11 @@ func TestGenerate_Go_Example_Syntax(t *testing.T) {
 	wantQueriesFile := "query.sql.go"
 	gotQueriesFile := filepath.Join(tmpDir, "query.sql.go")
 	assert.FileExists(t, gotQueriesFile, "Generate() should emit query.sql.go")
-	wantQueries, err := ioutil.ReadFile(wantQueriesFile)
+	wantQueries, err := os.ReadFile(wantQueriesFile)
 	if err != nil {
 		t.Fatalf("read wanted query.go.sql: %s", err)
 	}
-	gotQueries, err := ioutil.ReadFile(gotQueriesFile)
+	gotQueries, err := os.ReadFile(gotQueriesFile)
 	if err != nil {
 		t.Fatalf("read generated query.go.sql: %s", err)
 	}

diff --git a/example/void/codegen_test.go b/example/void/codegen_test.go
@@ -4,7 +4,7 @@ import (
 	"github.com/jschaf/pggen"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
@@ -29,11 +29,11 @@ func TestGenerate_Go_Example_void(t *testing.T) {
 	wantQueriesFile := "query.sql.go"
 	gotQueriesFile := filepath.Join(tmpDir, "query.sql.go")
 	assert.FileExists(t, gotQueriesFile, "Generate() should emit query.sql.go")
-	wantQueries, err := ioutil.ReadFile(wantQueriesFile)
+	wantQueries, err := os.ReadFile(wantQueriesFile)
 	if err != nil {
 		t.Fatalf("read wanted query.go.sql: %s", err)
 	}
-	gotQueries, err := ioutil.ReadFile(gotQueriesFile)
+	gotQueries, err := os.ReadFile(gotQueriesFile)
 	if err != nil {
 		t.Fatalf("read generated query.go.sql: %s", err)
 	}