Merge remote-tracking branch 'upstream/main' into ellismg/fix-509

Azure · Aug 15, 2024 · e6d6af7 · e6d6af7
2 parents 668fb38 + 83c5998
commit e6d6af7
Show file tree

Hide file tree

Showing 149 changed files with 911 additions and 1,305 deletions.
diff --git a/.devcontainer/full/devcontainer.json → .devcontainer/devcontainer.json b/.devcontainer/full/devcontainer.json → .devcontainer/devcontainer.json
@@ -33,5 +33,6 @@
                 "jinliming2.vscode-go-template"
             ]
         }
-    }
+    },
+    "postCreateCommand": "go install gotest.tools/gotestsum@latest"
 }
diff --git a/.devcontainer/light/devcontainer.json b/.devcontainer/light/devcontainer.json
@@ -23,5 +23,6 @@
                 "jinliming2.vscode-go-template"
             ]
         }
-    }
+    },
+    "postCreateCommand": "go install gotest.tools/gotestsum@latest"
 }
diff --git a/.github/workflows/cli-ci.yml b/.github/workflows/cli-ci.yml
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: "20"
-      - run: npm install -g cspell
+      - run: npm install -g cspell@8.13.1
       - name: Spell check for CLI source code
         run: cspell lint '**/*.{go,md}' --config ./cli/azd/.vscode/cspell.yaml --root ./cli/azd --no-progress
 

diff --git a/.github/workflows/cspell-misc.yml b/.github/workflows/cspell-misc.yml
@@ -20,6 +20,6 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: "20"
-      - run: npm install -g cspell
+      - run: npm install -g cspell@8.13.1
       - name: Spell check for general files
         run: cspell lint '**/*' --config ./.vscode/cspell.misc.yaml --relative --no-progress
diff --git a/.github/workflows/templates-ci.yml b/.github/workflows/templates-ci.yml
@@ -24,6 +24,6 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: "20"
-      - run: npm install -g cspell
+      - run: npm install -g cspell@8.13.1
       - name: Spell check for templates
         run: cspell lint '**/*' --config ./templates/cspell.yaml --root ./templates --no-progress
diff --git a/.github/workflows/vscode-ci.yml b/.github/workflows/vscode-ci.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: "20"
-      - run: npm install -g cspell
+      - run: npm install -g cspell@8.13.1
       - name: Spell check for vscode extension
         run: cspell lint '**/*.ts' --config ./ext/vscode/.vscode/cspell.yaml --root ./ext/vscode --no-progress
 

diff --git a/cli/azd/CHANGELOG.md b/cli/azd/CHANGELOG.md
@@ -10,6 +10,21 @@
 
 ### Other Changes
 
