Merge remote-tracking branch 'upstream/dev' into dev

Author: a0x1ab

.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 mcp

.devcontainer/devcontainer.json

@@ -0,0 +1,17 @@
+{
+  "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"
+  }
+}

.devcontainer/init.sh

@@ -0,0 +1,74 @@
+
+source .venv/bin/activate
+
+# Logout default account
+export GITHUB_TOKEN=
+
+# 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
+
+# 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:${NC}"
+    echo -e "${GREEN}\$ aaz-dev run -c azure-cli -e azure-cli-extensions -s azure-rest-api-specs -a aaz${NC}\n"
+else
+    echo -e "\nPlease launch the codegen tool via:"
+    echo -e "$ aaz-dev run -c azure-cli -e azure-cli-extensions -s azure-rest-api-specs -a aaz\n"
+fi

.devcontainer/mcp.json

@@ -0,0 +1,38 @@
+{
+  "inputs": [
+    {
+      "type": "promptString",
+      "id": "extension_or_module_name",
+      "description": "The name of the Azure CLI extension or module to generate commands for."
+    },
+    {
+      "type": "promptString",
+      "id": "swagger_module_path",
+      "description": "The file path to the Swagger module."
+    },
+    {
+      "type": "promptString",
+      "id": "resource_provider",
+      "description": "The Azure resource provider for which to generate commands."
+    },
+    {
+      "type": "promptString",
+      "id": "swagger_tag",
+      "description": "The Swagger tag to use for command generation."
+    }
+  ],
+  "servers": {
+    "AAZ Flow": {
+      "command": "python",
+      "args": [
+        "azure-cli/tools/aaz-flow/main.py"
+      ],
+      "env": {
+        "AAZ_PATH": "/workspaces/aaz",
+        "CLI_PATH": "/workspaces/azure-cli",
+        "CLI_EXTENSION_PATH": "/workspaces/azure-cli-extensions",
+        "SWAGGER_PATH": "/workspaces/azure-rest-api-specs"
+      }
+    }
+  }
+}

.github/CODEOWNERS

@@ -8,6 +8,7 @@
 
 /doc/ @jiasli @kairu-ms @jsntcy
 /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

azure-pipelines.yml

@@ -226,8 +226,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    condition: eq(variables['Build.Reason'], 'BatchedCI')
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: 'build_scripts/windows/out/'
 
@@ -272,8 +271,7 @@ jobs:
 
     - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
       displayName: 'SBOM'
-      condition: eq(variables['Build.Reason'], 'BatchedCI')
-      continueOnError: true
+      condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
       inputs:
         BuildDropPath: 'build_scripts/windows/out/'
 
@@ -374,8 +372,7 @@ jobs:
 
     - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
       displayName: 'SBOM'
-      condition: eq(variables['Build.Reason'], 'BatchedCI')
-      continueOnError: true
+      condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
       inputs:
         BuildDropPath: $(Build.ArtifactStagingDirectory)
         DockerImagesToScan: 'clibuild$BUILD_BUILDNUMBER:latest'
@@ -457,8 +454,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    condition: eq(variables['Build.Reason'], 'BatchedCI')
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
 
@@ -629,8 +625,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    condition: eq(variables['Build.Reason'], 'BatchedCI')
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
 
@@ -742,8 +737,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    condition: eq(variables['Build.Reason'], 'BatchedCI')
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
 
@@ -840,8 +834,7 @@ jobs:
       filePath: scripts/release/rpm/pipeline.sh
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    condition: eq(variables['Build.Reason'], 'BatchedCI')
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
   - task: PublishPipelineArtifact@0
@@ -969,8 +962,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    condition: eq(variables['Build.Reason'], 'BatchedCI')
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
 

eastus2.json

@@ -787,7 +787,7 @@ def assign_identity(cli_ctx, getter, setter, identity_role=None, identity_scope=
                                           parameters=parameters)
                 break
             except HttpResponseError as ex:
-                if 'role assignment already exists' in ex.message:
+                if ex.error.code == 'RoleAssignmentExists':
                     logger.info('Role assignment already exists')
                     break
                 if retry_time < retry_times and ' does not exist in the directory ' in ex.message:

src/azure-cli-core/azure/cli/core/commands/arm.py

@@ -259,6 +259,11 @@
 ]
 
 # azure container storage
+container_storage_versions = [
+    "1",
+    "2"
+]
+
 storage_pool_types = [
     CONST_STORAGE_POOL_TYPE_AZURE_DISK,
     CONST_STORAGE_POOL_TYPE_EPHEMERAL_DISK,
@@ -516,6 +521,7 @@ def load_arguments(self, _):
         )
         c.argument(
             "container_storage_version",
+            arg_type=get_enum_type(container_storage_versions),
             help="set azure container storage version, the latest version will be installed by default",
         )
         c.argument(
@@ -724,6 +730,7 @@ def load_arguments(self, _):
         )
         c.argument(
             "container_storage_version",
+            arg_type=get_enum_type(container_storage_versions),
             help="set azure container storage version, the latest version will be installed by default",
         )
         c.argument(

src/azure-cli/azure/cli/command_modules/acs/_params.py

@@ -118,7 +118,7 @@ def add_role_assignment(cmd, role, service_principal_msi_id, is_service_principa
             )
             break
         except HttpResponseError as ex:
-            if isinstance(ex, ResourceExistsError) or "The role assignment already exists." in ex.message:
+            if isinstance(ex, ResourceExistsError) or ex.error.code == 'RoleAssignmentExists':
                 break
             logger.info(ex.message)
         except Exception as ex:  # pylint: disable=broad-except