fix: More involved lint fixes

yhakbar · yhakbar · commit eca3ac3df265 · 2026-01-21T16:44:18.000-05:00
diff --git a/internal/cli/commands/find/find_test.go b/internal/cli/commands/find/find_test.go
@@ -84,13 +84,13 @@ func TestRun(t *testing.T) {
 				assert.Len(t, lines, len(expectedPaths))
 
 				// Convert expected paths to use OS-specific path separators
-				var osExpectedPaths []string
+				osExpectedPaths := make([]string, 0, len(expectedPaths))
 				for _, path := range expectedPaths {
 					osExpectedPaths = append(osExpectedPaths, filepath.FromSlash(path))
 				}
 
 				// Convert actual paths to use OS-specific path separators
-				var osPaths []string
+				osPaths := make([]string, 0, len(lines))
 				for _, line := range lines {
 					osPaths = append(osPaths, filepath.FromSlash(strings.TrimSpace(line)))
 				}
@@ -150,13 +150,13 @@ func TestRun(t *testing.T) {
 				assert.Len(t, configs, len(expectedPaths))
 
 				// Convert expected paths to use OS-specific path separators
-				var osExpectedPaths []string
+				osExpectedPaths := make([]string, 0, len(expectedPaths))
 				for _, path := range expectedPaths {
 					osExpectedPaths = append(osExpectedPaths, filepath.FromSlash(path))
 				}
 
 				// Extract paths and convert to OS-specific separators
-				var paths []string
+				paths := make([]string, 0, len(configs))
 				for _, config := range configs {
 					paths = append(paths, filepath.FromSlash(config.Path))
 				}
@@ -224,13 +224,13 @@ func TestRun(t *testing.T) {
 				assert.Len(t, lines, len(expectedPaths))
 
 				// Convert expected paths to use OS-specific path separators
-				var osExpectedPaths []string
+				osExpectedPaths := make([]string, 0, len(expectedPaths))
 				for _, path := range expectedPaths {
 					osExpectedPaths = append(osExpectedPaths, filepath.FromSlash(path))
 				}
 
 				// Convert actual paths to use OS-specific path separators
-				var osPaths []string
+				osPaths := make([]string, 0, len(lines))
 				for _, line := range lines {
 					osPaths = append(osPaths, filepath.FromSlash(strings.TrimSpace(line)))
 				}
@@ -295,13 +295,13 @@ dependency "unit2" {
 				assert.Len(t, lines, len(expectedPaths))
 
 				// Convert paths to use OS-specific separators
-				var osPaths []string
+				osPaths := make([]string, 0, len(lines))
 				for _, line := range lines {
 					osPaths = append(osPaths, filepath.FromSlash(strings.TrimSpace(line)))
 				}
 
 				// Convert expected paths to use OS-specific separators
-				var osExpectedPaths []string
+				osExpectedPaths := make([]string, 0, len(expectedPaths))
 				for _, path := range expectedPaths {
 					osExpectedPaths = append(osExpectedPaths, filepath.FromSlash(path))
 				}
@@ -365,13 +365,13 @@ dependency "B" {
 				assert.Len(t, configs, len(expectedPaths))
 
 				// Extract paths and verify order
-				var paths []string
+				paths := make([]string, 0, len(configs))
 				for _, config := range configs {
 					paths = append(paths, filepath.FromSlash(config.Path))
 				}
 
 				// Convert expected paths to use OS-specific separators
-				var osExpectedPaths []string
+				osExpectedPaths := make([]string, 0, len(expectedPaths))
 				for _, path := range expectedPaths {
 					osExpectedPaths = append(osExpectedPaths, filepath.FromSlash(path))
 				}
diff --git a/internal/cli/commands/hcl/validate/validate.go b/internal/cli/commands/hcl/validate/validate.go
@@ -489,7 +489,7 @@ func getTerraformInputNamesFromEnvVar(opts *options.TerragruntOptions, terragrun
 // getTerraformInputNamesFromConfig will return the list of names of variables configured by the inputs block in the
 // terragrunt config.
 func getTerraformInputNamesFromConfig(terragruntConfig *config.TerragruntConfig) []string {
-	out := []string{}
+	out := make([]string, 0, len(terragruntConfig.Inputs))
 	for inputName := range terragruntConfig.Inputs {
 		out = append(out, inputName)
 	}
diff --git a/internal/cli/commands/list/list.go b/internal/cli/commands/list/list.go
@@ -372,7 +372,7 @@ func renderLong(opts *Options, components ListedComponents, c *Colorizer) error
 		buf.WriteString(" " + c.Colorize(component))
 
 		if opts.Dependencies && len(component.Dependencies) > 0 {
-			colorizedDeps := []string{}
+			colorizedDeps := make([]string, 0, len(component.Dependencies))
 
 			for _, dep := range component.Dependencies {
 				colorizedDeps = append(colorizedDeps, c.Colorize(dep))
diff --git a/internal/cli/commands/scaffold/scaffold.go b/internal/cli/commands/scaffold/scaffold.go
@@ -133,7 +133,7 @@ func Run(ctx context.Context, l log.Logger, opts *options.TerragruntOptions, mod
 	applyCatalogConfigToScaffold(ctx, l, opts)
 
 	// download remote repo to local
-	var dirsToClean []string
+	dirsToClean := make([]string, 0, 1)
 	// clean all temp dirs
 	defer func() {
 		for _, dir := range dirsToClean {
diff --git a/internal/cli/commands/scaffold/scaffold_test.go b/internal/cli/commands/scaffold/scaffold_test.go
@@ -42,7 +42,8 @@ func TestDefaultTemplateVariables(t *testing.T) {
 	// set pre-defined variables
 	vars := map[string]any{}
 
-	var requiredVariables, optionalVariables []*config.ParsedVariable
+	requiredVariables := make([]*config.ParsedVariable, 0, 1)
+	optionalVariables := make([]*config.ParsedVariable, 0, 1)
 
 	requiredVariables = append(requiredVariables, &config.ParsedVariable{
 		Name:                    "required_var_1",
diff --git a/internal/clihelper/flags.go b/internal/clihelper/flags.go
@@ -136,7 +136,7 @@ func (flags Flags) WithSubcommandScope() Flags {
 }
 
 func (flags Flags) Names() []string {
-	var names []string
+	names := make([]string, 0, len(flags))
 
 	for _, flag := range flags {
 		names = append(names, flag.Names()...)
diff --git a/internal/clihelper/slice_flag.go b/internal/clihelper/slice_flag.go
@@ -184,7 +184,7 @@ func (flag *sliceValue[T]) Set(str string) error {
 }
 
 func (flag *sliceValue[T]) Get() any {
-	var vals []T
+	vals := make([]T, 0, len(*flag.values))
 
 	vals = append(vals, *flag.values...)
 
diff --git a/internal/clihelper/slice_flag_test.go b/internal/clihelper/slice_flag_test.go
@@ -178,7 +178,7 @@ func testSliceFlagApply[T clihelper.SliceFlagType](t *testing.T, flag *clihelper
 	assert.Equal(t, expectedValue, actualValue)
 
 	expectedStringValueFn := func(value []T) string {
-		var stringValue []string
+		stringValue := make([]string, 0, len(value))
 		for _, val := range value {
 			stringValue = append(stringValue, fmt.Sprintf("%v", val))
 		}
diff --git a/internal/experiment/experiment.go b/internal/experiment/experiment.go
@@ -96,7 +96,7 @@ func NewExperiments() Experiments {
 
 // Names returns all experiment names.
 func (exps Experiments) Names() []string {
-	names := []string{}
+	names := make([]string, 0, len(exps))
 
 	for _, exp := range exps {
 		names = append(names, exp.Name)
diff --git a/internal/filter/filter_test.go b/internal/filter/filter_test.go
@@ -345,7 +345,7 @@ func TestFilter_RealWorldScenarios(t *testing.T) {
 			result, err := filter.Apply(l, tt.filterString, repoComponents)
 			require.NoError(t, err)
 
-			var resultNames []string
+			resultNames := make([]string, 0, len(result))
 			for _, c := range result {
 				resultNames = append(resultNames, filepath.Base(c.Path()))
 			}
diff --git a/internal/filter/filters.go b/internal/filter/filters.go
@@ -82,7 +82,7 @@ func (f Filters) RequiresParse() (Expression, bool) {
 
 // DependencyGraphExpressions returns all target expressions from graph expressions that require dependency traversal.
 func (f Filters) DependencyGraphExpressions() []Expression {
-	var targets []Expression
+	targets := make([]Expression, 0, len(f))
 
 	for _, filter := range f {
 		targets = append(targets, collectGraphExpressionTargetsWithDependencies(filter.expr)...)
@@ -93,7 +93,7 @@ func (f Filters) DependencyGraphExpressions() []Expression {
 
 // DependentGraphExpressions returns all target expressions from graph expressions that require dependent traversal.
 func (f Filters) DependentGraphExpressions() []Expression {
-	var targets []Expression
+	targets := make([]Expression, 0, len(f))
 
 	for _, filter := range f {
 		targets = append(targets, collectGraphExpressionTargetsWithDependents(filter.expr)...)
diff --git a/internal/runner/graph/graph.go b/internal/runner/graph/graph.go
@@ -48,7 +48,7 @@ func Run(ctx context.Context, l log.Logger, opts *options.TerragruntOptions) err
 	graphOpts := opts.Clone()
 	graphOpts.RootWorkingDir = rootDir
 
-	stackOpts := []common.Option{}
+	stackOpts := make([]common.Option, 0, 1)
 
 	r := report.NewReport().WithWorkingDir(opts.WorkingDir)
 
diff --git a/internal/services/catalog/module/repo_test.go b/internal/services/catalog/module/repo_test.go
@@ -65,7 +65,7 @@ func TestFindModules(t *testing.T) {
 			modules, err := repo.FindModules(ctx)
 			assert.Equal(t, tc.expectedErr, err)
 
-			var realData []moduleData
+			realData := make([]moduleData, 0, len(modules))
 
 			for _, module := range modules {
 				realData = append(realData, moduleData{
diff --git a/internal/strict/control.go b/internal/strict/control.go
@@ -230,7 +230,7 @@ func (ctrls Controls) AddSubcontrols(newCtrls ...Control) {
 
 // GetSubcontrols returns all subcontrols from all `ctrls`.
 func (ctrls Controls) GetSubcontrols() Controls {
-	var found Controls
+	found := make(Controls, 0, len(ctrls))
 
 	for _, ctrl := range ctrls {
 		found = append(found, ctrl.GetSubcontrols()...)
diff --git a/internal/tf/cliconfig/config.go b/internal/tf/cliconfig/config.go
@@ -41,10 +41,9 @@ type Config struct {
 }
 
 func (cfg *Config) Clone() *Config {
-	var (
-		providerInstallation *ProviderInstallation
-		hosts                []ConfigHost
-	)
+	var providerInstallation *ProviderInstallation
+
+	hosts := make([]ConfigHost, 0, len(cfg.Hosts))
 
 	hosts = append(hosts, cfg.Hosts...)
 
diff --git a/internal/tf/run_cmd.go b/internal/tf/run_cmd.go
@@ -193,10 +193,11 @@ func buildOutWriter(opts *options.TerragruntOptions, logger log.Logger, outWrite
 		outWriter = errWriter
 	}
 
-	options := []writer.Option{
+	options := make([]writer.Option, 0, 2+len(writerOptions)) //nolint:mnd
+	options = append(options,
 		writer.WithLogger(logger.WithOptions(log.WithOutput(outWriter))),
 		writer.WithDefaultLevel(logLevel),
-	}
+	)
 	options = append(options, writerOptions...)
 
 	return writer.New(options...)
@@ -216,10 +217,11 @@ func buildErrWriter(opts *options.TerragruntOptions, logger log.Logger, errWrite
 		logLevel = log.ErrorLevel
 	}
 
-	options := []writer.Option{
+	options := make([]writer.Option, 0, 2+len(writerOptions)) //nolint:mnd
+	options = append(options,
 		writer.WithLogger(logger.WithOptions(log.WithOutput(errWriter))),
 		writer.WithDefaultLevel(logLevel),
-	}
+	)
 	options = append(options, writerOptions...)
 
 	return writer.New(options...)
diff --git a/internal/tf/run_cmd_test.go b/internal/tf/run_cmd_test.go
@@ -36,7 +36,7 @@ func TestCommandOutputPrefix(t *testing.T) {
 	prefix := "."
 	terraformPath := "testdata/test_outputs.sh"
 
-	prefixedOutput := []string{}
+	prefixedOutput := make([]string, 0, len(FullOutput))
 	for _, line := range FullOutput {
 		prefixedOutput = append(prefixedOutput, fmt.Sprintf("prefix=%s tf-path=%s msg=%s", prefix, filepath.Base(terraformPath), line))
 	}
diff --git a/internal/tflint/tflint.go b/internal/tflint/tflint.go
@@ -85,11 +85,12 @@ func RunTflintWithOpts(ctx context.Context, l log.Logger, opts *options.Terragru
 	}
 
 	// tflint execution
-	args := []string{
+	args := make([]string, 0, 6+len(variables)+len(tflintArgs))
+	args = append(args,
 		"tflint",
 		"--config", configFile,
 		"--chdir", opts.WorkingDir,
-	}
+	)
 	args = append(args, variables...)
 	args = append(args, tflintArgs...)
 
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -102,10 +102,11 @@ var (
 			writer.WithMsgSeparator(logMsgSeparator),
 		)
 
-		parseOpts := []hclparse.Option{
+		parseOpts := make([]hclparse.Option, 0, 3) //nolint:mnd
+		parseOpts = append(parseOpts,
 			hclparse.WithDiagnosticsWriter(writer, l.Formatter().DisabledColors()),
 			hclparse.WithLogger(l),
-		}
+		)
 
 		strictControl := opts.StrictControls.Find(controls.BareInclude)
 
diff --git a/pkg/config/config_helpers_test.go b/pkg/config/config_helpers_test.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"reflect"
 	"runtime"
 	"strings"
 	"testing"
@@ -19,6 +20,21 @@ import (
 	"github.com/zclconf/go-cty/cty"
 )
 
+// assertErrorType checks that the error chain contains an error of the same type as expectedErr.
+func assertErrorType(t *testing.T, expectedErr, actualErr error) bool {
+	t.Helper()
+
+	expectedType := reflect.TypeOf(expectedErr)
+
+	for err := actualErr; err != nil; err = errors.Unwrap(err) {
+		if reflect.TypeOf(err) == expectedType {
+			return true
+		}
+	}
+
+	return assert.Fail(t, "error type mismatch", "expected error of type %T in chain, but got %T", expectedErr, actualErr)
+}
+
 func TestPathRelativeToInclude(t *testing.T) {
 	t.Parallel()
 
@@ -239,7 +255,7 @@ func TestRunCommand(t *testing.T) {
 			actualOutput, actualErr := config.RunCommand(ctx, pctx, l, tc.params)
 			if tc.expectedErr != nil {
 				if assert.Error(t, actualErr) {
-					assert.IsType(t, tc.expectedErr, errors.Unwrap(actualErr))
+					assertErrorType(t, tc.expectedErr, actualErr)
 				}
 			} else {
 				require.NoError(t, actualErr)
@@ -351,7 +367,7 @@ func TestFindInParentFolders(t *testing.T) {
 			actualPath, actualErr := config.FindInParentFolders(ctx, pctx, l, tc.params)
 			if tc.expectedErr != nil {
 				if assert.Error(t, actualErr) {
-					assert.IsType(t, tc.expectedErr, errors.Unwrap(actualErr))
+					assertErrorType(t, tc.expectedErr, actualErr)
 				}
 			} else {
 				require.NoError(t, actualErr)
diff --git a/pkg/config/cty_helpers.go b/pkg/config/cty_helpers.go
@@ -158,7 +158,7 @@ func wrapStaticValueToStringSliceAsFuncImpl(out []string) function.Function {
 	return function.New(&function.Spec{
 		Type: function.StaticReturnType(cty.List(cty.String)),
 		Impl: func(args []cty.Value, retType cty.Type) (cty.Value, error) {
-			outVals := []cty.Value{}
+			outVals := make([]cty.Value, 0, len(out))
 			for _, val := range out {
 				outVals = append(outVals, cty.StringVal(val))
 			}
diff --git a/pkg/config/include.go b/pkg/config/include.go
@@ -620,7 +620,7 @@ func mergeDependencyBlocks(targetDependencies []Dependency, sourceDependencies [
 		dependencyBlocks[dep.Name] = dep
 	}
 	// Now convert the map to list and set target
-	combinedDeps := []Dependency{}
+	combinedDeps := make([]Dependency, 0, len(keys))
 	for _, key := range keys {
 		combinedDeps = append(combinedDeps, dependencyBlocks[key])
 	}
@@ -658,7 +658,7 @@ func deepMergeDependencyBlocks(targetDependencies []Dependency, sourceDependenci
 	}
 
 	// Now convert the map to list and set target
-	combinedDeps := []Dependency{}
+	combinedDeps := make([]Dependency, 0, len(keys))
 	for _, key := range keys {
 		combinedDeps = append(combinedDeps, dependencyBlocks[key])
 	}
@@ -767,7 +767,7 @@ func mergeErrorHooks(l log.Logger, childHooks []ErrorHook, parentHooks *[]ErrorH
 // included config in the current parsing ctx, and an included config that was passed through from a previous
 // parsing ctx.
 func getTrackInclude(ctx *ParsingContext, terragruntIncludeList IncludeConfigs, includeFromChild *IncludeConfig) (*TrackInclude, error) {
-	includedPaths := []string{}
+	includedPaths := make([]string, 0, len(terragruntIncludeList))
 	terragruntIncludeMap := make(map[string]IncludeConfig, len(terragruntIncludeList))
 
 	for _, tgInc := range terragruntIncludeList {
diff --git a/test/benchmarks/integration_auto_provider_cache_dir_bench_test.go b/test/benchmarks/integration_auto_provider_cache_dir_bench_test.go
@@ -149,7 +149,8 @@ func BenchmarkProviderCachingComparison(b *testing.B) {
 
 				setup(tmpDir, count)
 
-				args := []string{
+				args := make([]string, 0, 8+len(cacheType.args))
+				args = append(args,
 					"terragrunt",
 					"run",
 					"--all",
@@ -158,7 +159,7 @@ func BenchmarkProviderCachingComparison(b *testing.B) {
 					"--non-interactive",
 					"--working-dir",
 					tmpDir,
-				}
+				)
 
 				args = append(args, cacheType.args...)
 
diff --git a/test/helpers/package.go b/test/helpers/package.go
diff --git a/test/integration_destroy_test.go b/test/integration_destroy_test.go
diff --git a/test/integration_download_test.go b/test/integration_download_test.go
diff --git a/test/integration_filter_test.go b/test/integration_filter_test.go
diff --git a/test/integration_find_test.go b/test/integration_find_test.go
diff --git a/test/integration_hcl_filter_test.go b/test/integration_hcl_filter_test.go
diff --git a/test/integration_list_test.go b/test/integration_list_test.go
diff --git a/test/integration_run_test.go b/test/integration_run_test.go

Original file line number	Diff line number	Diff line change
`@@ -489,7 +489,7 @@ func getTerraformInputNamesFromEnvVar(opts *options.TerragruntOptions, terragrun`
`489`	`489`	`// getTerraformInputNamesFromConfig will return the list of names of variables configured by the inputs block in the`
`490`	`490`	`// terragrunt config.`
`491`	`491`	`func getTerraformInputNamesFromConfig(terragruntConfig *config.TerragruntConfig) []string {`
`492`		`- out := []string{}`
	`492`	`+ out := make([]string, 0, len(terragruntConfig.Inputs))`
`493`	`493`	`for inputName := range terragruntConfig.Inputs {`
`494`	`494`	`out = append(out, inputName)`
`495`	`495`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ func (flags Flags) WithSubcommandScope() Flags {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`func (flags Flags) Names() []string {`
`139`		`- var names []string`
	`139`	`+ names := make([]string, 0, len(flags))`
`140`	`140`
`141`	`141`	`for _, flag := range flags {`
`142`	`142`	`names = append(names, flag.Names()...)`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ func (flag *sliceValue[T]) Set(str string) error {`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`func (flag *sliceValue[T]) Get() any {`
`187`		`- var vals []T`
	`187`	`+ vals := make([]T, 0, len(*flag.values))`
`188`	`188`
`189`	`189`	`vals = append(vals, *flag.values...)`
`190`	`190`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ func testSliceFlagApply[T clihelper.SliceFlagType](t testing.T, flag clihelper`
`178`	`178`	`assert.Equal(t, expectedValue, actualValue)`
`179`	`179`
`180`	`180`	`expectedStringValueFn := func(value []T) string {`
`181`		`- var stringValue []string`
	`181`	`+ stringValue := make([]string, 0, len(value))`
`182`	`182`	`for _, val := range value {`
`183`	`183`	`stringValue = append(stringValue, fmt.Sprintf("%v", val))`
`184`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ func TestFilter_RealWorldScenarios(t *testing.T) {`
`345`	`345`	`result, err := filter.Apply(l, tt.filterString, repoComponents)`
`346`	`346`	`require.NoError(t, err)`
`347`	`347`
`348`		`- var resultNames []string`
	`348`	`+ resultNames := make([]string, 0, len(result))`
`349`	`349`	`for _, c := range result {`
`350`	`350`	`resultNames = append(resultNames, filepath.Base(c.Path()))`
`351`	`351`	`}`