Skip to content

Commit

Permalink
Merge branch 'main' into avmupdates
Browse files Browse the repository at this point in the history
  • Loading branch information
Menghua1 committed Oct 9, 2024
2 parents 3399e7f + 84ea220 commit bab182b
Show file tree
Hide file tree
Showing 58 changed files with 1,650 additions and 449 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"ghcr.io/devcontainers/features/azure-cli:1": {},
"ghcr.io/devcontainers/features/dotnet:2": {},
"ghcr.io/devcontainers/features/java:1": {},
"ghcr.io/devcontainers/features/java:1.6.0": {},
"ghcr.io/devcontainers/features/node:1": {},
"ghcr.io/devcontainers/features/python:1": {},
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {},
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/cli-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
pull_request:
paths:
- "cli/**"
- '!cli/docs/**'
- ".github/workflows/cli-ci.yml"
- "go.mod"
branches: [main]
Expand Down Expand Up @@ -39,7 +38,7 @@ jobs:
with:
node-version: "20"
- run: npm install -g [email protected]
- name: Spell check for CLI source code
- name: Spell check for go and docs
run: cspell lint '**/*.{go,md}' --config ./cli/azd/.vscode/cspell.yaml --root ./cli/azd --no-progress

bicep-lint:
Expand Down
1 change: 1 addition & 0 deletions cli/azd/.vscode/cspell-azd-dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ blockblob
BOOLSLICE
BUILDID
BUILDNUMBER
buildargs
buildpacks
byoi
cflags
Expand Down
14 changes: 12 additions & 2 deletions cli/azd/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
# Release History

## 1.11.0-beta.1 (Unreleased)
## 1.10.2 (2024-10-08)

### Features Added

### Breaking Changes
- [[4272]](https://github.com/Azure/azure-dev/pull/4272) Supports configurable `api-version` for container app deployments.
- [[4286]](https://github.com/Azure/azure-dev/pull/4286) Adds `alpha` feature `alpha.aspire.useBicepForContainerApps` to use bicep for container app deployment.
- [[4371]](https://github.com/Azure/azure-dev/pull/4371) Adds support for `default.value` for `parameter.v0`.

### Bugs Fixed

- [[4375]](https://github.com/Azure/azure-dev/pull/4375) Enables remote build support for AKS.
- [[4363]](https://github.com/Azure/azure-dev/pull/4363) Fix environment variables to be evaluated too early for `main.parameters.json`.

### Other Changes

- [[4336]](https://github.com/Azure/azure-dev/pull/4336) Adds spinner to `azd down`.
- [[4357]](https://github.com/Azure/azure-dev/pull/4357) Updates `azure.yaml.json` for `remoteBuild`.
- [[4369]](https://github.com/Azure/azure-dev/pull/4369) Updates docker `buildargs` to expandable strings.
- [[4331]](https://github.com/Azure/azure-dev/pull/4331) Exposes configurable settings for `actionOnUnmanage` and `denySettings` for Azure Deployment Stacks (alpha).

## 1.10.1 (2024-09-05)

### Bugs Fixed
Expand Down
1 change: 0 additions & 1 deletion cli/azd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@ func NewRootCmd(
root.
UseMiddleware("debug", middleware.NewDebugMiddleware).
UseMiddleware("ux", middleware.NewUxMiddleware).
UseMiddleware("experimentation", middleware.NewExperimentationMiddleware).
UseMiddlewareWhen("telemetry", middleware.NewTelemetryMiddleware, func(descriptor *actions.ActionDescriptor) bool {
return !descriptor.Options.DisableTelemetry
})
Expand Down
4 changes: 4 additions & 0 deletions cli/azd/docs/alpha-features.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ The strategy to ask `azd` to `toggle` between modes is:
- Disable _all_ experimental features: `azd config unset alpha.all` or `azd config set alpha.all off`
- Disable _specific_ experimental feature: `azd config unset alpha.featureName` or `azd config set alpha.featureName off`

In CI, the on/off mode can be configured using environment variables with the following scheme:

- `AZD_ALPHA_ENABLE_<name>`: where `<name>` is the upper-cased name of the feature, with dot `.` characters replaced by underscore `_` characters.

## Alpha feature

All features start as alpha features (e.g., experimental). In this phase, the goal is to receive sufficient usage to get meaningful feedback around the feature’s design, functionality and user experience.
Expand Down
21 changes: 21 additions & 0 deletions cli/azd/docs/environment-variables.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Environment Variables

## Environment variables used with azd

Environment variables that can be used to configure `azd` behavior, usually set within a shell or terminal. For environment variables that accept a boolean, the values `1, t, T, TRUE, true, True` are accepted as "true"; the values: `0, f, F, FALSE, false, False` are all accepted as "false".

- `AZD_ALPHA_ENABLE_<name>`: Enables or disables an alpha feature. `<name>` is the upper-cased name of the feature, with dot `.` characters replaced by underscore `_` characters.
- `AZD_AUTH_ENDPOINT`: The [External Authentication](./external-authentication.md) endpoint.
- `AZD_AUTH_KEY`: The [External Authentication](./external-authentication.md) shared key.
- `AZD_BUILDER_IMAGE`: The builder docker image used to perform Dockerfile-less builds.
- `AZD_CONFIG_DIR`: The file path of the user-level configuration directory.
- `AZD_DEMO_MODE`: If true, enables demo mode. This hides personal output, such as subscription IDs, from being displayed in output.
- `AZD_FORCE_TTY`: If true, forces `azd` to write terminal-style output.
- `AZD_IN_CLOUDSHELL`: If true, `azd` runs with Azure Cloud Shell specific behavior.
- `AZD_SKIP_UPDATE_CHECK`: If true, skips the out-of-date update check output that is typically printed at the end of the command.

For tools that are auto-acquired by `azd`, you are able to configure the following environment variables to use a different version of the tool installed on the machine:

- `AZD_BICEP_TOOL_PATH`: The Bicep tool override path. The direct path to `bicep` or `bicep.exe`.
- `AZD_GH_TOOL_PATH`: The `gh` tool override path. The direct path to `gh` or `gh.exe`.
- `AZD_PACK_TOOL_PATH`: The `pack` tool override path. The direct path to `pack` or `pack.exe`.
4 changes: 4 additions & 0 deletions cli/azd/internal/scaffold/funcs.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ func BicepName(name string) string {
return sb.String()
}

func RemoveDotAndDash(name string) string {
return strings.ReplaceAll(strings.ReplaceAll(name, ".", ""), "-", "")
}

// UpperSnakeAlpha returns a name in upper-snake case alphanumeric name separated only by underscores.
//
// Non-alphanumeric characters are discarded, while consecutive separators ('-', '_', and '.') are treated
Expand Down
Loading

0 comments on commit bab182b

Please sign in to comment.