POC: Adds Kustomize support with azd and AKS

.devcontainer/devcontainer.json

@@ -29,7 +29,8 @@
                 "golang.go",
                 "ms-azuretools.vscode-bicep",
                 "eamodio.gitlens",
-                "hashicorp.terraform"
+                "hashicorp.terraform",
+                "jinliming2.vscode-go-template"
             ]
         }
     }

.github/CODEOWNERS

@@ -7,12 +7,15 @@
 
 /ext/             @karolz-ms @ellismg
 
-/generators/repo/ @wbreza @ellismg @danieljurek @jongio
+/generators/repo/ @wbreza @ellismg @danieljurek
 
 /.github/         @danieljurek @ellismg
 
 /eng/             @danieljurek @ellismg
 
-/schemas/         @jongio @karolz-ms @ellismg @wbreza
+/schemas/         @karolz-ms @ellismg @wbreza
 
 /templates/       @jongio @wbreza
+
+# Exclude @jongio from version bump PRs opened by dependabot
+/templates/**/package-lock.json     @wbreza

.github/workflows/schema-ci.yml

@@ -0,0 +1,22 @@
+name: schema-ci
+
+on:
+  pull_request:
+    paths:
+      - "schemas/**"
+    branches: [main]
+
+permissions:
+  contents: read
+
+jobs:
+  schema-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "18"
+      - run: npm install -g jsonlint
+      - name: Validate schemas JSON
+        run: jsonlint schemas/**/*.json -c

.vscode/cspell.global.yaml

@@ -56,6 +56,7 @@ ignoreWords:
     - conjunction
     - containerregistry
     - containerservice
+    - dapr
     - databricks
     - dedb
     - devcenter

cli/Dockerfile

@@ -1,10 +1,10 @@
-FROM --platform=amd64 mcr.microsoft.com/dotnet/sdk:6.0
+FROM --platform=amd64 mcr.microsoft.com/dotnet/sdk:8.0
 
 WORKDIR /app
 
 RUN export DEBIAN_FRONTEND=noninteractive \
      && wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb && dpkg -i packages-microsoft-prod.deb \
-     && apt-get update && apt-get install -y --no-install-recommends apt-utils && apt-get install -y apt-transport-https ca-certificates curl unzip procps gnupg2 software-properties-common lsb-release \
+     && apt-get update && apt-get install -y --no-install-recommends apt-utils && apt-get install -y apt-transport-https ca-certificates curl gnupg unzip procps gnupg2 software-properties-common lsb-release \
      # functions core tools
      && curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg \
      && mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg \
@@ -17,17 +17,19 @@ RUN export DEBIAN_FRONTEND=noninteractive \
      # az cli
      && curl -sSL https://aka.ms/InstallAzureCLIDeb | bash \
      # nodejs
-     && curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
+     && mkdir -p /etc/apt/keyrings \
+     && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+     && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+     && apt-get update \
      && apt-get install -y nodejs \
      # python
-     && apt-get install -y --no-install-recommends python3-pip python-dev python3-venv \
-     && python3 -m pip install --upgrade pip \
+     && apt-get install -y --no-install-recommends python3-pip python3-venv \
      && echo 'alias python=python3' >> ~/.bashrc \
      && echo 'alias pip=pip3' >> ~/.bashrc \
      # java
      && apt-get update && apt-get install -y msopenjdk-17 \
      # terraform cli
-     && apt-get update && apt-get install -y gnupg software-properties-common \
+     && apt-get update && apt-get install -y software-properties-common \
      && wget -O- https://apt.releases.hashicorp.com/gpg | \
           gpg --dearmor | \
           tee /usr/share/keyrings/hashicorp-archive-keyring.gpg \

cli/azd/.vscode/cspell-azd-dictionary.txt

@@ -70,6 +70,7 @@ devcentersdk
 devel
 discarder
 docf
+dockerfiles
 dockerproject
 doublestar
 dskip
@@ -178,6 +179,7 @@ tracetest
 trafficmanager
 Truef
 typeflag
+unhide
 unmarshaled
 unmarshalling
 unsetenvs

cli/azd/.vscode/cspell.yaml

@@ -71,6 +71,9 @@ overrides:
       - keychain
       - crusername
       - azurecr
