fix: Fixing some govet findings

Author: yhakbar

cli/app.go

@@ -286,7 +286,8 @@ func initialSetup(cliCtx *cli.Context, opts *options.TerragruntOptions) error {
 
 	opts.RootWorkingDir = filepath.ToSlash(workingDir)
 
-	if err := opts.Logger.Formatter().SetBaseDir(opts.RootWorkingDir); err != nil {
+	err = opts.Logger.Formatter().SetBaseDir(opts.RootWorkingDir)
+	if err != nil {
 		return err
 	}
 

cli/commands/catalog/tui/tui.go

@@ -13,10 +13,10 @@ import (
 
 func Run(ctx context.Context, modules module.Modules, opts *options.TerragruntOptions) error {
 	if _, err := tea.NewProgram(newModel(modules, opts), tea.WithAltScreen(), tea.WithContext(ctx)).Run(); err != nil {
-		if err := context.Cause(ctx); errors.Is(err, context.Canceled) {
+		if causeErr := context.Cause(ctx); errors.Is(causeErr, context.Canceled) {
 			return nil
-		} else if err != nil {
-			return err
+		} else if causeErr != nil {
+			return causeErr
 		}
 
 		return err

cli/commands/catalog/tui/update.go

@@ -86,11 +86,11 @@ func updatePager(msg tea.Msg, m model) (tea.Model, tea.Cmd) {
 
 	switch msg := msg.(type) {
 	case tea.KeyMsg:
-		bb, cmd := m.buttonBar.Update(msg)
+		bb, updateCmd := m.buttonBar.Update(msg)
 		m.buttonBar = bb.(*buttonbar.ButtonBar)
 
-		if cmd != nil {
-			cmds = append(cmds, cmd)
+		if updateCmd != nil {
+			cmds = append(cmds, updateCmd)
 		}
 
 		switch {

cli/commands/common/graph/action.go

@@ -28,9 +28,9 @@ func Run(ctx context.Context, opts *options.TerragruntOptions) error {
 	// if destroy-graph-root is empty, use git to find top level dir.
 	// may cause issues if in the same repo exist unrelated modules which will generate errors when scanning.
 	if rootDir == "" {
-		gitRoot, err := shell.GitTopLevelDir(ctx, opts, opts.WorkingDir)
-		if err != nil {
-			return err
+		gitRoot, gitRootErr := shell.GitTopLevelDir(ctx, opts, opts.WorkingDir)
+		if gitRootErr != nil {
+			return gitRootErr
 		}
 
 		rootDir = gitRoot

cli/commands/common/graph/command.go

@@ -56,8 +56,8 @@ func WrapCommand(opts *options.TerragruntOptions, cmd *cli.Command) *cli.Command
 		}
 
 		opts.RunTerragrunt = func(ctx context.Context, opts *options.TerragruntOptions) error {
-			cliCtx := cliCtx.WithValue(options.ContextKey, opts)
-			return action(cliCtx)
+			cliCtxWithValue := cliCtx.WithValue(options.ContextKey, opts)
+			return action(cliCtxWithValue)
 		}
 
 		return Run(cliCtx, opts.OptionsFromContext(cliCtx))

cli/commands/common/runall/command.go

@@ -67,8 +67,8 @@ func WrapCommand(opts *options.TerragruntOptions, cmd *cli.Command) *cli.Command
 		}
 
 		opts.RunTerragrunt = func(ctx context.Context, opts *options.TerragruntOptions) error {
-			cliCtx := cliCtx.WithValue(options.ContextKey, opts)
-			return action(cliCtx)
+			cliCtxWithValue := cliCtx.WithValue(options.ContextKey, opts)
+			return action(cliCtxWithValue)
 		}
 
 		return Run(cliCtx, opts.OptionsFromContext(cliCtx))

cli/commands/exec/action.go

@@ -27,17 +27,17 @@ func Run(ctx context.Context, opts *options.TerragruntOptions, cmdOpts *Options,
 func runTargetCommand(cmdOpts *Options, args cli.Args) run.TargetCallbackType {
 	return func(ctx context.Context, opts *options.TerragruntOptions, cfg *config.TerragruntConfig) error {
 		var (
-			command = args.CommandName()
-			args    = args.Tail()
-			dir     = opts.WorkingDir
+			command  = args.CommandName()
+			tailArgs = args.Tail()
+			dir      = opts.WorkingDir
 		)
 
 		if !cmdOpts.InDownloadDir {
 			dir = opts.RootWorkingDir
 		}
 
 		return run.RunActionWithHooks(ctx, command, opts, cfg, func(ctx context.Context) error {
-			_, err := shell.RunCommandWithOutput(ctx, opts, dir, false, false, command, args...)
+			_, err := shell.RunCommandWithOutput(ctx, opts, dir, false, false, command, tailArgs...)
 			if err != nil {
 				return errors.Errorf("failed to run command in directory %s: %w", dir, err)
 			}

cli/commands/find/action.go

@@ -37,9 +37,9 @@ func Run(ctx context.Context, opts *Options) error {
 	case SortAlpha:
 		cfgs = cfgs.Sort()
 	case SortDAG:
-		q, err := queue.NewQueue(cfgs)
-		if err != nil {
-			return errors.New(err)
+		q, queueErr := queue.NewQueue(cfgs)
+		if queueErr != nil {
+			return errors.New(queueErr)
 		}
 
 		cfgs = q.Entries()

cli/commands/graph/command.go

@@ -39,9 +39,9 @@ func action(opts *options.TerragruntOptions) cli.ActionFunc {
 	return func(cliCtx *cli.Context) error {
 		opts.RunTerragrunt = func(ctx context.Context, opts *options.TerragruntOptions) error {
 			if cmd := cliCtx.Command.Subcommand(opts.TerraformCommand); cmd != nil {
-				cliCtx := cliCtx.WithValue(options.ContextKey, opts)
+				cliCtxWithValue := cliCtx.WithValue(options.ContextKey, opts)
 
-				return cmd.Action(cliCtx)
+				return cmd.Action(cliCtxWithValue)
 			}
 
 			return run.Run(ctx, opts)

cli/commands/hclfmt/action.go

@@ -216,12 +216,12 @@ func bytesDiff(opts *options.TerragruntOptions, b1, b2 []byte, path string) ([]b
 	}
 
 	defer func() {
-		if err := f1.Close(); err != nil {
-			opts.Logger.Warnf("Failed to close file %s %v", f1.Name(), err)
+		if closeErr := f1.Close(); closeErr != nil {
+			opts.Logger.Warnf("Failed to close file %s %v", f1.Name(), closeErr)
 		}
 
-		if err := os.Remove(f1.Name()); err != nil {
-			opts.Logger.Warnf("Failed to remove file %s %v", f1.Name(), err)
+		if removeErr := os.Remove(f1.Name()); removeErr != nil {
+			opts.Logger.Warnf("Failed to remove file %s %v", f1.Name(), removeErr)
 		}
 	}()
 
@@ -231,21 +231,21 @@ func bytesDiff(opts *options.TerragruntOptions, b1, b2 []byte, path string) ([]b
 	}
 
 	defer func() {
-		if err := f2.Close(); err != nil {
-			opts.Logger.Warnf("Failed to close file %s %v", f2.Name(), err)
+		if closeErr := f2.Close(); closeErr != nil {
+			opts.Logger.Warnf("Failed to close file %s %v", f2.Name(), closeErr)
 		}
 
-		if err := os.Remove(f2.Name()); err != nil {
-			opts.Logger.Warnf("Failed to remove file %s %v", f2.Name(), err)
+		if removeErr := os.Remove(f2.Name()); removeErr != nil {
+			opts.Logger.Warnf("Failed to remove file %s %v", f2.Name(), removeErr)
 		}
 	}()
 
-	if _, err := f1.Write(b1); err != nil {
-		return nil, err
+	if _, f1WriteErr := f1.Write(b1); f1WriteErr != nil {
+		return nil, f1WriteErr
 	}
 
-	if _, err := f2.Write(b2); err != nil {
-		return nil, err
+	if _, f2WriteErr := f2.Write(b2); f2WriteErr != nil {
+		return nil, f2WriteErr
 	}
 
 	data, err := exec.Command("diff", "--label="+filepath.Join("old", path), "--label="+filepath.Join("new/", path), "-u", f1.Name(), f2.Name()).CombinedOutput()