Skip to content

Commit b6da3f0

Browse files
authored
IAC tool cli building improvements (#5448)
* CLI parsing improvements * output fetching improvements * options simplifications * Args tests fixes * Simplified CLI arguments parsing * cli parsing simplificaiton * args cleanup * fix: address PR comments on cli improvements - prevent false positives in flag matching by checking for dash prefix - reintroduce nil guards for TerraformCliArgs in options - improve subcommand replacement logic in InsertTerraformCliArgs - restore fixture counter cleanup in run-cmd tests * tests cleanup * args simplification * flags cleanup * test fixes * cli cleanup * helpers cleanup * flags simplificaion * args update * conditions simplifications * args cleanup * options cleanup * Default extension handling for reports
1 parent a365fc0 commit b6da3f0

File tree

9 files changed

+475
-155
lines changed

9 files changed

+475
-155
lines changed

internal/cli/commands/run/flags.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func NewFlags(l log.Logger, opts *options.TerragruntOptions, prefix flags.Prefix
9898
terragruntPrefixControl := flags.StrictControlsByCommand(opts.StrictControls, CommandName)
9999
legacyLogsControl := flags.StrictControlsByCommand(opts.StrictControls, CommandName, controls.LegacyLogs)
100100

101-
flags := clihelper.Flags{
101+
cmdFlags := clihelper.Flags{
102102
// `--all` related flags.
103103

104104
flags.NewFlag(&clihelper.GenericFlag[string]{
@@ -497,13 +497,13 @@ func NewFlags(l log.Logger, opts *options.TerragruntOptions, prefix flags.Prefix
497497
}
498498

499499
// Add shared flags
500-
flags = flags.Add(shared.NewBackendFlags(opts, prefix)...)
501-
flags = flags.Add(shared.NewFeatureFlags(opts, prefix)...)
502-
flags = flags.Add(shared.NewFailFastFlag(opts))
503-
flags = flags.Add(shared.NewIAMAssumeRoleFlags(opts, prefix, CommandName)...)
504-
flags = flags.Add(shared.NewQueueFlags(opts, prefix)...)
505-
flags = flags.Add(shared.NewFilterFlags(l, opts)...)
506-
flags = flags.Add(shared.NewParallelismFlag(opts))
507-
508-
return flags.Sort()
500+
cmdFlags = cmdFlags.Add(shared.NewBackendFlags(opts, prefix)...)
501+
cmdFlags = cmdFlags.Add(shared.NewFeatureFlags(opts, prefix)...)
502+
cmdFlags = cmdFlags.Add(shared.NewFailFastFlag(opts))
503+
cmdFlags = cmdFlags.Add(shared.NewIAMAssumeRoleFlags(opts, prefix, CommandName)...)
504+
cmdFlags = cmdFlags.Add(shared.NewQueueFlags(opts, prefix)...)
505+
cmdFlags = cmdFlags.Add(shared.NewFilterFlags(l, opts)...)
506+
cmdFlags = cmdFlags.Add(shared.NewParallelismFlag(opts))
507+
508+
return cmdFlags.Sort()
509509
}

0 commit comments

Comments
 (0)