chore: update linter and fix new warnings

agneum · agneum · commit 4fc9f296394f · 2023-06-06T07:18:00.000-03:00
diff --git a/engine/.golangci.yml b/engine/.golangci.yml
@@ -66,7 +66,6 @@ linters-settings:
 
 linters:
   enable:
-    - deadcode
     - depguard
     - dupl
     - errcheck
@@ -83,10 +82,8 @@ linters:
     - misspell
     - prealloc
     - revive
-    - structcheck
     - stylecheck
     - unconvert
-    - varcheck
     - unused
     - unparam
     - wsl
diff --git a/engine/Makefile b/engine/Makefile
@@ -34,7 +34,7 @@ help: ## Display the help message
 all: clean build ## Build all binary components of the project
 
 install-lint: ## Install the linter to $GOPATH/bin which is expected to be in $PATH
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.45.2
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.52.2
 
 run-lint: ## Run linters
 	golangci-lint run
diff --git a/engine/cmd/cli/commands/clone/actions.go b/engine/cmd/cli/commands/clone/actions.go
@@ -402,11 +402,7 @@ func forward(cliCtx *cli.Context) error {
 
 	log.Msg(fmt.Sprintf("The clone is available by address: %s", tunnel.Endpoints.Local))
 
-	if err := tunnel.Listen(cliCtx.Context); err != nil {
-		return err
-	}
-
-	return nil
+	return tunnel.Listen(cliCtx.Context)
 }
 
 func retrieveClonePort(cliCtx *cli.Context, wg *sync.WaitGroup, remoteHost *url.URL) (string, error) {
diff --git a/engine/cmd/cli/commands/clone/command_list.go b/engine/cmd/cli/commands/clone/command_list.go
@@ -225,11 +225,7 @@ func CommandList() []*cli.Command {
 						return err
 					}
 
-					if err := commands.CheckForwardingServerURL(ctxCli); err != nil {
-						return err
-					}
-
-					return nil
+					return commands.CheckForwardingServerURL(ctxCli)
 				},
 				Action: forward,
 			},
diff --git a/engine/cmd/cli/commands/config/file.go b/engine/cmd/cli/commands/config/file.go
@@ -77,9 +77,5 @@ func SaveConfig(filename string, cfg *CLIConfig) error {
 		return err
 	}
 
-	if err := os.WriteFile(filename, configData, 0600); err != nil {
-		return err
-	}
-
-	return nil
+	return os.WriteFile(filename, configData, 0600)
 }
diff --git a/engine/cmd/cli/commands/global/actions.go b/engine/cmd/cli/commands/global/actions.go
@@ -77,9 +77,5 @@ func forward(cliCtx *cli.Context) error {
 
 	log.Msg(fmt.Sprintf("The connection is available by address: %s", tunnel.Endpoints.Local))
 
-	if err := tunnel.Listen(cliCtx.Context); err != nil {
-		return err
-	}
-
-	return nil
+	return tunnel.Listen(cliCtx.Context)
 }
