From 2d7970ba24dbc4146cf7c7582513488d748bce32 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Sun, 17 Dec 2023 18:41:51 +0100 Subject: [PATCH] fix lint warnings Signed-off-by: Nicola Murino --- cmd/cmd.go | 10 +++++----- db/db.go | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cmd/cmd.go b/cmd/cmd.go index 41fc2e0..27dd9db 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -45,7 +45,7 @@ var ( driver string instanceID string dsn string - customTlsConfig string + customTLSConfig string retention int dbFlags = []cli.Flag{ @@ -66,7 +66,7 @@ var ( &cli.StringFlag{ Name: "custom-tls", Usage: "Custom TLS config for MySQL driver (optional)", - Destination: &customTlsConfig, + Destination: &customTLSConfig, EnvVars: []string{envPrefix + "CUSTOM_TLS"}, Required: false, }, @@ -99,7 +99,7 @@ var ( Action: func(c *cli.Context) error { logger.AppLogger.Info("starting sftpgo-plugin-eventstore", "version", getVersionString(), "database driver", driver, "instance id", instanceID) - if err := db.Initialize(driver, dsn, customTlsConfig, false); err != nil { + if err := db.Initialize(driver, dsn, customTLSConfig, false); err != nil { logger.AppLogger.Error("unable to initialize database", "error", err) return err } @@ -131,7 +131,7 @@ var ( Usage: "Apply database schema migrations", Flags: dbFlags, Action: func(c *cli.Context) error { - if err := db.Initialize(driver, dsn, customTlsConfig, true); err != nil { + if err := db.Initialize(driver, dsn, customTLSConfig, true); err != nil { logger.AppLogger.Error("unable to initialize database", "error", err) return err } @@ -160,7 +160,7 @@ var ( fmt.Println("Aborted!") return errors.New("command aborted") } - if err := db.Initialize(driver, dsn, customTlsConfig, true); err != nil { + if err := db.Initialize(driver, dsn, customTLSConfig, true); err != nil { logger.AppLogger.Error("unable to initialize database", "error", err) return err } diff --git a/db/db.go b/db/db.go index 8a418c6..78e7332 100644 --- a/db/db.go +++ b/db/db.go @@ -47,7 +47,7 @@ var ( ) // Initialize initializes the database engine -func Initialize(driver, dsn, customTlsConfig string, dbDebug bool) error { +func Initialize(driver, dsn, customTLSConfig string, dbDebug bool) error { var err error newLogger := gormlogger.Discard @@ -78,7 +78,7 @@ func Initialize(driver, dsn, customTlsConfig string, dbDebug bool) error { return err } case driverNameMySQL: - if err := handleCustomTLSConfig(customTlsConfig); err != nil { + if err := handleCustomTLSConfig(customTLSConfig); err != nil { logger.AppLogger.Error("unable to register custom tls config", "error", err) return err } @@ -184,5 +184,4 @@ func handleCustomTLSConfig(config string) error { return fmt.Errorf("unable to register tls config: %v", err) } return nil - }