Merge branch 'dev' of https://github.com/Azure/azure-cli into feature-policy

Author: mentat9

.devcontainer/.env

@@ -0,0 +1,4 @@
+AAZ_CLI_PATH=/workspaces/azure-cli
+AAZ_CLI_EXTENSION_PATH=/workspaces/azure-cli-extensions
+AAZ_SWAGGER_PATH=/workspaces/azure-rest-api-specs
+AAZ_PATH=/workspaces/aaz

.devcontainer/Dockerfile

@@ -0,0 +1,7 @@
+FROM mcr.microsoft.com/devcontainers/python:3.12
+
+# Copy binaries from the official
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+
+# Remove after production
+RUN pip install --no-cache-dir fastmcp

.devcontainer/devcontainer.json

@@ -0,0 +1,18 @@
+{
+  "name": "Azure CLI Dev Container",
+  "build": {
+    "dockerfile": "Dockerfile"
+  },
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli:1": {}
+  },
+  "workspaceFolder": "/workspaces",
+  "onCreateCommand": "uv venv .venv --seed",
+  "postCreateCommand": "REPO_NAME=$(basename $GITHUB_REPOSITORY) && cat $REPO_NAME/.devcontainer/init.sh >> ~/.bashrc && mkdir .vscode && cp $REPO_NAME/.devcontainer/mcp.json .vscode/",
+  "hostRequirements": {
+    "cpus": 16,
+    "memory": "64gb",
+    "storage": "128gb"
+  },
+  "runArgs": ["--env-file", ".devcontainer/.env"],
+}

.devcontainer/init.sh

@@ -0,0 +1,74 @@
+
+source .venv/bin/activate
+
+# Logout default account
+export GITHUB_TOKEN=
+
+if [[ $- == *i* ]]; then  # Interactive shell only
+    # Check `repo` scope exists or not
+    if gh auth status -a 2>/dev/null | grep "Token scopes: " | grep -q "repo"; then
+        echo "You now have access to GitHub."
+    else
+        gh auth login -p https -w
+    fi
+fi
+
+# Check `aaz-dev` is available or not
+if ! command -v aaz-dev &> /dev/null; then
+    GREEN="\033[0;32m"
+    YELLOW="\033[0;33m"
+    NC="\033[0m"  # no color
+
+    set_or_add_remote() {
+        local REPO=$1
+        local REMOTE=$2
+        local DIR="/workspaces/$REPO"
+        local OWNER=$([ "$REMOTE" = "origin" ] && echo "$GITHUB_USER" || echo "Azure")
+        local URL="https://github.com/$OWNER/$REPO.git"
+
+        git -C "$DIR" remote get-url "$REMOTE" &>/dev/null || git -C "$DIR" remote add "$REMOTE" "$URL"
+        git -C "$DIR" remote set-url "$REMOTE" "$URL"
+    }
+
+    setup_repo() {
+        local REPO=$1
+        local DIR="/workspaces/$REPO"
+
+        echo
+        gh repo fork "Azure/$REPO" --clone=false --default-branch-only
+
+        if [ -d "$DIR" ]; then
+            set_or_add_remote "$REPO" origin
+            set_or_add_remote "$REPO" upstream
+        else
+            git clone "https://github.com/$GITHUB_USER/$REPO.git" --single-branch --no-tags
+            set_or_add_remote "$REPO" upstream
+
+            # Synchronize with upstream
+            BRANCH=$(git -C "$DIR" remote show upstream | grep "HEAD branch" | awk '{print $NF}')
+            git -C "$DIR" pull -r upstream "$BRANCH"
+        fi
+    }
+
+    SECONDS=0
+
+    echo
+    uv pip install aaz-dev --link-mode=copy
+
+    # `azdev` repositories
+    setup_repo "azure-cli"
+    setup_repo "azure-cli-extensions"
+
+    azdev setup -c -r ./azure-cli-extensions
+
+    # `aaz-dev` repositories
+    setup_repo "aaz"
+    setup_repo "azure-rest-api-specs"
+
+    ELAPSED_TIME=$SECONDS
+
+    echo -e "\n${YELLOW}Elapsed time: $((ELAPSED_TIME / 60))m $((ELAPSED_TIME % 60))s.${NC}"
+    echo -e "\n${GREEN}Finished setup! Please launch the codegen tool via: aaz-dev run${NC}\n"
+else
+    echo -e "\nPlease launch the codegen tool via: aaz-dev run\n"
+fi

.devcontainer/mcp.json

@@ -0,0 +1,10 @@
+{
+  "servers": {
+    "AAZ Flow": {
+      "command": "python",
+      "args": [
+        "azure-cli/tools/aaz-flow/src/aaz-flow/main.py"
+      ],
+    }
+  }
+}

.github/CODEOWNERS

@@ -6,8 +6,9 @@
 
 /linter_exclusions.yml @jsntcy @kairu-ms @zhoxing-ms
 
-/doc/ @jiasli @kairu-ms @jsntcy
+/doc/ @jiasli @kairu-ms @jsntcy @necusjz @yanzhudd
 /tools/ @kairu-ms @jiasli @wangzelin007 @calvinhzy @bebound