diff --git a/engine/cmd/cli/main.go b/engine/cmd/cli/main.go
@@ -1,3 +1,4 @@
+// Package main contains the starting point of the CLI tool.
 package main
 
 import (
diff --git a/engine/cmd/database-lab/main.go b/engine/cmd/database-lab/main.go
@@ -6,6 +6,7 @@
 // - Validate configs in all components.
 // - Tests.
 
+// Package main contains the starting point of the DLE server.
 package main
 
 import (
diff --git a/engine/cmd/runci/main.go b/engine/cmd/runci/main.go
@@ -1,3 +1,4 @@
+// Package main contains the starting point of the CI Checker tool.
 package main
 
 import (
diff --git a/engine/internal/billing/billing.go b/engine/internal/billing/billing.go
@@ -86,11 +86,7 @@ func (b *Billing) RegisterInstance(ctx context.Context, systemMetrics models.Sys
 	}
 
 	// To check billing state immediately.
-	if err := b.SendUsage(ctx, systemMetrics); err != nil {
-		return err
-	}
-
-	return nil
+	return b.SendUsage(ctx, systemMetrics)
 }
 
 // CollectUsage periodically collects usage statistics of the instance.
diff --git a/engine/internal/observer/observer.go b/engine/internal/observer/observer.go
@@ -131,11 +131,7 @@ func (o *Observer) processCSVLogFile(ctx context.Context, buf io.Writer, filenam
 		}
 	}()
 
-	if err := o.scanCSVLogFile(ctx, logFile, buf, obsClone); err != nil {
-		return err
-	}
-
-	return nil
+	return o.scanCSVLogFile(ctx, logFile, buf, obsClone)
 }
 
 func (o *Observer) scanCSVLogFile(ctx context.Context, reader io.Reader, writer io.Writer, obsClone *ObservingClone) error {
diff --git a/engine/internal/observer/observing_clone.go b/engine/internal/observer/observing_clone.go
@@ -393,7 +393,7 @@ func (c *ObservingClone) storeArtifacts() error {
 	}
 
 	if err := c.collectCurrentState(ctx); err != nil {
-		return err
+		return errors.Wrap(err, "failed to collect current state")
 	}
 
 	return nil
@@ -412,11 +412,7 @@ func (c *ObservingClone) collectCurrentState(ctx context.Context) error {
 		return err
 	}
 
-	if err := c.countLogErrors(ctx, &c.session.state.LogErrors); err != nil {
-		return err
-	}
-
-	return nil
+	return c.countLogErrors(ctx, &c.session.state.LogErrors)
 }
 
 func (c *ObservingClone) discoverLogFields(ctx context.Context) error {
diff --git a/engine/internal/observer/stats.go b/engine/internal/observer/stats.go
@@ -381,11 +381,7 @@ func initStatFile(filename string) error {
 		return err
 	}
 
-	if err := os.Chmod(filename, 0666); err != nil {
-		return err
-	}
-
-	return nil
+	return os.Chmod(filename, 0666)
 }
 
 // IsAvailableArtifactType checks if artifact type is available.
diff --git a/engine/internal/provision/databases/postgres/pgconfig/configuration.go b/engine/internal/provision/databases/postgres/pgconfig/configuration.go
@@ -295,11 +295,7 @@ func (m *Manager) adjustGeneralConfigs() error {
 
 // AppendGeneralConfig appends configuration parameters to a general configuration file.
 func (m *Manager) AppendGeneralConfig(cfg map[string]string) error {
-	if err := appendExtraConf(m.getConfigPath(PgConfName), cfg); err != nil {
-		return err
-	}
-
-	return nil
+	return appendExtraConf(m.getConfigPath(PgConfName), cfg)
 }
 
 // AdjustRecoveryFiles adjusts a recovery files.
@@ -332,11 +328,7 @@ func (m *Manager) ApplyRecovery(cfg map[string]string) error {
 		return err
 	}
 
-	if err := appendExtraConf(m.recoveryPath(), cfg); err != nil {
-		return err
-	}
-
-	return nil
+	return appendExtraConf(m.recoveryPath(), cfg)
 }
 
 // ReadRecoveryConfig reads a recovery configuration file.
@@ -363,11 +355,7 @@ func (m *Manager) RemoveRecoveryConfig() error {
 		return err
 	}
 
