From 7dacf3eea9df1e66ff228303c8ae3d4008499d1f Mon Sep 17 00:00:00 2001 From: Shion Ichikawa Date: Sat, 25 Nov 2023 20:25:13 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=8E=A8=20replace=20ioutil=20to=20os?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/apply.go | 9 ++++----- cmd/create.go | 5 ++--- cmd/load.go | 5 ++--- pkg/spanner/client_test.go | 9 ++++----- pkg/spanner/migration.go | 6 +++--- 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/cmd/apply.go b/cmd/apply.go index 568784d..1f465b3 100644 --- a/cmd/apply.go +++ b/cmd/apply.go @@ -20,13 +20,12 @@ package cmd import ( + "context" "errors" "fmt" - "io/ioutil" - "context" - "github.com/cloudspannerecosystem/wrench/pkg/spanner" "github.com/spf13/cobra" + "os" ) var ( @@ -57,7 +56,7 @@ func apply(c *cobra.Command, _ []string) error { return errors.New("cannot specify DDL and DML at same time") } - ddl, err := ioutil.ReadFile(ddlFile) + ddl, err := os.ReadFile(ddlFile) if err != nil { return &Error{ err: err, @@ -81,7 +80,7 @@ func apply(c *cobra.Command, _ []string) error { } // apply dml - dml, err := ioutil.ReadFile(dmlFile) + dml, err := os.ReadFile(dmlFile) if err != nil { return &Error{ err: err, diff --git a/cmd/create.go b/cmd/create.go index e6111b3..e1d4741 100644 --- a/cmd/create.go +++ b/cmd/create.go @@ -21,9 +21,8 @@ package cmd import ( "context" - "io/ioutil" - "github.com/spf13/cobra" + "os" ) var createCmd = &cobra.Command{ @@ -43,7 +42,7 @@ func create(c *cobra.Command, _ []string) error { defer client.Close() filename := schemaFilePath(c) - ddl, err := ioutil.ReadFile(filename) + ddl, err := os.ReadFile(filename) if err != nil { return &Error{ err: err, diff --git a/cmd/load.go b/cmd/load.go index e0ad140..7e5c344 100644 --- a/cmd/load.go +++ b/cmd/load.go @@ -21,9 +21,8 @@ package cmd import ( "context" - "io/ioutil" - "github.com/spf13/cobra" + "os" ) var loadCmd = &cobra.Command{ @@ -50,7 +49,7 @@ func load(c *cobra.Command, _ []string) error { } } - err = ioutil.WriteFile(schemaFilePath(c), ddl, 0o664) + err = os.WriteFile(schemaFilePath(c), ddl, 0o664) if err != nil { return &Error{ err: err, diff --git a/pkg/spanner/client_test.go b/pkg/spanner/client_test.go index a9e62ba..0b2772a 100644 --- a/pkg/spanner/client_test.go +++ b/pkg/spanner/client_test.go @@ -22,7 +22,6 @@ package spanner import ( "context" "fmt" - "io/ioutil" "os" "testing" @@ -74,7 +73,7 @@ func TestLoadDDL(t *testing.T) { t.Fatalf("failed to load ddl: %v", err) } - wantDDL, err := ioutil.ReadFile("testdata/schema.sql") + wantDDL, err := os.ReadFile("testdata/schema.sql") if err != nil { t.Fatalf("failed to read ddl file: %v", err) } @@ -88,7 +87,7 @@ func TestApplyDDLFile(t *testing.T) { t.Parallel() ctx := context.Background() - ddl, err := ioutil.ReadFile("testdata/ddl.sql") + ddl, err := os.ReadFile("testdata/ddl.sql") if err != nil { t.Fatalf("failed to read ddl file: %v", err) } @@ -171,7 +170,7 @@ func TestApplyDMLFile(t *testing.T) { t.Fatalf("failed to apply mutation: %v", err) } - dml, err := ioutil.ReadFile("testdata/dml.sql") + dml, err := os.ReadFile("testdata/dml.sql") if err != nil { t.Fatalf("failed to read dml file: %v", err) } @@ -474,7 +473,7 @@ func testClientWithDatabase(t *testing.T, ctx context.Context) (*Client, func()) t.Fatalf("failed to create spanner client: %v", err) } - ddl, err := ioutil.ReadFile("testdata/schema.sql") + ddl, err := os.ReadFile("testdata/schema.sql") if err != nil { t.Fatalf("failed to read schema file: %v", err) } diff --git a/pkg/spanner/migration.go b/pkg/spanner/migration.go index b70fec4..ff7b8b1 100644 --- a/pkg/spanner/migration.go +++ b/pkg/spanner/migration.go @@ -22,7 +22,7 @@ package spanner import ( "errors" "fmt" - "io/ioutil" + "os" "path/filepath" "regexp" "strconv" @@ -80,7 +80,7 @@ func (ms Migrations) Less(i, j int) bool { } func LoadMigrations(dir string) (Migrations, error) { - files, err := ioutil.ReadDir(dir) + files, err := os.ReadDir(dir) if err != nil { return nil, err } @@ -106,7 +106,7 @@ func LoadMigrations(dir string) (Migrations, error) { fileName := f.Name() - file, err := ioutil.ReadFile(filepath.Join(dir, fileName)) + file, err := os.ReadFile(filepath.Join(dir, fileName)) if err != nil { continue } From 0875f1a8d222ac013a527819f5ccabe6e9d1f5ea Mon Sep 17 00:00:00 2001 From: Shion Ichikawa Date: Sat, 25 Nov 2023 20:29:07 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20fileName=20->=20filena?= =?UTF-8?q?me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/spanner/migration.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/spanner/migration.go b/pkg/spanner/migration.go index ff7b8b1..eb6a858 100644 --- a/pkg/spanner/migration.go +++ b/pkg/spanner/migration.go @@ -94,7 +94,9 @@ func LoadMigrations(dir string) (Migrations, error) { continue } - matches := migrationFileRegex.FindStringSubmatch(f.Name()) + filename := f.Name() + + matches := migrationFileRegex.FindStringSubmatch(filename) if len(matches) != 4 { continue } @@ -104,9 +106,7 @@ func LoadMigrations(dir string) (Migrations, error) { continue } - fileName := f.Name() - - file, err := os.ReadFile(filepath.Join(dir, fileName)) + file, err := os.ReadFile(filepath.Join(dir, filename)) if err != nil { continue } @@ -133,9 +133,9 @@ func LoadMigrations(dir string) (Migrations, error) { }) if prevFileName, ok := versions[version]; ok { - return nil, fmt.Errorf("colliding version number \"%d\" between file names \"%s\" and \"%s\"", version, prevFileName, fileName) + return nil, fmt.Errorf("colliding version number \"%d\" between file names \"%s\" and \"%s\"", version, prevFileName, filename) } - versions[version] = fileName + versions[version] = filename } return migrations, nil From 2c71a297b3d17c09a1bbcedd530797eb8e8ffc73 Mon Sep 17 00:00:00 2001 From: Shion Ichikawa Date: Sun, 26 Nov 2023 21:10:07 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=9A=A8=20run=20goimports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/apply.go | 3 ++- cmd/create.go | 3 ++- cmd/load.go | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmd/apply.go b/cmd/apply.go index 1f465b3..7231e31 100644 --- a/cmd/apply.go +++ b/cmd/apply.go @@ -23,9 +23,10 @@ import ( "context" "errors" "fmt" + "os" + "github.com/cloudspannerecosystem/wrench/pkg/spanner" "github.com/spf13/cobra" - "os" ) var ( diff --git a/cmd/create.go b/cmd/create.go index e1d4741..10f107a 100644 --- a/cmd/create.go +++ b/cmd/create.go @@ -21,8 +21,9 @@ package cmd import ( "context" - "github.com/spf13/cobra" "os" + + "github.com/spf13/cobra" ) var createCmd = &cobra.Command{ diff --git a/cmd/load.go b/cmd/load.go index 7e5c344..4eedfec 100644 --- a/cmd/load.go +++ b/cmd/load.go @@ -21,8 +21,9 @@ package cmd import ( "context" - "github.com/spf13/cobra" "os" + + "github.com/spf13/cobra" ) var loadCmd = &cobra.Command{