[deckhouse-cli] lint (#216)

Signed-off-by: Pavel Okhlopkov <[email protected]>

Author: ldmonster

.golangci.yaml

@@ -88,6 +88,7 @@ linters:
       - builtin$
       - examples$
       - _test\.go$
+      - deepcopy\.go$
 formatters:
   enable:
     - gci

cmd/commands/delivery.go

@@ -40,7 +40,7 @@ func NewDeliveryCommand() (*cobra.Command, context.Context) {
 	werfRootCmd = ReplaceCommandName("werf", "d8 dk", werfRootCmd)
 	werfRootCmd.Short = "A set of tools for building, distributing, and deploying containerized applications"
 	werfRootCmd.Long = werfRootCmd.Short + "."
-	werfRootCmd.Long = werfRootCmd.Long + `
+	werfRootCmd.Long += `
 
 LICENSE NOTE: The Deckhouse Delivery Kit functionality is exclusively available to users holding a valid license for any commercial version of the Deckhouse Kubernetes Platform.
 

cmd/commands/helpjson.go

@@ -52,8 +52,8 @@ func NewHelpJSONCommand(rootCmd *cobra.Command) *cobra.Command {
 	return helpJSONCmd
 }
 
-func helpJSON(rootCmd *cobra.Command) func(cmd *cobra.Command, _ []string) error {
-	return func(cmd *cobra.Command, _ []string) error {
+func helpJSON(rootCmd *cobra.Command) func(_ *cobra.Command, _ []string) error {
+	return func(_ *cobra.Command, _ []string) error {
 		commandsData := extractCommands(rootCmd.Root())
 		jsonData, err := json.MarshalIndent(commandsData, "", "  ")
 		if err != nil {

cmd/commands/kubectl.go

@@ -159,7 +159,9 @@ func NewKubectlCommand() *cobra.Command {
 					fmt.Fprintf(os.Stderr, "Continuing with default kubectl behavior...\n")
 				} else {
 					fmt.Fprintf(os.Stderr, "Using debug container image: %s\n", debugImage)
-					cmd.Flags().Set("image", debugImage)
+					if err := cmd.Flags().Set("image", debugImage); err != nil {
+						fmt.Fprintf(os.Stderr, "Warning: cannot set debug image flag: %v\n", err)
+					}
 				}
 			}
 		}
@@ -190,7 +192,7 @@ func NewKubectlCommand() *cobra.Command {
 			return pre(cmd, args)
 		}
 	default:
-		kubectlCmd.PersistentPreRun = func(cmd *cobra.Command, args []string) {
+		kubectlCmd.PersistentPreRun = func(_ *cobra.Command, _ []string) {
 			logs.InitLogs()
 		}
 	}

cmd/commands/stronghold.go

@@ -82,7 +82,7 @@ func NewStrongholdCommand() *cobra.Command {
 			DisableFlagParsing: true,
 			SilenceErrors:      true,
 			SilenceUsage:       true,
-			Run: func(cmd *cobra.Command, args []string) {
+			Run: func(_ *cobra.Command, args []string) {
 				vaultcommand.Run(append(strongholdCommand, args...))
 			},
 		}

cmd/d8/root.go

@@ -21,9 +21,7 @@ import (
 	"fmt"
 	"log"
 	"log/slog"
-	"math/rand"
 	"os"
-	"time"
 
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -74,8 +72,8 @@ func NewRootCommand() *RootCommand {
 		Version:       version.Version,
 		SilenceUsage:  true,
 		SilenceErrors: true,
-		Run: func(cmd *cobra.Command, args []string) {
-			cmd.Help()
+		Run: func(cmd *cobra.Command, _ []string) {
+			_ = cmd.Help()
 		},
 	}
 
@@ -105,12 +103,9 @@ func (r *RootCommand) registerCommands() {
 	r.cmd.AddCommand(plugins.NewPluginsCommand(r.logger.Named("plugins-command")))
 }
 
-func (r *RootCommand) Execute() error {
+func (r *RootCommand) Execute() error { //nolint:unparam
 	ctx := r.cmd.Context()
 
-	rand.Seed(time.Now().UnixNano())
-	defer logs.FlushLogs()
-
 	if shouldTerminate, err := werfcommon.ContainerBackendProcessStartupHook(); err != nil {
 		werfcommon.TerminateWithError(err.Error(), 1)
 	} else if shouldTerminate {
@@ -126,23 +121,29 @@ func (r *RootCommand) Execute() error {
 	}
 
 	if err := r.cmd.Execute(); err != nil {
-		if helm_v3.IsPluginError(err) {
+		switch {
+		case helm_v3.IsPluginError(err):
 			werfcommon.ShutdownTelemetry(ctx, helm_v3.PluginErrorCode(err))
 			werfcommon.TerminateWithError(err.Error(), helm_v3.PluginErrorCode(err))
-		} else if errors.Is(err, resrcchangcalc.ErrChangesPlanned) {
+		case errors.Is(err, resrcchangcalc.ErrChangesPlanned):
 			werfcommon.ShutdownTelemetry(ctx, 2)
+			logs.FlushLogs()
 			os.Exit(2)
-		} else {
+		default:
 			werfcommon.ShutdownTelemetry(ctx, 1)
 			werfcommon.TerminateWithError(err.Error(), 1)
 		}
 	}
 
 	werfcommon.ShutdownTelemetry(ctx, 0)
+	logs.FlushLogs()
 	return nil
 }
 
 func execute() {
 	rootCmd := NewRootCommand()
-	rootCmd.Execute()
+	if err := rootCmd.Execute(); err != nil {
+		fmt.Fprintf(os.Stderr, "Error executing command: %v\n", err)
+		os.Exit(1)
+	}
 }

cmd/plugins/init.go

@@ -30,8 +30,8 @@ import (
 	"github.com/deckhouse/deckhouse-cli/pkg/registry/service"
 )
 
-func (r *PluginsCommand) initPluginServices() {
-	r.logger.Debug("Initializing plugin services")
+func (pc *PluginsCommand) initPluginServices() {
+	pc.logger.Debug("Initializing plugin services")
 
 	// Extract registry host from the source registry repo
 	// SourceRegistryRepo can be:
@@ -48,22 +48,22 @@ func (r *PluginsCommand) initPluginServices() {
 		testRef := registryHost
 		if !containsSlash(registryHost) {
 			// Just a hostname, use it as-is
-			r.logger.Debug("Using hostname as registry", slog.String("host", registryHost))
+			pc.logger.Debug("Using hostname as registry", slog.String("host", registryHost))
 		} else {
 			// Has path components, parse to extract registry
 			ref, err := name.ParseReference(registryHost)
 			if err == nil {
 				registryHost = ref.Context().RegistryStr()
-				r.logger.Debug("Extracted registry from path",
+				pc.logger.Debug("Extracted registry from path",
 					slog.String("original", testRef),
 					slog.String("extracted", registryHost))
 			}
 		}
 	}
 
-	auth := getPluginRegistryAuthProvider(registryHost, r.logger)
+	auth := getPluginRegistryAuthProvider(registryHost, pc.logger)
 
-	r.logger.Debug("Creating plugin registry client",
+	pc.logger.Debug("Creating plugin registry client",
 		slog.String("registry_host", registryHost),
 		slog.Bool("insecure", d8flags.Insecure),
 		slog.Bool("tls_skip_verify", d8flags.TLSSkipVerify))
@@ -73,24 +73,24 @@ func (r *PluginsCommand) initPluginServices() {
 		Auth:          auth,
 		Insecure:      d8flags.Insecure,
 		TLSSkipVerify: d8flags.TLSSkipVerify,
-		Logger:        r.logger.Named("registry-client"),
+		Logger:        pc.logger.Named("registry-client"),
 	})
 
 	// Build scoped client using chained WithSegment calls
 	// Example: registry.deckhouse.io -> deckhouse -> ee -> modules
-	r.pluginRegistryClient = baseClient
+	pc.pluginRegistryClient = baseClient
 
-	r.logger.Debug("Creating plugin service with scoped client",
+	pc.logger.Debug("Creating plugin service with scoped client",
 		slog.String("scope_path", strings.TrimPrefix(sourceRepo, sourceRepo)))
 
 	registryService := service.NewService(
-		r.pluginRegistryClient,
-		r.logger.Named("registry-service"),
+		pc.pluginRegistryClient,
+		pc.logger.Named("registry-service"),
 	)
 
-	r.service = registryService.PluginService()
+	pc.service = registryService.PluginService()
 
-	r.logger.Debug("Plugin services initialized successfully")
+	pc.logger.Debug("Plugin services initialized successfully")
 }
 
 // containsSlash checks if a string contains a forward slash

cmd/plugins/plugins.go

@@ -67,7 +67,7 @@ func NewPluginsCommand(logger *dkplog.Logger) *cobra.Command {
 		Use:    "plugins",
 		Short:  "Manage Deckhouse CLI plugins",
 		Hidden: true,
-		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		PersistentPreRun: func(_ *cobra.Command, _ []string) {
 			// init plugin services for subcommands after flags are parsed
 			pc.initPluginServices()
 		},
@@ -92,7 +92,7 @@ func (pc *PluginsCommand) pluginsListCommand() *cobra.Command {
 		Use:   "list",
 		Short: "List Deckhouse CLI plugins",
 		Long:  "Display detailed information about installed plugins and available plugins from the registry",
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			ctx := cmd.Context()
 
 			// Prepare all data before printing
@@ -549,7 +549,7 @@ func (pc *PluginsCommand) pluginsUpdateAllCommand() *cobra.Command {
 		Use:   "all",
 		Short: "Update all installed plugins",
 		Long:  "Update all installed plugins to their latest available versions",
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, _ []string) error {
 			// TODO: Implement updating all installed plugins from filesystem
 			fmt.Println("Updating all installed plugins...")
 			fmt.Println("Checking for updates...")
@@ -570,7 +570,7 @@ func (pc *PluginsCommand) pluginsRemoveCommand() *cobra.Command {
 		Short:   "Remove an installed plugin",
 		Long:    "Remove a specific plugin from the Deckhouse CLI",
 		Args:    cobra.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, args []string) error {
 			pluginName := args[0]
 			fmt.Printf("Removing plugin: %s\n", pluginName)
 
@@ -596,7 +596,7 @@ func (pc *PluginsCommand) pluginsRemoveAllCommand() *cobra.Command {
 		Use:   "all",
 		Short: "Remove all installed plugins",
 		Long:  "Remove all plugins from the Deckhouse CLI at once",
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, _ []string) error {
 			// TODO: Implement removing all installed plugins from filesystem
 			fmt.Println("Removing all installed plugins...")
 

internal/mirror/chunked/chunk_reader.go

@@ -51,7 +51,7 @@ func Open(baseDir, baseFileName string) (*FileReader, error) {
 		}
 
 		chunks = append(chunks, chunk)
-		chunkIndex += 1
+		chunkIndex++
 	}
 }
 

internal/mirror/chunked/chunk_writer.go

@@ -96,7 +96,7 @@ func (c *FileWriter) swapActiveChunk() error {
 		if err := c.closeActiveChunk(); err != nil {
 			return fmt.Errorf("Close active chunk file: %w", err)
 		}
-		c.chunkIndex += 1
+		c.chunkIndex++
 	}
 
 	newChunk, err := os.Create(filepath.Join(c.workingDir, fmt.Sprintf("%s.%04d.chunk", c.baseFileName, c.chunkIndex)))