+  - filename: pkg/tools/dotnet/dotnet.go
+    words:
+      - PWORD
   - filename: pkg/tools/kubectl/kubectl.go
     words:
       - tmpl
@@ -85,6 +88,10 @@ overrides:
   - filename: pkg/azsdk/storage/storage_blob_client.go
     words:
       - azblob
+  - filename: pkg/project/service_target_aks.go
+    words:
+      - kustomization
+      - templating
 ignorePaths:
   - "**/*_test.go"
   - "**/mock*.go"

cli/azd/.vscode/extensions.json

@@ -4,6 +4,7 @@
     "recommendations": [
         "golang.go",
         "streetsidesoftware.code-spell-checker",
-        "redhat.vscode-yaml"
+        "redhat.vscode-yaml",
+        "jinliming2.vscode-go-template"
     ]
 }

cli/azd/.vscode/settings.json

@@ -7,5 +7,8 @@
     "go.lintFlags": ["--fast"],
     "go.lintOnSave": "package",
     "go.lintTool": "golangci-lint",
-    "go.testTimeout": "10m"
+    "go.testTimeout": "10m",
+    "files.associations": {
+        "*.bicept": "go-template"
+      }
 }

cli/azd/CHANGELOG.md

@@ -4,17 +4,39 @@
 
 ### Features Added
 