-	if err := m.removeOptionally(m.recoverySignalPath()); err != nil {
-		return err
-	}
-
-	return nil
+	return m.removeOptionally(m.recoverySignalPath())
 }
 
 func (m *Manager) removeOptionally(filepath string) error {
@@ -384,20 +372,12 @@ func (m *Manager) removeOptionally(filepath string) error {
 // ApplyPgControl applies significant configuration parameters extracted by the pg_control tool.
 func (m *Manager) ApplyPgControl(pgControl map[string]string) error {
 	// TODO (akartasov): add a label check to skip an already initialized pg_control config.
-	if err := m.rewriteConfig(m.getConfigPath(pgControlName), pgControl); err != nil {
-		return err
-	}
-
-	return nil
+	return m.rewriteConfig(m.getConfigPath(pgControlName), pgControl)
 }
 
 // ApplySync applies configuration parameters for sync instance.
 func (m *Manager) ApplySync(cfg map[string]string) error {
-	if err := m.rewriteConfig(m.getConfigPath(syncConfigName), cfg); err != nil {
-		return err
-	}
-
-	return nil
+	return m.rewriteConfig(m.getConfigPath(syncConfigName), cfg)
 }
 
 // TruncateSyncConfig truncates a sync configuration file.
@@ -407,11 +387,7 @@ func (m *Manager) TruncateSyncConfig() error {
 
 // ApplyPromotion applies promotion configuration parameters.
 func (m *Manager) ApplyPromotion(cfg map[string]string) error {
-	if err := m.rewriteConfig(m.getConfigPath(promotionConfigName), cfg); err != nil {
-		return err
-	}
-
-	return nil
+	return m.rewriteConfig(m.getConfigPath(promotionConfigName), cfg)
 }
 
 // TruncatePromotionConfig truncates a promotion configuration file.
@@ -421,20 +397,12 @@ func (m *Manager) TruncatePromotionConfig() error {
 
 // ApplySnapshot applies snapshot configuration parameters.
 func (m *Manager) ApplySnapshot(cfg map[string]string) error {
-	if err := m.rewriteConfig(m.getConfigPath(snapshotConfigName), cfg); err != nil {
-		return err
-	}
-
-	return nil
+	return m.rewriteConfig(m.getConfigPath(snapshotConfigName), cfg)
 }
 
 // ApplyUserConfig applies user-defined configuration.
 func (m *Manager) ApplyUserConfig(cfg map[string]string) error {
-	if err := m.rewriteConfig(m.getConfigPath(userConfigName), cfg); err != nil {
-		return err
-	}
-
-	return nil
+	return m.rewriteConfig(m.getConfigPath(userConfigName), cfg)
 }
 
 // getConfigPath builds a path of the Database Lab config file.
diff --git a/engine/internal/provision/docker/docker.go b/engine/internal/provision/docker/docker.go
@@ -186,11 +186,7 @@ func createSocketCloneDir(socketCloneDir string) error {
 		return err
 	}
 
-	if err := os.Chmod(socketCloneDir, 0777); err != nil {
-		return err
-	}
-
-	return nil
+	return os.Chmod(socketCloneDir, 0777)
 }
 
 // StopContainer stops specified container.
diff --git a/engine/internal/provision/mode_local_test.go b/engine/internal/provision/mode_local_test.go
@@ -62,27 +62,27 @@ type mockFSManager struct {
 	cloneList []string
 }
 
-func (m mockFSManager) CreateClone(name, snapshotID string) error {
+func (m mockFSManager) CreateClone(_, _ string) error {
 	return nil
 }
 
-func (m mockFSManager) DestroyClone(name string) error {
+func (m mockFSManager) DestroyClone(_ string) error {
 	return nil
 }
 
 func (m mockFSManager) ListClonesNames() ([]string, error) {
 	return m.cloneList, nil
 }
 
-func (m mockFSManager) CreateSnapshot(poolSuffix, dataStateAt string) (snapshotName string, err error) {
+func (m mockFSManager) CreateSnapshot(_, _ string) (snapshotName string, err error) {
 	return "", nil
 }
 
-func (m mockFSManager) DestroySnapshot(snapshotName string) (err error) {
+func (m mockFSManager) DestroySnapshot(_ string) (err error) {
 	return nil
 }
 
-func (m mockFSManager) CleanupSnapshots(retentionLimit int) ([]string, error) {
+func (m mockFSManager) CleanupSnapshots(_ int) ([]string, error) {
 	return nil, nil
 }
 
@@ -93,7 +93,7 @@ func (m mockFSManager) SnapshotList() []resources.Snapshot {
 func (m mockFSManager) RefreshSnapshotList() {
 }
 
-func (m mockFSManager) GetSessionState(name string) (*resources.SessionState, error) {
+func (m mockFSManager) GetSessionState(_ string) (*resources.SessionState, error) {
 	return nil, nil
 }
 
diff --git a/engine/internal/provision/thinclones/zfs/zfs.go b/engine/internal/provision/thinclones/zfs/zfs.go
@@ -346,7 +346,7 @@ func getSnapshotName(pool, dataStateAt string) string {
 }
 
 // RollbackSnapshot rollbacks ZFS snapshot.
-func RollbackSnapshot(r runners.Runner, pool string, snapshot string) error {
+func RollbackSnapshot(r runners.Runner, _ string, snapshot string) error {
 	cmd := fmt.Sprintf("zfs rollback -f -r %s", snapshot)
 
 	if _, err := r.Run(cmd, true); err != nil {
diff --git a/engine/internal/retrieval/dbmarker/dbmarker.go b/engine/internal/retrieval/dbmarker/dbmarker.go
@@ -96,11 +96,7 @@ func (m *Marker) SaveConfig(cfg *Config) error {
 		return err
 	}
 
-	if err := os.WriteFile(m.buildFileName(), configData, 0600); err != nil {
-		return err
-	}
-
-	return nil
+	return os.WriteFile(m.buildFileName(), configData, 0600)
 }
 
 // buildFileName builds a DBMarker config filename.
diff --git a/engine/internal/retrieval/engine/postgres/physical/custom.go b/engine/internal/retrieval/engine/postgres/physical/custom.go
@@ -50,6 +50,6 @@ func (c *custom) GetRecoveryConfig(pgVersion float64) map[string]string {
 }
 
 // Init initialize custom recovery tool to work in provided container.
-func (c *custom) Init(ctx context.Context, containerID string) error {
+func (c *custom) Init(_ context.Context, _ string) error {
 	return nil
 }
diff --git a/engine/internal/retrieval/engine/postgres/physical/pgbackrest.go b/engine/internal/retrieval/engine/postgres/physical/pgbackrest.go
@@ -57,6 +57,6 @@ func (p *pgbackrest) GetRecoveryConfig(pgVersion float64) map[string]string {
 }
 
 // Init initialize pgbackrest tool.
-func (p *pgbackrest) Init(ctx context.Context, containerID string) error {
+func (p *pgbackrest) Init(_ context.Context, _ string) error {
 	return nil
 }
diff --git a/engine/internal/retrieval/engine/postgres/snapshot/physical.go b/engine/internal/retrieval/engine/postgres/snapshot/physical.go
@@ -210,11 +210,7 @@ func (p *PhysicalInitial) validateConfig() error {
 			strings.Join(notSupportedSysctls, ", "))
 	}
 
-	if err := p.validateScheduler(); err != nil {
-		return err
-	}
-
-	return nil
+	return p.validateScheduler()
 }
 
 func (p *PhysicalInitial) hasSchedulingOptions() bool {

Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,5 @@ func SaveConfig(filename string, cfg *CLIConfig) error {`
`77`	`77`	`return err`
`78`	`78`	`}`
`79`	`79`
`80`		`- if err := os.WriteFile(filename, configData, 0600); err != nil {`
`81`		`- return err`
`82`		`- }`
`83`		`-`
`84`		`- return nil`
	`80`	`+ return os.WriteFile(filename, configData, 0600)`
`85`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,5 @@ func forward(cliCtx *cli.Context) error {`
`77`	`77`
`78`	`78`	`log.Msg(fmt.Sprintf("The connection is available by address: %s", tunnel.Endpoints.Local))`
`79`	`79`
`80`		`- if err := tunnel.Listen(cliCtx.Context); err != nil {`
`81`		`- return err`
`82`		`- }`
`83`		`-`
`84`		`- return nil`
	`80`	`+ return tunnel.Listen(cliCtx.Context)`
`85`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// Package main contains the starting point of the CLI tool.`
`1`	`2`	`package main`
`2`	`3`
`3`	`4`	`import (`
Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,7 @@ func (b *Billing) RegisterInstance(ctx context.Context, systemMetrics models.Sys`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`// To check billing state immediately.`
`89`		`- if err := b.SendUsage(ctx, systemMetrics); err != nil {`
`90`		`- return err`
`91`		`- }`
`92`		`-`
`93`		`- return nil`
	`89`	`+ return b.SendUsage(ctx, systemMetrics)`
`94`	`90`	`}`
`95`	`91`
`96`	`92`	`// CollectUsage periodically collects usage statistics of the instance.`