Merge branch 'Azure:main' into fix-issue#4411

Azure · Nov 15, 2024 · e73c721 · e73c721
2 parents b8a87dd + a49be25
commit e73c721
Show file tree

Hide file tree

Showing 95 changed files with 3,072 additions and 414 deletions.
diff --git a/.vscode/cspell-github-user-aliases.txt b/.vscode/cspell-github-user-aliases.txt
@@ -27,6 +27,7 @@ otiai10
 pamelafox
 pbnj
 sebastianmattar
+sergi
 sethvargo
 stretchr
 theckman

diff --git a/cli/azd/.vscode/cspell-azd-dictionary.txt b/cli/azd/.vscode/cspell-azd-dictionary.txt
@@ -86,6 +86,7 @@ devcenters
 devcentersdk
 devdeviceid
 devel
+diffmatchpatch
 discarder
 docf
 dockerfiles
@@ -94,6 +95,7 @@ doublestar
 dskip
 eastus
 endregion
+entra
 entraid
 envlist
 envname
@@ -192,6 +194,7 @@ semconv
 serverfarms
 servicebus
 setenvs
+skus
 snapshotter
 springapp
 sqlserver

diff --git a/cli/azd/.vscode/cspell.yaml b/cli/azd/.vscode/cspell.yaml
@@ -107,6 +107,9 @@ overrides:
   - filename: docs/proxy-configuration.md
     words:
       - Telerik
+  - filename: test/recording/recording.go
+    words:
+      - oidctoken
   - filename: test/functional/testdata/samples/funcapp/getting_started.md
     words:
       - funcignore

diff --git a/cli/azd/CHANGELOG.md b/cli/azd/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.11.0-beta.1 (Unreleased)
+## 1.12.0-beta.1 (Unreleased)
 
 ### Features Added
 
@@ -10,6 +10,16 @@
 
 ### Other Changes
 
+## 1.11.0 (2024-11-13)
+
+### Features Added
+
+- [[4527]](https://github.com/Azure/azure-dev/pull/4527) Add new `alpha` command `azd add`.
+
+### Bugs Fixed
+
+- [[4524]](https://github.com/Azure/azure-dev/pull/4524) Fix using parameters for .NET Aspire deployment.
+
 ## 1.10.4 (2024-11-06)
 
 ### Bugs Fixed

diff --git a/cli/azd/cmd/auth_login.go b/cli/azd/cmd/auth_login.go
@@ -338,7 +338,12 @@ func (la *loginAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 		return nil, err
 	}
 
-	if la.flags.clientID == "" {
+	forceRefresh := false
+	if v, err := strconv.ParseBool(os.Getenv("AZD_DEBUG_LOGIN_FORCE_SUBSCRIPTION_REFRESH")); err == nil && v {
+		forceRefresh = true
+	}
+
+	if la.flags.clientID == "" || forceRefresh {
 		// Update the subscriptions cache for regular users (i.e. non-service-principals).
 		// The caching is done here to increase responsiveness of listing subscriptions in the application.
 		// It also allows an implicit command for the user to refresh cached subscriptions.

diff --git a/cli/azd/cmd/cmd_help.go b/cli/azd/cmd/cmd_help.go
@@ -94,17 +94,39 @@ func getCmdHelpDefaultCommands(cmd *cobra.Command) string {
 
 // getCmdHelpDefaultFlags provides the default implementation for displaying the help flags section.
 func getCmdHelpDefaultFlags(cmd *cobra.Command) (result string) {
-	if cmd.HasAvailableLocalFlags() {
-		flags := getFlagsDetails(cmd.LocalFlags())
+	// force the following flags as global flags for display purposes when displaying help.
+	forceGlobalFlagNames := map[string]struct{}{
+		"help": {},
+		"docs": {},
+	}
+
+	forceGlobalFlags := pflag.NewFlagSet("", pflag.ContinueOnError)
+	localFlags := pflag.NewFlagSet("", pflag.ContinueOnError)
+
+	cmd.LocalFlags().VisitAll(func(f *pflag.Flag) {
+		if _, ok := forceGlobalFlagNames[f.Name]; ok {
+			forceGlobalFlags.AddFlag(f)
+		} else {
+			localFlags.AddFlag(f)
+		}
+	})
+
+	if localFlags.HasAvailableFlags() {
+		details := getFlagsDetails(localFlags)
 		result = fmt.Sprintf("%s\n%s\n",
 			output.WithBold("%s", output.WithUnderline("Flags")),
-			flags)
+			details)
 	}
-	if cmd.HasAvailableInheritedFlags() {
-		globalFlags := getFlagsDetails(cmd.InheritedFlags())
+
+	globalFlags := pflag.NewFlagSet("", pflag.ContinueOnError)
+	globalFlags.AddFlagSet(cmd.InheritedFlags())
+	globalFlags.AddFlagSet(forceGlobalFlags)
+
+	if globalFlags.HasAvailableFlags() {
+		details := getFlagsDetails(globalFlags)
 		result += fmt.Sprintf("%s\n%s\n",
 			output.WithBold("%s", output.WithUnderline("Global Flags")),
-			globalFlags)
+			details)
 	}
 	return result
 }

diff --git a/cli/azd/cmd/root.go b/cli/azd/cmd/root.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/azure/azure-dev/cli/azd/internal"
 	"github.com/azure/azure-dev/cli/azd/internal/cmd"
+	"github.com/azure/azure-dev/cli/azd/internal/cmd/add"
 	"github.com/azure/azure-dev/cli/azd/internal/telemetry"
 	"github.com/azure/azure-dev/cli/azd/pkg/output"
 	"github.com/spf13/cobra"
@@ -320,6 +321,11 @@ func NewRootCmd(
 			},
 		}).
 		UseMiddleware("hooks", middleware.NewHooksMiddleware)
+	root.
+		Add("add", &actions.ActionDescriptorOptions{
+			Command:        add.NewAddCmd(),
+			ActionResolver: add.NewAddAction,
+		})
 
 	// Register any global middleware defined by the caller
 	if len(middlewareChain) > 0 {