+## 1.9.6 (2024-08-13)
+
+### Features Added
+
+- [[4115]](https://github.com/Azure/azure-dev/pull/4115) Adding `alpha` feature `alpha.aca.persistIngressSessionAffinity`.
+
+### Bugs Fixed
+
+- [[4111]](https://github.com/Azure/azure-dev/pull/4111) Container Apps: Fail when explicit Dockerfile path not found.
+- [[4149]](https://github.com/Azure/azure-dev/pull/4149) Remove Admin Access as default for all .Net Aspire services.
+- [[4104]](https://github.com/Azure/azure-dev/pull/4104) Remove Azure Dev Ops git remote constraint for dev.azure.com only.
+- [[4160]](https://github.com/Azure/azure-dev/pull/4160) Fix automatic generation of CI/CD files for .Net Aspire projects.
+- [[4182]](https://github.com/Azure/azure-dev/pull/4182) Allow `.yaml` and `.yml` extension for azure-dev pipeline files.
+- [[4187]](https://github.com/Azure/azure-dev/pull/4187) Fix panic during deployment progress rendering.
+
 ## 1.9.5 (2024-07-10)
 
 ### Features Added

diff --git a/cli/azd/cmd/auth_login.go b/cli/azd/cmd/auth_login.go
@@ -18,6 +18,7 @@ import (
 	"github.com/MakeNowJust/heredoc/v2"
 	"github.com/azure/azure-dev/cli/azd/cmd/actions"
 	"github.com/azure/azure-dev/cli/azd/internal"
+	"github.com/azure/azure-dev/cli/azd/internal/runcontext"
 	"github.com/azure/azure-dev/cli/azd/pkg/account"
 	"github.com/azure/azure-dev/cli/azd/pkg/auth"
 	"github.com/azure/azure-dev/cli/azd/pkg/contracts"
@@ -257,8 +258,6 @@ func newLoginAction(
 	}
 }
 
-const cLoginSuccessMessage = "Logged in to Azure."
-
 func (la *loginAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 	if len(la.flags.scopes) == 0 {
 		la.flags.scopes = la.authManager.LoginScopes()
@@ -300,7 +299,7 @@ func (la *loginAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 			var msg string
 			switch res.Status {
 			case contracts.LoginStatusSuccess:
-				msg = cLoginSuccessMessage
+				msg = "Logged in to Azure."
 			case contracts.LoginStatusUnauthenticated:
 				msg = "Not logged in, run `azd auth login` to login to Azure."
 			default:
@@ -331,7 +330,7 @@ func (la *loginAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 		}
 	}
 
-	la.console.Message(ctx, cLoginSuccessMessage)
+	la.console.Message(ctx, "Logged in to Azure.")
 	return nil, nil
 }
 
@@ -534,7 +533,7 @@ func parseUseDeviceCode(ctx context.Context, flag boolPtr, commandRunner exec.Co
 		useDevCode = runningOnCodespacesBrowser(ctx, commandRunner)
 	}
 
-	if auth.ShouldUseCloudShellAuth() {
+	if runcontext.IsRunningInCloudShell() {
 		// Following az CLI behavior in Cloud Shell, use device code authentication when the user is trying to
 		// authenticate. The normal interactive authentication flow will not work in Cloud Shell because the browser
 		// cannot be opened or (if it could) cannot be redirected back to a port on the Cloud Shell instance.

diff --git a/cli/azd/cmd/auth_token_test.go b/cli/azd/cmd/auth_token_test.go
@@ -24,7 +24,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-const cManagementScope = "https://management.azure.com//.default"
+const managementScope = "https://management.azure.com//.default"
 
 func TestAuthToken(t *testing.T) {
 	wasCalled := false
@@ -34,7 +34,7 @@ func TestAuthToken(t *testing.T) {
 		wasCalled = true
 
 		// Default value when explicit scopes are not provided to the command.
-		require.ElementsMatch(t, []string{cManagementScope}, options.Scopes)
+		require.ElementsMatch(t, []string{managementScope}, options.Scopes)
 
 		return azcore.AccessToken{
 			Token:     "ABC123",
@@ -70,7 +70,7 @@ func TestAuthTokenSysEnv(t *testing.T) {
 	buf := &bytes.Buffer{}
 
 	token := authTokenFn(func(ctx context.Context, options policy.TokenRequestOptions) (azcore.AccessToken, error) {
-		require.ElementsMatch(t, []string{cManagementScope}, options.Scopes)
+		require.ElementsMatch(t, []string{managementScope}, options.Scopes)
 		return azcore.AccessToken{
 			Token:     "ABC123",
 			ExpiresOn: time.Unix(1669153000, 0).UTC(),
@@ -112,7 +112,7 @@ func TestAuthTokenSysEnvError(t *testing.T) {
 	buf := &bytes.Buffer{}
 
 	token := authTokenFn(func(ctx context.Context, options policy.TokenRequestOptions) (azcore.AccessToken, error) {
-		require.ElementsMatch(t, []string{cManagementScope}, options.Scopes)
+		require.ElementsMatch(t, []string{managementScope}, options.Scopes)
 		return azcore.AccessToken{
 			Token:     "ABC123",
 			ExpiresOn: time.Unix(1669153000, 0).UTC(),
@@ -160,7 +160,7 @@ func TestAuthTokenAzdEnvError(t *testing.T) {
 	buf := &bytes.Buffer{}
 
 	token := authTokenFn(func(ctx context.Context, options policy.TokenRequestOptions) (azcore.AccessToken, error) {
-		require.ElementsMatch(t, []string{cManagementScope}, options.Scopes)
+		require.ElementsMatch(t, []string{managementScope}, options.Scopes)
 		return azcore.AccessToken{
 			Token:     "ABC123",
 			ExpiresOn: time.Unix(1669153000, 0).UTC(),
@@ -204,7 +204,7 @@ func TestAuthTokenAzdEnv(t *testing.T) {
 	buf := &bytes.Buffer{}
 
 	token := authTokenFn(func(ctx context.Context, options policy.TokenRequestOptions) (azcore.AccessToken, error) {
-		require.ElementsMatch(t, []string{cManagementScope}, options.Scopes)
+		require.ElementsMatch(t, []string{managementScope}, options.Scopes)
 		return azcore.AccessToken{
 			Token:     "ABC123",
 			ExpiresOn: time.Unix(1669153000, 0).UTC(),
@@ -245,7 +245,7 @@ func TestAuthTokenAzdEnvWithEmpty(t *testing.T) {
 	buf := &bytes.Buffer{}
 
 	token := authTokenFn(func(ctx context.Context, options policy.TokenRequestOptions) (azcore.AccessToken, error) {
-		require.ElementsMatch(t, []string{cManagementScope}, options.Scopes)
+		require.ElementsMatch(t, []string{managementScope}, options.Scopes)
 		return azcore.AccessToken{
 			Token:     "ABC123",
 			ExpiresOn: time.Unix(1669153000, 0).UTC(),

diff --git a/cli/azd/cmd/cobra_builder.go b/cli/azd/cmd/cobra_builder.go
@@ -16,8 +16,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const cDocsFlagName = "docs"
-
 // CobraBuilder manages the construction of the cobra command tree from nested ActionDescriptors
 type CobraBuilder struct {
 	container *ioc.NestedContainer
@@ -196,7 +194,7 @@ func (df *docsFlag) Set(value string) error {
 		}
 
 		commandPath := strings.ReplaceAll(c.CommandPath(), " ", "-")
-		commandDocsUrl := cReferenceDocumentationUrl + commandPath
+		commandDocsUrl := referenceDocumentationUrl + commandPath
 		openWithDefaultBrowser(ctx, console, commandDocsUrl)
 	})
 
@@ -221,7 +219,7 @@ func (cb *CobraBuilder) bindCommand(cmd *cobra.Command, descriptor *actions.Acti
 		},
 	}
 	flag := cmd.Flags().VarPF(
-		docsFlag, cDocsFlagName, "", fmt.Sprintf("Opens the documentation for %s in your web browser.", cmd.CommandPath()))
+		docsFlag, "docs", "", fmt.Sprintf("Opens the documentation for %s in your web browser.", cmd.CommandPath()))
 	flag.NoOptDefVal = "true"
 
 	// Consistently registers output formats for the descriptor

diff --git a/cli/azd/cmd/cobra_builder_test.go b/cli/azd/cmd/cobra_builder_test.go
@@ -248,7 +248,7 @@ func Test_RunDocsFlow(t *testing.T) {
 	cmd.SetArgs([]string{"--docs"})
 	err = cmd.ExecuteContext(*testCtx.Context)
 	require.NoError(t, err)
-	require.Equal(t, cReferenceDocumentationUrl+"root", calledUrl)
+	require.Equal(t, referenceDocumentationUrl+"root", calledUrl)
 }
 
 func Test_RunDocsAndHelpFlow(t *testing.T) {

diff --git a/cli/azd/cmd/container.go b/cli/azd/cmd/container.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
+	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"github.com/MakeNowJust/heredoc/v2"
 	"github.com/azure/azure-dev/cli/azd/cmd/actions"
 	"github.com/azure/azure-dev/cli/azd/cmd/middleware"
@@ -143,11 +144,8 @@ func registerCommonDependencies(container *ioc.NestedContainer) {
 	)
 
 	client := createHttpClient()
-	ioc.RegisterInstance[httputil.HttpClient](container, client)
+	ioc.RegisterInstance[policy.Transporter](container, client)
 	ioc.RegisterInstance[auth.HttpClient](container, client)
-	container.MustRegisterSingleton(func() httputil.UserAgent {
-		return httputil.UserAgent(internal.UserAgent())
-	})
 
 	// Auth
 	container.MustRegisterSingleton(auth.NewLoggedInGuard)
@@ -468,32 +466,31 @@ func registerCommonDependencies(container *ioc.NestedContainer) {
 		return cloud.NewCloud(&cloud.Config{Name: cloud.AzurePublicName})
 	})
 
-	container.MustRegisterSingleton(func(cloud *cloud.Cloud) cloud.PortalUrlBase {
-		return cloud.PortalUrlBase
-	})
-
-	container.MustRegisterSingleton(func(
-		httpClient httputil.HttpClient,
-		userAgent httputil.UserAgent,
-		cloud *cloud.Cloud,
-	) *azsdk.ClientOptionsBuilderFactory {
-		return azsdk.NewClientOptionsBuilderFactory(httpClient, string(userAgent), cloud)
-	})
-
-	container.MustRegisterSingleton(func(
-		clientOptionsBuilderFactory *azsdk.ClientOptionsBuilderFactory,
-	) *azcore.ClientOptions {
-		return clientOptionsBuilderFactory.NewClientOptionsBuilder().
-			WithPerCallPolicy(azsdk.NewMsCorrelationPolicy()).
-			BuildCoreClientOptions()
+	container.MustRegisterSingleton(func(transport policy.Transporter, cloud *cloud.Cloud) *azcore.ClientOptions {
+		return &azcore.ClientOptions{
+			Cloud: cloud.Configuration,
+			PerCallPolicies: []policy.Policy{
+				azsdk.NewMsCorrelationPolicy(),
+				azsdk.NewUserAgentPolicy(internal.UserAgent()),
+			},
+			Transport: transport,
+		}
 	})
 
-	container.MustRegisterSingleton(func(
-		clientOptionsBuilderFactory *azsdk.ClientOptionsBuilderFactory,
-	) *arm.ClientOptions {
-		return clientOptionsBuilderFactory.NewClientOptionsBuilder().
-			WithPerCallPolicy(azsdk.NewMsCorrelationPolicy()).
-			BuildArmClientOptions()
+	container.MustRegisterSingleton(func(transport policy.Transporter, cloud *cloud.Cloud) *arm.ClientOptions {
+		return &arm.ClientOptions{
+			ClientOptions: azcore.ClientOptions{
+				Cloud: cloud.Configuration,
+				Logging: policy.LogOptions{
+					AllowedHeaders: []string{azsdk.MsCorrelationIdHeader},
+				},
+				PerCallPolicies: []policy.Policy{
+					azsdk.NewMsCorrelationPolicy(),
+					azsdk.NewUserAgentPolicy(internal.UserAgent()),
+				},
+				Transport: transport,
+			},
+		}
 	})
 
 	container.MustRegisterSingleton(templates.NewTemplateManager)
@@ -559,9 +556,9 @@ func registerCommonDependencies(container *ioc.NestedContainer) {
 			}
 		}
 		return auth.ExternalAuthConfiguration{
-			Endpoint: endpoint,
-			Client:   client,
-			Key:      key,
+			Endpoint:    endpoint,
+			Transporter: client,
+			Key:         key,
 		}, nil
 	})
 	container.MustRegisterScoped(auth.NewManager)
@@ -585,22 +582,7 @@ func registerCommonDependencies(container *ioc.NestedContainer) {
 	})
 
 	// Tools
-	container.MustRegisterSingleton(func(
-		rootOptions *internal.GlobalCommandOptions,
-		credentialProvider account.SubscriptionCredentialProvider,
-		httpClient httputil.HttpClient,
-		armClientOptions *arm.ClientOptions,
-	) azcli.AzCli {
-		return azcli.NewAzCli(
-			credentialProvider,
-			httpClient,
-			azcli.NewAzCliArgs{
-				EnableDebug:     rootOptions.EnableDebugLogging,
-				EnableTelemetry: rootOptions.EnableTelemetry,
-			},
-			armClientOptions,
-		)
-	})
+	container.MustRegisterSingleton(azcli.NewAzCli)
 	container.MustRegisterSingleton(azapi.NewDeployments)
 	container.MustRegisterSingleton(azapi.NewDeploymentOperations)
 	container.MustRegisterSingleton(docker.NewCli)

diff --git a/cli/azd/cmd/monitor.go b/cli/azd/cmd/monitor.go
@@ -81,7 +81,7 @@ func newMonitorAction(
 	deploymentOperations azapi.DeploymentOperations,
 	console input.Console,
 	flags *monitorFlags,
-	portalUrlBase cloud.PortalUrlBase,
+	cloud *cloud.Cloud,
 	alphaFeatureManager *alpha.FeatureManager,
 ) actions.Action {
 	return &monitorAction{
@@ -92,7 +92,7 @@ func newMonitorAction(
 		console:              console,
 		flags:                flags,
 		subResolver:          subResolver,
-		portalUrlBase:        string(portalUrlBase),
+		portalUrlBase:        cloud.PortalUrlBase,
 		alphaFeaturesManager: alphaFeatureManager,
 	}
 }

diff --git a/cli/azd/cmd/show.go b/cli/azd/cmd/show.go
@@ -82,7 +82,7 @@ func newShowAction(
 	flags *showFlags,
 	lazyServiceManager *lazy.Lazy[project.ServiceManager],
 	lazyResourceManager *lazy.Lazy[project.ResourceManager],
-	portalUrlBase cloud.PortalUrlBase,
+	cloud *cloud.Cloud,
 ) actions.Action {
 	return &showAction{
 		projectConfig:        projectConfig,
@@ -97,7 +97,7 @@ func newShowAction(
 		flags:                flags,
 		lazyServiceManager:   lazyServiceManager,
 		lazyResourceManager:  lazyResourceManager,
-		portalUrlBase:        string(portalUrlBase),
+		portalUrlBase:        cloud.PortalUrlBase,
 	}
 }
 

diff --git a/cli/azd/cmd/util.go b/cli/azd/cmd/util.go
@@ -172,4 +172,4 @@ func openWithDefaultBrowser(ctx context.Context, console input.Console, url stri
 	console.Message(ctx, fmt.Sprintf("Azd was unable to open the next url. Please try it manually: %s", url))
 }
 
-const cReferenceDocumentationUrl = "https://learn.microsoft.com/azure/developer/azure-developer-cli/reference#"
+const referenceDocumentationUrl = "https://learn.microsoft.com/azure/developer/azure-developer-cli/reference#"
diff --git a/cli/azd/internal/cmd/deploy.go b/cli/azd/internal/cmd/deploy.go
@@ -133,7 +133,7 @@ func NewDeployAction(
 	azdCtx *azdcontext.AzdContext,
 	environment *environment.Environment,
 	accountManager account.Manager,
-	portalUrlBase cloud.PortalUrlBase,
+	cloud *cloud.Cloud,
 	azCli azcli.AzCli,
 	commandRunner exec.CommandRunner,
 	console input.Console,
@@ -152,7 +152,7 @@ func NewDeployAction(
 		serviceManager:      serviceManager,
 		resourceManager:     resourceManager,
 		accountManager:      accountManager,
-		portalUrlBase:       string(portalUrlBase),
+		portalUrlBase:       cloud.PortalUrlBase,
 		azCli:               azCli,
 		formatter:           formatter,
 		writer:              writer,