-- [[2998]](https://github.com/Azure/azure-dev/pull/2998) Adds support for Azure Storage Tables and Queues on Aspire projects.
-
 ### Breaking Changes
 
 ### Bugs Fixed
 
+### Other Changes
+
+## 1.5.1 (2023-12-20)
+
+### Features Added
+
+- [[2998]](https://github.com/Azure/azure-dev/pull/2998) Adds support for Azure Storage Tables and Queues on Aspire projects.
+- [[3052]](https://github.com/Azure/azure-dev/pull/3052) Adds `target` argument support for docker build.
+- [[2488]](https://github.com/Azure/azure-dev/pull/2488) Adds support to override behavior of the KUBECONFIG environment variable on AKS.
+- [[3075]](https://github.com/Azure/azure-dev/pull/3075) Adds support for `dockerfile.v0` on Aspire projects.
+- [[2992]](https://github.com/Azure/azure-dev/pull/2992) Adds support for `dapr` on Aspire projects.
+
+### Bugs Fixed
+
 - [[2969]](https://github.com/Azure/azure-dev/pull/2969) Relax container names truncation logic for Aspire `redis.v0` and `postgres.database.v0`.
   Truncation now happens above 30 characters instead of 12 characters.
+- [[3035]](https://github.com/Azure/azure-dev/pull/3035) .NET Aspire issues after `azd pipeline config`.
+- [[3038]](https://github.com/Azure/azure-dev/pull/3038) Fix init to not consider parent directories.
+- [[3045]](https://github.com/Azure/azure-dev/pull/3045) Handle interrupt to unhide cursor.
+- [[3069]](https://github.com/Azure/azure-dev/pull/3069) .NET Aspire, enable `admin user` for ACR.
+- [[3049]](https://github.com/Azure/azure-dev/pull/3049) Persist location from provisioning manager.
+- [[3056]](https://github.com/Azure/azure-dev/pull/3056) Fix `azd pipeline config` for resource group deployment.
+- [[3106]](https://github.com/Azure/azure-dev/pull/3106) Fix `azd restore` on .NET projects.
+- [[3041]](https://github.com/Azure/azure-dev/pull/3041) Ensure azd environment name is synchronized to .env file.
 
 ### Other Changes
 
+- [[3044]](https://github.com/Azure/azure-dev/pull/3044) Sets allowInsecure to true for internal services on Aspire projects.
+
 ## 1.5.0 (2023-11-15)
 
 ### Features Added
@@ -658,6 +680,7 @@ We plan to improve this behavior with [[#1126]](https://github.com/Azure/azure-d
 - [[#115]](https://github.com/Azure/azure-dev/issues/115) Fix deploy error when using a resource name with capital letters.
 
 ### Other Changes
+
 - [[#188]](https://github.com/Azure/azure-dev/issues/188) Update the minimum Bicep version to `v0.8.9`.
 
 ## 0.1.0-beta.2 (2022-07-13)

cli/azd/cmd/auth_login.go

@@ -473,7 +473,15 @@ func (la *loginAction) login(ctx context.Context) error {
 
 		if useDevCode {
 			_, err := la.authManager.LoginWithDeviceCode(ctx, la.flags.tenantID, la.flags.scopes, func(url string) error {
-				openWithDefaultBrowser(ctx, la.console, url)
+				if !la.flags.global.NoPrompt {
+					la.console.Message(ctx, "Then press enter and continue to log in from your browser...")
+					la.console.WaitForEnter()
+					openWithDefaultBrowser(ctx, la.console, url)
+					return nil
+				}
+				// For no-prompt, Just provide instructions without trying to open the browser
+				// If manual browsing is enabled, we don't want to open the browser automatically
+				la.console.Message(ctx, fmt.Sprintf("Then, go to: %s", url))
 				return nil
 			})
 			if err != nil {

cli/azd/cmd/auth_token.go

@@ -97,7 +97,7 @@ func getTenantIdFromAzdEnv(
 	if err != nil {
 		return tenantId, fmt.Errorf(
 			"resolving the Azure Directory from azd environment (%s): %w",
-			azdEnv.GetEnvName(),
+			azdEnv.Name(),
 			err)
 	}
 

cli/azd/cmd/container.go

@@ -25,11 +25,13 @@ import (
 	"github.com/azure/azure-dev/cli/azd/pkg/environment"
 	"github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext"
 	"github.com/azure/azure-dev/cli/azd/pkg/exec"
+	"github.com/azure/azure-dev/cli/azd/pkg/helm"
 	"github.com/azure/azure-dev/cli/azd/pkg/httputil"
 	"github.com/azure/azure-dev/cli/azd/pkg/infra"
 	"github.com/azure/azure-dev/cli/azd/pkg/infra/provisioning"
 	"github.com/azure/azure-dev/cli/azd/pkg/input"
 	"github.com/azure/azure-dev/cli/azd/pkg/ioc"
+	"github.com/azure/azure-dev/cli/azd/pkg/kustomize"
 	"github.com/azure/azure-dev/cli/azd/pkg/lazy"
 	"github.com/azure/azure-dev/cli/azd/pkg/output"
 	"github.com/azure/azure-dev/cli/azd/pkg/pipeline"
@@ -446,6 +448,8 @@ func registerCommonDependencies(container *ioc.NestedContainer) {
 	container.RegisterSingleton(github.NewGitHubCli)
 	container.RegisterSingleton(javac.NewCli)
 	container.RegisterSingleton(kubectl.NewKubectl)
+	container.RegisterSingleton(helm.NewCli)
+	container.RegisterSingleton(kustomize.NewCli)
 	container.RegisterSingleton(maven.NewMavenCli)
 	container.RegisterSingleton(npm.NewNpmCli)
 	container.RegisterSingleton(python.NewPythonCli)
@@ -480,7 +484,7 @@ func registerCommonDependencies(container *ioc.NestedContainer) {
 
 	// Languages
 	frameworkServiceMap := map[project.ServiceLanguageKind]any{
-		"":                                project.NewDotNetProject,
+		project.ServiceLanguageNone:       project.NewNoneProject,
 		project.ServiceLanguageDotNet:     project.NewDotNetProject,
 		project.ServiceLanguageCsharp:     project.NewDotNetProject,
 		project.ServiceLanguageFsharp:     project.NewDotNetProject,
@@ -497,6 +501,12 @@ func registerCommonDependencies(container *ioc.NestedContainer) {
 		}
 	}
 
+	err := container.RegisterNamedSingleton(
+		string(project.ServiceLanguageDocker), project.NewDockerProjectAsFrameworkService)
+	if err != nil {
+		panic(fmt.Errorf("registering docker framework service: %w", err))
+	}
+
 	// Pipelines
 	container.RegisterSingleton(pipeline.NewPipelineManager)
 	container.RegisterSingleton(func(flags *pipelineConfigFlags) *pipeline.PipelineManagerArgs {

cli/azd/cmd/env.go

@@ -327,7 +327,7 @@ func (en *envNewAction) Run(ctx context.Context) (*actions.ActionResult, error)
 		return nil, fmt.Errorf("creating new environment: %w", err)
 	}
 
-	if err := en.azdCtx.SetDefaultEnvironmentName(env.GetEnvName()); err != nil {
+	if err := en.azdCtx.SetDefaultEnvironmentName(env.Name()); err != nil {
 		return nil, fmt.Errorf("saving default environment: %w", err)
 	}
 
@@ -432,7 +432,7 @@ func newEnvRefreshAction(
 func (ef *envRefreshAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 	// Command title
 	ef.console.MessageUxItem(ctx, &ux.MessageTitle{
-		Title: fmt.Sprintf("Refreshing environment %s (azd env refresh)", ef.env.GetEnvName()),
+		Title: fmt.Sprintf("Refreshing environment %s (azd env refresh)", ef.env.Name()),
 	})
 
 	if err := ef.projectManager.Initialize(ctx, ef.projectConfig); err != nil {

cli/azd/cmd/hooks.go

@@ -112,7 +112,7 @@ func (hra *hooksRunAction) Run(ctx context.Context) (*actions.ActionResult, erro
 		TitleNote: fmt.Sprintf(
 			"Finding and executing %s hooks for environment %s",
 			output.WithHighLightFormat(hookName),
-			output.WithHighLightFormat(hra.env.GetEnvName()),
+			output.WithHighLightFormat(hra.env.Name()),
 		),
 	})
 

cli/azd/cmd/init.go

@@ -125,11 +125,8 @@ func (i *initAction) Run(ctx context.Context) (*actions.ActionResult, error) {
 		return nil, fmt.Errorf("getting cwd: %w", err)
 	}
 
-	azdCtx, err := i.lazyAzdCtx.GetValue()
-	if err != nil {
-		azdCtx = azdcontext.NewAzdContextWithDirectory(wd)
-		i.lazyAzdCtx.SetValue(azdCtx)
-	}
+	azdCtx := azdcontext.NewAzdContextWithDirectory(wd)
+	i.lazyAzdCtx.SetValue(azdCtx)
 
 	if i.flags.templateBranch != "" && i.flags.templatePath == "" {
 		return nil,
@@ -359,7 +356,7 @@ func (i *initAction) initializeEnv(
 		return nil, fmt.Errorf("loading environment: %w", err)
 	}
 
-	if err := azdCtx.SetDefaultEnvironmentName(env.GetEnvName()); err != nil {
+	if err := azdCtx.SetDefaultEnvironmentName(env.Name()); err != nil {
 		return nil, fmt.Errorf("saving default environment: %w", err)
 	}
 

cli/azd/cmd/monitor.go

@@ -101,7 +101,7 @@ func (m *monitorAction) Run(ctx context.Context) (*actions.ActionResult, error)
 
 	resourceManager := infra.NewAzureResourceManager(m.azCli, m.deploymentOperations)
 	resourceGroups, err := resourceManager.GetResourceGroupsForEnvironment(
-		ctx, m.env.GetSubscriptionId(), m.env.GetEnvName())
+		ctx, m.env.GetSubscriptionId(), m.env.Name())
 	if err != nil {
 		return nil, fmt.Errorf("discovering resource groups from deployment: %w", err)
 	}
@@ -142,8 +142,7 @@ func (m *monitorAction) Run(ctx context.Context) (*actions.ActionResult, error)
 	for _, insightsResource := range insightsResources {
 		if m.flags.monitorLive {
 			openWithDefaultBrowser(ctx, m.console,
-				fmt.Sprintf("https://app.azure.com/%s%s/quickPulse", tenantId, insightsResource.Id),
-			)
+				fmt.Sprintf("https://app.azure.com/%s%s/quickPulse", tenantId, insightsResource.Id))
 		}
 
 		if m.flags.monitorLogs {
@@ -155,8 +154,7 @@ func (m *monitorAction) Run(ctx context.Context) (*actions.ActionResult, error)
 	for _, portalResource := range portalResources {
 		if m.flags.monitorOverview {
 			openWithDefaultBrowser(ctx, m.console,
-				fmt.Sprintf("https://portal.azure.com/#@%s/dashboard/arm%s", tenantId, portalResource.Id),
-			)
+				fmt.Sprintf("https://portal.azure.com/#@%s/dashboard/arm%s", tenantId, portalResource.Id))
 		}
 	}