From 3e7b58c7835f408e6b667e7331fa703a2620f8e4 Mon Sep 17 00:00:00 2001 From: Riccardo Montagnin Date: Wed, 31 May 2023 10:16:55 -0500 Subject: [PATCH] fix: fix lint errors --- cmd/init/cmd.go | 3 +-- cmd/migrate/v3/utils.go | 3 +-- cmd/migrate/v4/migrate.go | 4 ++-- database/config/config.go | 2 +- database/postgresql/postgresql_test.go | 2 +- types/config/parser.go | 4 ++-- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/cmd/init/cmd.go b/cmd/init/cmd.go index a7ffcd91..4569298f 100644 --- a/cmd/init/cmd.go +++ b/cmd/init/cmd.go @@ -2,7 +2,6 @@ package init import ( "fmt" - "io/ioutil" "os" "github.com/forbole/juno/v4/types/config" @@ -62,5 +61,5 @@ func writeConfig(cfg WritableConfig, path string) error { return err } - return ioutil.WriteFile(path, bz, 0600) + return os.WriteFile(path, bz, 0600) } diff --git a/cmd/migrate/v3/utils.go b/cmd/migrate/v3/utils.go index a2d32bde..9c69b10a 100644 --- a/cmd/migrate/v3/utils.go +++ b/cmd/migrate/v3/utils.go @@ -2,7 +2,6 @@ package v3 import ( "fmt" - "io/ioutil" "os" "path" @@ -20,7 +19,7 @@ func GetConfig() (Config, error) { return Config{}, fmt.Errorf("config file does not exist") } - bz, err := ioutil.ReadFile(file) + bz, err := os.ReadFile(file) if err != nil { return Config{}, fmt.Errorf("error while reading config files: %s", err) } diff --git a/cmd/migrate/v4/migrate.go b/cmd/migrate/v4/migrate.go index 4df0ff7a..0cf9c1a7 100644 --- a/cmd/migrate/v4/migrate.go +++ b/cmd/migrate/v4/migrate.go @@ -2,7 +2,7 @@ package v4 import ( "fmt" - "io/ioutil" + "os" parsecmdtypes "github.com/forbole/juno/v4/cmd/parse/types" @@ -32,7 +32,7 @@ func RunMigration(parseConfig *parsecmdtypes.Config) error { return fmt.Errorf("error while serializing config: %s", err) } - err = ioutil.WriteFile(config.GetConfigFilePath(), bz, 0600) + err = os.WriteFile(config.GetConfigFilePath(), bz, 0600) if err != nil { return fmt.Errorf("error while writing v4 config: %s", err) } diff --git a/database/config/config.go b/database/config/config.go index bbead4c4..a2480dac 100644 --- a/database/config/config.go +++ b/database/config/config.go @@ -32,7 +32,7 @@ func NewDatabaseConfig( } } -func (c Config) WithUrl(url string) Config { +func (c Config) WithURL(url string) Config { c.URL = url return c } diff --git a/database/postgresql/postgresql_test.go b/database/postgresql/postgresql_test.go index 4df84cf8..f6af1abe 100644 --- a/database/postgresql/postgresql_test.go +++ b/database/postgresql/postgresql_test.go @@ -33,7 +33,7 @@ func (suite *DbTestSuite) SetupTest() { // Build the database config dbCfg := databaseconfig.DefaultDatabaseConfig(). - WithUrl("postgres://bdjuno:password@localhost:6433/bdjuno?sslmode=disable&search_path=public") + WithURL("postgres://bdjuno:password@localhost:6433/bdjuno?sslmode=disable&search_path=public") // Build the database db, err := postgres.Builder(database.NewContext(dbCfg, &codec, logging.DefaultLogger())) diff --git a/types/config/parser.go b/types/config/parser.go index 769d0af9..33220c46 100644 --- a/types/config/parser.go +++ b/types/config/parser.go @@ -2,7 +2,7 @@ package config import ( "fmt" - "io/ioutil" + "os" "gopkg.in/yaml.v3" ) @@ -26,7 +26,7 @@ func Read(configPath string, parser Parser) (Config, error) { return Config{}, fmt.Errorf("empty configuration path") } - configData, err := ioutil.ReadFile(configPath) + configData, err := os.ReadFile(configPath) if err != nil { return Config{}, fmt.Errorf("failed to read config: %s", err) }