Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cli/azd/cmd/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,9 @@ func extractGlobalArgs() []string {
var result []string
globalFlagSet.VisitAll(func(f *pflag.Flag) {
if f.Changed {
result = append(result, fmt.Sprintf("--%s", f.Name), f.Value.String())
// Use --flag=value syntax to avoid ambiguity. The two-arg form (--flag value)
// doesn't work for boolean flags, where the value is treated as a positional arg.
result = append(result, fmt.Sprintf("--%s=%s", f.Name, f.Value.String()))
}
})
return result
Expand Down
51 changes: 51 additions & 0 deletions cli/azd/cmd/container_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package cmd

import (
"context"
"os"
"testing"

"github.com/azure/azure-dev/cli/azd/cmd/middleware"
Expand Down Expand Up @@ -312,6 +313,56 @@ func Test_WorkflowCmdAdapter_ContextPropagation(t *testing.T) {
"Each execution should use a distinct command tree instance")
})

t.Run("GlobalBoolFlagsRemainSingleTokenWhenMerged", func(t *testing.T) {
originalArgs := os.Args
os.Args = []string{"azd", "--debug", "up"}
t.Cleanup(func() {
os.Args = originalArgs
})

globalArgs := extractGlobalArgs()
require.Equal(t, []string{"--debug=true"}, globalArgs)

var (
capturedPositionalArgs []string
debugEnabled bool
)

newCommand := func() *cobra.Command {
rootCmd := &cobra.Command{Use: "root"}
rootCmd.PersistentFlags().AddFlagSet(CreateGlobalFlagSet())

packageCmd := &cobra.Command{
Use: "package",
Args: cobra.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {
capturedPositionalArgs = append([]string(nil), args...)

var err error
debugEnabled, err = cmd.Flags().GetBool("debug")
require.NoError(t, err)

return nil
},
}
packageCmd.Flags().Bool("all", false, "")
rootCmd.AddCommand(packageCmd)

return rootCmd
}

adapter := &workflowCmdAdapter{
newCommand: newCommand,
globalArgs: globalArgs,
}

err := adapter.ExecuteContext(context.WithoutCancel(context.Background()), []string{"package", "--all"})
require.NoError(t, err)
require.True(t, debugEnabled, "global --debug flag should still be parsed on the rebuilt tree")
require.Empty(t, capturedPositionalArgs,
"boolean global flag value should not leak into workflow step positional args")
})

t.Run("NewRootCmdPreservesMiddlewareChain", func(t *testing.T) {
// Verify that building a real command tree via NewRootCmd preserves
// the full middleware chain (debug, ux, telemetry, error, loginGuard, etc.)
Expand Down
Loading