chore: Cleanup

Author: yhakbar

.golangci.yml

@@ -109,6 +109,13 @@ linters:
       - linters:
           - dupl
         path: cli/flags/shared
+      # BubbleTea's tea.Model expects value-receiver methods (Init/Update/View),
+      # so Model and WelcomeModel in the TUI packages trip gocritic's hugeParam
+      # check. Silence it for these packages only; hugeParam still runs everywhere else.
+      - linters:
+          - gocritic
+        text: "hugeParam:"
+        path: internal/cli/commands/catalog/tui/
       # Incrementally linting lines that are too long to ensure that
       # we don't have conflicts on every file in the codebase while
       # trying to get this merged in.

internal/cli/commands/catalog/catalog_redesign.go

@@ -14,6 +14,11 @@ import (
 	"github.com/gruntwork-io/terragrunt/pkg/options"
 )
 
+// urlChannelBufferSize is the buffer size for the discovery URL channel. It
+// absorbs short producer bursts from the two concurrent URL discoverers
+// without blocking them on a slow consumer.
+const urlChannelBufferSize = 10
+
 // runRedesign is the entry point for the redesigned catalog experience.
 // It is invoked when the catalog-redesign experiment is enabled.
 //
@@ -27,11 +32,11 @@ func runRedesign(ctx context.Context, l log.Logger, opts *options.TerragruntOpti
 	}
 
 	return redesign.RunRedesign(
-		ctx, l, opts,
+		ctx, l, opts, opts.Writers.ErrWriter,
 		func(
 			ctx context.Context, status redesign.StatusFunc, componentCh chan<- *redesign.ComponentEntry,
 		) error {
-			urlCh := make(chan string, 10) //nolint:mnd
+			urlCh := make(chan string, urlChannelBufferSize)
 
 			g, gctx := errgroup.WithContext(ctx)
 

internal/cli/commands/catalog/tui/keys.go

@@ -80,7 +80,7 @@ type DelegateKeyMap struct {
 
 // ShortHelp returns additional short help entries. This satisfies the help.KeyMap interface and
 // is entirely optional.
-func (d DelegateKeyMap) ShortHelp() []key.Binding { //nolint:gocritic
+func (d DelegateKeyMap) ShortHelp() []key.Binding {
 	return []key.Binding{
 		d.Choose,
 		d.Scaffold,
@@ -89,7 +89,7 @@ func (d DelegateKeyMap) ShortHelp() []key.Binding { //nolint:gocritic
 
 // FullHelp returns additional full help entries. This satisfies the help.KeyMap interface and
 // is entirely optional.
-func (d DelegateKeyMap) FullHelp() [][]key.Binding { //nolint:gocritic
+func (d DelegateKeyMap) FullHelp() [][]key.Binding {
 	return [][]key.Binding{
 		{
 			d.Choose,
@@ -143,7 +143,7 @@ type PagerKeyMap struct {
 
 // ShortHelp returns keybindings to be shown in the mini help view. It's part
 // of the key.Map interface.
-func (keys PagerKeyMap) ShortHelp() []key.Binding { //nolint:gocritic
+func (keys PagerKeyMap) ShortHelp() []key.Binding {
 	return []key.Binding{
 		keys.Up,
 		keys.Down,
@@ -160,7 +160,7 @@ func (keys PagerKeyMap) ShortHelp() []key.Binding { //nolint:gocritic
 
 // FullHelp returns keybindings for the expanded help view. It's part of the
 // key.Map interface.
-func (keys PagerKeyMap) FullHelp() [][]key.Binding { //nolint:gocritic
+func (keys PagerKeyMap) FullHelp() [][]key.Binding {
 	return [][]key.Binding{
 		{keys.Up, keys.Down, keys.PageDown, keys.PageUp},                   // first column
 		{keys.Navigation, keys.NavigationBack, keys.Choose, keys.Scaffold}, // second column

internal/cli/commands/catalog/tui/model.go

@@ -119,6 +119,6 @@ func NewModel(l log.Logger, opts *options.TerragruntOptions, svc catalog.Catalog
 }
 
 // Init implements bubbletea.Model.Init
-func (m Model) Init() tea.Cmd { //nolint:gocritic
+func (m Model) Init() tea.Cmd {
 	return m.buttonBar.Init()
 }

internal/cli/commands/catalog/tui/model_test.go

@@ -29,7 +29,7 @@ import (
 // the interact callback, and returns the final model once the program exits.
 // The program runs with a pipe for input, a buffer for output, and a fixed
 // terminal size so tests are deterministic.
-func runModel(t *testing.T, m tui.Model, width, height int, interact func(p *tea.Program)) tui.Model { //nolint:gocritic
+func runModel(t *testing.T, m tui.Model, width, height int, interact func(p *tea.Program)) tui.Model {
 	t.Helper()
 
 	var out bytes.Buffer

internal/cli/commands/catalog/tui/redesign/copy.go

@@ -24,9 +24,9 @@ type CopyCmd struct {
 
 // copyResult records what the copy step did beyond the raw file copy, so the
 // TUI can surface an appropriate exit message to the user.
-type copyResult struct { //nolint:govet // field order favors readability over GC-scan bytes
-	references    ValuesReferences
+type copyResult struct {
 	workingDir    string
+	references    ValuesReferences
 	valuesWritten bool
 	valuesSkipped bool
 }

internal/cli/commands/catalog/tui/redesign/copy_test.go

@@ -142,3 +142,82 @@ func TestCopyCmd_RefusesToOverwriteExistingFile(t *testing.T) {
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "already exists")
 }
+
+func TestCopyCmd_RejectsNilComponent(t *testing.T) {
+	t.Parallel()
+
+	opts := options.NewTerragruntOptions()
+	opts.WorkingDir = t.TempDir()
+
+	err := redesign.NewCopyCmd(logger.CreateLogger(), opts, nil).Run()
+	require.Error(t, err)
+	assert.Contains(t, err.Error(), "nil component")
+}
+
+func TestCopyCmd_RejectsEmptyWorkingDir(t *testing.T) {
+	t.Parallel()
+
+	repoDir := helpers.TmpDirWOSymlinks(t)
+	writeFile(t, filepath.Join(repoDir, "vpc", "terragrunt.hcl"), "# unit\n")
+
+	repo := newFakeRepo(t, repoDir)
+
+	components, err := redesign.NewComponentDiscovery().Discover(repo)
+	require.NoError(t, err)
+	require.Len(t, components, 1)
+
+	opts := options.NewTerragruntOptions()
+	opts.WorkingDir = ""
+
+	err = redesign.NewCopyCmd(logger.CreateLogger(), opts, components[0]).Run()
+	require.Error(t, err)
+	assert.Contains(t, err.Error(), "empty working directory")
+}
+
+func TestCopyCmd_FailsWhenSourceMissing(t *testing.T) {
+	t.Parallel()
+
+	repoDir := helpers.TmpDirWOSymlinks(t)
+	writeFile(t, filepath.Join(repoDir, "vpc", "terragrunt.hcl"), "# unit\n")
+
+	repo := newFakeRepo(t, repoDir)
+
+	components, err := redesign.NewComponentDiscovery().Discover(repo)
+	require.NoError(t, err)
+	require.Len(t, components, 1)
+
+	// Remove the source directory after discovery so the copy walk fails.
+	require.NoError(t, os.RemoveAll(filepath.Join(repoDir, "vpc")))
+
+	opts := options.NewTerragruntOptions()
+	opts.WorkingDir = t.TempDir()
+
+	err = redesign.NewCopyCmd(logger.CreateLogger(), opts, components[0]).Run()
+	require.Error(t, err)
+}
+
+func TestCopyCmd_SkipsSymlinks(t *testing.T) {
+	t.Parallel()
+
+	repoDir := helpers.TmpDirWOSymlinks(t)
+	writeFile(t, filepath.Join(repoDir, "vpc", "terragrunt.hcl"), "# unit\n")
+	writeFile(t, filepath.Join(repoDir, "vpc", "real.txt"), "hello\n")
+
+	// Add a symlink inside the component; copyDir should skip it silently.
+	require.NoError(t, os.Symlink("real.txt", filepath.Join(repoDir, "vpc", "link.txt")))
+
+	repo := newFakeRepo(t, repoDir)
+
+	components, err := redesign.NewComponentDiscovery().Discover(repo)
+	require.NoError(t, err)
+	require.Len(t, components, 1)
+
+	workingDir := t.TempDir()
+	opts := options.NewTerragruntOptions()
+	opts.WorkingDir = workingDir
+
+	require.NoError(t, redesign.NewCopyCmd(logger.CreateLogger(), opts, components[0]).Run())
+
+	assert.FileExists(t, filepath.Join(workingDir, "real.txt"))
+	assert.NoFileExists(t, filepath.Join(workingDir, "link.txt"))
+}

internal/cli/commands/catalog/tui/redesign/delegate.go

@@ -98,22 +98,22 @@ func newCatalogDelegate(keys *tui.DelegateKeyMap) catalogDelegate {
 }
 
 // Height returns the delegate's preferred height (title + desc + meta + spacing).
-func (d catalogDelegate) Height() int { //nolint:gocritic // value receiver required by list.ItemDelegate interface
+func (d catalogDelegate) Height() int {
 	return delegateHeight
 }
 
 // Spacing returns the gap between items.
-func (d catalogDelegate) Spacing() int { //nolint:gocritic // value receiver required by list.ItemDelegate interface
+func (d catalogDelegate) Spacing() int {
 	return 1
 }
 
 // Update is a no-op; input is handled by the model.
-func (d catalogDelegate) Update(_ tea.Msg, _ *list.Model) tea.Cmd { //nolint:gocritic // value receiver required by list.ItemDelegate interface
+func (d catalogDelegate) Update(_ tea.Msg, _ *list.Model) tea.Cmd {
 	return nil
 }
 
 // ShortHelp returns the delegate's short help bindings.
-func (d catalogDelegate) ShortHelp() []key.Binding { //nolint:gocritic // value receiver required by list.ItemDelegate interface
+func (d catalogDelegate) ShortHelp() []key.Binding {
 	if d.shortHelp != nil {
 		return d.shortHelp()
 	}
@@ -122,7 +122,7 @@ func (d catalogDelegate) ShortHelp() []key.Binding { //nolint:gocritic // value
 }
 
 // FullHelp returns the delegate's full help bindings.
-func (d catalogDelegate) FullHelp() [][]key.Binding { //nolint:gocritic // value receiver required by list.ItemDelegate interface
+func (d catalogDelegate) FullHelp() [][]key.Binding {
 	if d.fullHelp != nil {
 		return d.fullHelp()
 	}
@@ -131,7 +131,7 @@ func (d catalogDelegate) FullHelp() [][]key.Binding { //nolint:gocritic // value
 }
 
 // Render prints an item with title, description, and metadata row.
-func (d catalogDelegate) Render(w io.Writer, m list.Model, index int, item list.Item) { //nolint:gocritic // value receiver required by list.ItemDelegate interface
+func (d catalogDelegate) Render(w io.Writer, m list.Model, index int, item list.Item) {
 	entry, isEntry := item.(*ComponentEntry)
 	if !isEntry {
 		return

internal/cli/commands/catalog/tui/redesign/fault_test.go

@@ -0,0 +1,11 @@
+package redesign_test
+
+import "errors"
+
+// failingWriter always returns an error from Write, for exercising
+// write-failure branches.
+type failingWriter struct{}
+
+func (failingWriter) Write(_ []byte) (int, error) {
+	return 0, errors.New("write failed")
+}