Merge branch 'main' into chicks/2026-01-06-fix-3965

Author: tlimoncelli

commands/commands.go

@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -13,7 +14,7 @@ import (
 	"github.com/StackExchange/dnscontrol/v4/pkg/printer"
 	"github.com/StackExchange/dnscontrol/v4/pkg/version"
 	"github.com/fatih/color"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 // categories of commands
@@ -34,19 +35,19 @@ func cmd(cat string, c *cli.Command) bool {
 var _ = cmd(catDebug, &cli.Command{
 	Name:  "version",
 	Usage: "Print version information",
-	Action: func(c *cli.Context) error {
+	Action: func(ctx context.Context, c *cli.Command) error {
 		_, err := fmt.Println(version.Version())
 		return err
 	},
 })
 
 // Run will execute the CLI
 func Run(v string) int {
-	app := cli.NewApp()
-	app.Version = v
-	app.Name = "dnscontrol"
-	app.HideVersion = true
-	app.Usage = "DNSControl is a compiler and DSL for managing dns zones"
+	app := &cli.Command{
+		Name:    "dnscontrol",
+		Usage:   "DNSControl is a compiler and DSL for managing dns zones",
+		Version: v,
+	}
 	app.Flags = []cli.Flag{
 		&cli.BoolFlag{
 			Name:        "debug",
@@ -63,7 +64,7 @@ func Run(v string) int {
 			Name:   "diff2",
 			Usage:  "Obsolete flag. Will be removed in v5 or later",
 			Hidden: true,
-			Action: func(ctx *cli.Context, v bool) error {
+			Action: func(ctx context.Context, c *cli.Command, v bool) error {
 				pobsoleteDiff2FlagUsed = true
 				return nil
 			},
@@ -79,11 +80,29 @@ func Run(v string) int {
 			Destination: &color.NoColor,
 			Value:       false,
 		},
+		&cli.BoolFlag{
+			Name:   "generate-bash-completion",
+			Usage:  "Generate bash completion",
+			Hidden: true,
+		},
+	}
+	app.Before = func(ctx context.Context, c *cli.Command) (context.Context, error) {
+		// In v2, EnableBashCompletion would automatically add this flag and trigger completion.
+		// In v3, we need to handle it manually.
+		// Only handle at root level - subcommands like shell-completion will handle their own.
+		if c.Bool("generate-bash-completion") && c.Root() == c {
+			if c.Root().ShellComplete != nil {
+				c.Root().ShellComplete(ctx, c)
+			}
+			return ctx, cli.Exit("", 0)
+		}
+		return ctx, nil
 	}
-	sort.Sort(cli.CommandsByName(commands))
+	sort.Slice(commands, func(i, j int) bool {
+		return commands[i].Name < commands[j].Name
+	})
 	app.Commands = commands
-	app.EnableBashCompletion = true
-	app.BashComplete = func(cCtx *cli.Context) {
+	app.ShellComplete = func(ctx context.Context, c *cli.Command) {
 		// ripped from cli.DefaultCompleteWithFlags
 		var lastArg string
 
@@ -94,14 +113,14 @@ func Run(v string) int {
 		if lastArg != "" {
 			if strings.HasPrefix(lastArg, "-") {
 				if !islastFlagComplete(lastArg, app.Flags) {
-					dnscontrolPrintFlagSuggestions(lastArg, app.Flags, cCtx.App.Writer)
+					dnscontrolPrintFlagSuggestions(lastArg, app.Flags, c.Writer)
 					return
 				}
 			}
 		}
-		dnscontrolPrintCommandSuggestions(app.Commands, cCtx.App.Writer)
+		dnscontrolPrintCommandSuggestions(app.Commands, c.Writer)
 	}
-	if err := app.Run(os.Args); err != nil {
+	if err := app.Run(context.Background(), os.Args); err != nil {
 		return 1
 	}
 	return 0
@@ -212,7 +231,7 @@ type ExecuteDSLArgs struct {
 	JSFile   string
 	JSONFile string
 	DevMode  bool
-	Variable cli.StringSlice
+	Variable []string
 }
 
 func (args *ExecuteDSLArgs) flags() []cli.Flag {

commands/completion.go

@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"context"
 	"embed"
 	"errors"
 	"fmt"
@@ -12,7 +13,7 @@ import (
 	"text/template"
 	"unicode/utf8"
 
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 //go:embed completion-scripts/completion.*.gotmpl
@@ -28,32 +29,58 @@ func shellCompletionCommand() *cli.Command {
 		Usage:       "generate shell completion scripts",
 		ArgsUsage:   fmt.Sprintf("[ %s ]", strings.Join(supportedShells, " | ")),
 		Description: fmt.Sprintf("Generate shell completion script for [ %s ]", strings.Join(supportedShells, " | ")),
-		BashComplete: func(ctx *cli.Context) {
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:   "generate-bash-completion",
+				Usage:  "Generate bash completion",
+				Hidden: true,
+			},
+		},
+		Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
+			// In v2, EnableBashCompletion would automatically add this flag and trigger completion.
+			// In v3, we need to handle it manually.
+			// This runs before Action, so we intercept the flag here.
+			if cmd.Bool("generate-bash-completion") {
+				if cmd.ShellComplete != nil {
+					cmd.ShellComplete(ctx, cmd)
+				}
+				// Mark that we handled completion so Action can skip
+				return context.WithValue(ctx, "completionHandled", true), nil
+			}
+			return ctx, nil
+		},
+		ShellComplete: func(ctx context.Context, cmd *cli.Command) {
 			for _, shell := range supportedShells {
-				if strings.HasPrefix(shell, ctx.Args().First()) {
-					if _, err := ctx.App.Writer.Write([]byte(shell + "\n")); err != nil {
+				if strings.HasPrefix(shell, cmd.Args().First()) {
+					if _, err := cmd.Root().Writer.Write([]byte(shell + "\n")); err != nil {
 						panic(err)
 					}
 				}
 			}
 		},
-		Action: func(ctx *cli.Context) error {
+		Action: func(ctx context.Context, cmd *cli.Command) error {
+			// If completion was handled in Before, skip normal action
+			if ctx.Value("completionHandled") != nil {
+				return nil
+			}
+
 			var inputShell string
-			if inputShell = ctx.Args().First(); inputShell == "" {
+			if inputShell = cmd.Args().First(); inputShell == "" {
 				if inputShell = os.Getenv("SHELL"); inputShell == "" {
 					return cli.Exit(errors.New("shell not specified"), 1)
 				}
 			}
 			shellName := path.Base(inputShell) // necessary if using $SHELL, noop otherwise
+			//fmt.Printf("DEBUG: shellName = %q\n", shellName)
 
 			template := templates[shellName]
 			if template == nil {
 				return cli.Exit(fmt.Errorf("unknown shell: %s", inputShell), 1)
 			}
 
-			err = template.Execute(ctx.App.Writer, struct {
-				App *cli.App
-			}{ctx.App})
+			err = template.Execute(cmd.Root().Writer, struct {
+				App *cli.Command
+			}{cmd.Root()})
 			if err != nil {
 				return cli.Exit(fmt.Errorf("failed to print completion script: %w", err), 1)
 			}

commands/completion_test.go

@@ -2,14 +2,15 @@ package commands
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"slices"
 	"strings"
 	"testing"
 	"text/template"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 type shellTestDataItem struct {
@@ -19,15 +20,15 @@ type shellTestDataItem struct {
 }
 
 // setupTestShellCompletionCommand resets the buffers used to capture output and errors from the app.
-func setupTestShellCompletionCommand(app *cli.App) func(t *testing.T) {
+func setupTestShellCompletionCommand(app *cli.Command) func(t *testing.T) {
 	return func(t *testing.T) {
 		app.Writer.(*bytes.Buffer).Reset()
 		cli.ErrWriter.(*bytes.Buffer).Reset()
 	}
 }
 
 func TestShellCompletionCommand(t *testing.T) {
-	app := cli.NewApp()
+	app := &cli.Command{}
 	app.Name = "testing"
 
 	var appWriterBuffer bytes.Buffer
@@ -67,7 +68,7 @@ func TestShellCompletionCommand(t *testing.T) {
 				tearDownTest := setupTestShellCompletionCommand(app)
 				defer tearDownTest(t)
 
-				err := app.Run([]string{app.Name, "shell-completion", tt.shellName})
+				err := app.Run(context.Background(), []string{app.Name, "shell-completion", tt.shellName})
 				if err != nil {
 					t.Fatalf("unexpected error: %v", err)
 				}
@@ -92,7 +93,7 @@ func TestShellCompletionCommand(t *testing.T) {
 			tearDownTest := setupTestShellCompletionCommand(app)
 			defer tearDownTest(t)
 
-			err := app.Run([]string{app.Name, "shell-completion", "invalid"})
+			err := app.Run(context.Background(), []string{app.Name, "shell-completion", "invalid"})
 
 			if err == nil {
 				t.Fatal("expected error, but didn't get one")
@@ -120,7 +121,7 @@ func TestShellCompletionCommand(t *testing.T) {
 
 				t.Setenv("SHELL", tt.shellPath)
 
-				err := app.Run([]string{app.Name, "shell-completion"})
+				err := app.Run(context.Background(), []string{app.Name, "shell-completion"})
 				if err != nil {
 					t.Fatalf("unexpected error: %v", err)
 				}
@@ -147,7 +148,7 @@ func TestShellCompletionCommand(t *testing.T) {
 
 			t.Setenv("SHELL", invalidShellTestDataItem.shellPath)
 
-			err := app.Run([]string{app.Name, "shell-completion"})
+			err := app.Run(context.Background(), []string{app.Name, "shell-completion"})
 			if err == nil {
 				t.Fatal("expected error, but didn't get one")
 			}
@@ -190,12 +191,21 @@ func TestShellCompletionCommand(t *testing.T) {
 			t.Run(tC.shellArg, func(t *testing.T) {
 				tearDownTest := setupTestShellCompletionCommand(app)
 				defer tearDownTest(t)
-				app.EnableBashCompletion = true
-				defer func() {
-					app.EnableBashCompletion = false
-				}()
 
-				err := app.Run([]string{app.Name, "shell-completion", tC.shellArg, "--generate-bash-completion"})
+				cmdargs := []string{app.Name,
+					"shell-completion",
+					tC.shellArg,
+					"--generate-bash-completion",
+				}
+				if tC.shellArg == "" {
+					// remove empty argument to simulate user not providing it
+					cmdargs = []string{app.Name,
+						"shell-completion",
+						"--generate-bash-completion",
+					}
+				}
+				//fmt.Printf("DEBUG: app.Run(%v)\n", cmdargs)
+				err := app.Run(context.Background(), cmdargs)
 				if err != nil {
 					t.Fatalf("unexpected error: %v", err)
 				}
@@ -239,10 +249,10 @@ func testHelperGetShellsAndCompletionScripts() ([]shellTestDataItem, error) {
 
 // testHelperRenderTemplateFromApp renders a given template with a given app.
 // This is used to test the output of the CLI command against a 'known good' value.
-func testHelperRenderTemplateFromApp(app *cli.App, scriptTemplate *template.Template) (string, error) {
+func testHelperRenderTemplateFromApp(app *cli.Command, scriptTemplate *template.Template) (string, error) {
 	var scriptBytes bytes.Buffer
 	err := scriptTemplate.Execute(&scriptBytes, struct {
-		App *cli.App
+		App *cli.Command
 	}{app})
 
 	return scriptBytes.String(), err

commands/createDomains.go

@@ -1,26 +1,27 @@
 package commands
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/StackExchange/dnscontrol/v4/pkg/credsfile"
 	"github.com/StackExchange/dnscontrol/v4/pkg/providers"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 var _ = cmd(catUtils, func() *cli.Command {
 	var args CreateDomainsArgs
 	return &cli.Command{
 		Name:  "create-domains",
 		Usage: "DEPRECATED: Ensures that all domains in your configuration are activated at their Domain Service Provider (This does not purchase the domain or otherwise interact with Registrars.)",
-		Action: func(ctx *cli.Context) error {
+		Action: func(ctx context.Context, c *cli.Command) error {
 			return exit(CreateDomains(args))
 		},
 		Flags: args.flags(),
-		Before: func(context *cli.Context) error {
+		Before: func(ctx context.Context, c *cli.Command) (context.Context, error) {
 			fmt.Println("DEPRECATED: This command is deprecated. The domain is automatically created at the Domain Service Provider during the push command.")
 			fmt.Println("DEPRECATED: To prevent disable auto-creating, use --no-populate with the push command.")
-			return nil
+			return ctx, nil
 		},
 	}
 }())

commands/fmt.go

@@ -1,21 +1,22 @@
 package commands
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"os"
 	"strings"
 
 	"github.com/ditashi/jsbeautifier-go/jsbeautifier"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 )
 
 var _ = cmd(catUtils, func() *cli.Command {
 	var args FmtArgs
 	return &cli.Command{
 		Name:  "fmt",
 		Usage: "[BETA] Format and prettify a given file",
-		Action: func(c *cli.Context) error {
+		Action: func(ctx context.Context, c *cli.Command) error {
 			return exit(FmtFile(args))
 		},
 		Flags: args.flags(),