+/tools/aaz-flow @a0x1ab @necusjz @yanzhudd
 /scripts/ @kairu-ms @jiasli @wangzelin007 @calvinhzy @bebound
 /scripts/live_test @kairu-ms @wangzelin007
 /src/azure-cli-testsdk/ @jsntcy @jiasli @kairu-ms @wangzelin007 @bebound
@@ -23,7 +24,7 @@
 /src/azure-cli/azure/cli/command_modules/acs/ @zhoxing-ms @zqingqing1 @gtracer @xizhamsft @andyliuliming @fumingzhang @jsntcy @yanzhudd
 /src/azure-cli/azure/cli/command_modules/advisor/ @jsntcy @Prasanna-Padmanabhan
 /src/azure-cli/azure/cli/command_modules/apim/ @jsntcy @kevinhillinger @jonlester
-/src/azure-cli/azure/cli/command_modules/appconfig/ @zhoxing-ms @jsntcy @yanzhudd @ChristineWanjau @albertofori @avanigupta
+/src/azure-cli/azure/cli/command_modules/appconfig/ @zhoxing-ms @jsntcy @yanzhudd @ChristineWanjau @albertofori @avanigupta @mrm9084
 /src/azure-cli/azure/cli/command_modules/appservice/ @jsntcy @zhoxing-ms @yanzhudd @panchagnula
 /src/azure-cli/azure/cli/command_modules/aro/ @jsntcy @bennerv @hawkowl @jewzaam @rogbas
 /src/azure-cli/azure/cli/command_modules/backup/ @zhoxing-ms @jsntcy @yanzhudd @dragonfly91 @akshayneema

.github/policies/resourceManagement.yml

@@ -632,8 +632,8 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - cabbpt
-            - theelderwand
+            - muazmian
+            - us6193
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1448,6 +1448,19 @@ configuration:
             - NateB2
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: Data Transfer
+        then:
+        - mentionUsers:
+            mentionees:
+            - fzkhan
+            - lasuredd-msft
+            - pkuma-msft
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - hasLabel:
             label: Service Attention
@@ -1941,7 +1954,10 @@ configuration:
         - mentionUsers:
             mentionees:
             - ambhatna
-            - savjani
+            - deepthiprasad
+            - akning-ms
+            - junsu-msft
+            - coffeemug
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2208,6 +2224,7 @@ configuration:
         - mentionUsers:
             mentionees:
             - AzMonEssential
+            - LarryZhang19
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2280,7 +2297,10 @@ configuration:
         - mentionUsers:
             mentionees:
             - ambhatna
-            - savjani
+            - deepthiprasad
+            - akning-ms
+            - junsu-msft
+            - coffeemug
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2293,6 +2313,10 @@ configuration:
             mentionees:
             - daeunyim
             - rajsell
+            - deepthiprasad
+            - akning-ms
+            - junsu-msft
+            - coffeemug
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:

azure-pipelines.yml

@@ -226,7 +226,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: 'build_scripts/windows/out/'
 
@@ -271,7 +271,7 @@ jobs:
 
     - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
       displayName: 'SBOM'
-      continueOnError: true
+      condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
       inputs:
         BuildDropPath: 'build_scripts/windows/out/'
 
@@ -372,7 +372,7 @@ jobs:
 
     - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
       displayName: 'SBOM'
-      continueOnError: true
+      condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
       inputs:
         BuildDropPath: $(Build.ArtifactStagingDirectory)
         DockerImagesToScan: 'clibuild$BUILD_BUILDNUMBER:latest'
@@ -454,7 +454,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
 
@@ -625,7 +625,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
 
@@ -668,7 +668,12 @@ jobs:
       brew uninstall azure-cli
       
       echo == Install azure-cli.rb formula ==
-      brew install --build-from-source $SYSTEM_ARTIFACTSDIRECTORY/homebrew/azure-cli.rb
+      # Need to create a dummy homebrew tap to install the formula
+      git config --global user.email "you@example.com"
+      git config --global user.name "Your Name"
+      brew tap-new dev/azure-cli
+      cp $SYSTEM_ARTIFACTSDIRECTORY/homebrew/azure-cli.rb $(brew --repository)/Library/Taps/dev/homebrew-azure-cli/Formula/
+      brew install --build-from-source dev/homebrew-azure-cli/azure-cli
       
       echo == Az Version ==
       az --version
@@ -737,7 +742,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
 
@@ -834,7 +839,7 @@ jobs:
       filePath: scripts/release/rpm/pipeline.sh
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
   - task: PublishPipelineArtifact@0
@@ -962,7 +967,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
 

build_scripts/windows/scripts/build.cmd

@@ -30,7 +30,7 @@ if "%ARCH%"=="x86" (
     echo Please set ARCH to "x86" or "x64"
     goto ERROR
 )
-set PYTHON_VERSION=3.13.7
+set PYTHON_VERSION=3.13.9
 
 set WIX_DOWNLOAD_URL="https://azurecliprod.blob.core.windows.net/msi/wix310-binaries-mirror.zip"
 set PYTHON_DOWNLOAD_URL="https://www.python.org/ftp/python/%PYTHON_VERSION%/python-%PYTHON_VERSION%-embed-%PYTHON_ARCH%.zip"