Merge branch 'dev' of https://github.com/mattboentoro/azure-cli into mattboentoro/add-user-confirmation

Author: Matthew Boentoro

.githooks/pre-commit

@@ -1,13 +1,24 @@
 #!/usr/bin/env sh
-":" //; if command -v pwsh >/dev/null 2>&1; then pwsh -ExecutionPolicy Bypass -File .githooks/pre-commit.ps1; else sh .githooks/pre-commit.sh; fi; exit $?     # Try PowerShell Core first, then sh on Unix
-":" //; exit                         # Skip rest on Unix
 
-@echo off
-powershell -NoProfile -Command "if (Get-Command powershell -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }"
-if %errorlevel% equ 0 (
-    powershell -ExecutionPolicy Bypass -File .githooks\pre-commit.ps1
-) else (
-    echo Error: PowerShell is not available. Please install PowerShell.
-    exit /b 1
-)
-exit /b %errorlevel%
+# Check if running in Windows
+if [ -n "$COMSPEC" ]; then
+    # Windows section - Execute directly with PowerShell
+    powershell -NoProfile -Command "
+        if (Get-Command powershell -ErrorAction SilentlyContinue) {
+            Write-Host 'PowerShell found, executing pre-commit.ps1...'
+            powershell -ExecutionPolicy Bypass -File '.githooks\pre-commit.ps1'
+            exit $LASTEXITCODE
+        } else {
+            Write-Host 'Error: PowerShell is not available. Please install PowerShell.'
+            exit 1
+        }
+    "
+    echo "Exiting with status $?"
+    exit $?
+else
+    # Unix-like system section
+    echo "Unix-like system found, executing pre-commit.sh..."
+    sh .githooks/pre-commit.sh
+    echo "Exiting with status $?"
+    exit $?
+fi

.githooks/pre-push

@@ -1,13 +1,24 @@
 #!/usr/bin/env sh
-":" //; if command -v pwsh >/dev/null 2>&1; then pwsh -ExecutionPolicy Bypass -File .githooks/pre-push.ps1; else sh .githooks/pre-push.sh; fi; exit $?     # Try PowerShell Core first, then sh on Unix
-":" //; exit                         # Skip rest on Unix
 
-@echo off
-powershell -NoProfile -Command "if (Get-Command powershell -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }"
-if %errorlevel% equ 0 (
-    powershell -ExecutionPolicy Bypass -File .githooks\pre-push.ps1
-) else (
-    echo Error: PowerShell is not available. Please install PowerShell.
-    exit /b 1
-)
-exit /b %errorlevel%
+# Check if running in Windows
+if [ -n "$COMSPEC" ]; then
+    # Windows section - Execute directly with PowerShell
+    powershell -NoProfile -Command "
+        if (Get-Command powershell -ErrorAction SilentlyContinue) {
+            Write-Host 'PowerShell found, executing pre-push.ps1...'
+            powershell -ExecutionPolicy Bypass -File '.githooks\pre-push.ps1'
+            exit $LASTEXITCODE
+        } else {
+            Write-Host 'Error: PowerShell is not available. Please install PowerShell.'
+            exit 1
+        }
+    "
+    echo "Exiting with status $?"
+    exit $?
+else
+    # Unix-like system section
+    echo "Unix-like system found, executing pre-push.sh..."
+    sh .githooks/pre-push.sh
+    echo "Exiting with status $?"
+    exit $?
+fi

.githooks/pre-push.ps1

@@ -45,8 +45,10 @@ if ($mergeBase -ne $upstreamHead) {
     Write-Host "Would you like to automatically rebase and setup? [Y/n]" -ForegroundColor Yellow
 
     try {
-        $reader = [System.IO.StreamReader]::new("CON")
-        $input = $reader.ReadLine()
+        $input = Read-Host
+        if ([string]::IsNullOrEmpty($input)) {
+            $input = "Y"
+        }
     } catch {
         Write-Host "Error reading input. Aborting push..." -ForegroundColor Red
         exit 1

.github/CODEOWNERS

@@ -7,14 +7,14 @@
 /linter_exclusions.yml @jsntcy @kairu-ms @zhoxing-ms
 
 /doc/ @jiasli @kairu-ms @jsntcy
-/tools/ @kairu-ms @jiasli @wangzelin007 @calvinhzy
+/tools/ @kairu-ms @jiasli @wangzelin007 @calvinhzy @bebound
 /scripts/ @kairu-ms @jiasli @wangzelin007 @calvinhzy @bebound
 /scripts/live_test @kairu-ms @wangzelin007
-/src/azure-cli-testsdk/ @jsntcy @jiasli @kairu-ms @wangzelin007
+/src/azure-cli-testsdk/ @jsntcy @jiasli @kairu-ms @wangzelin007 @bebound
 
 /src/azure-cli-core/ @jiasli @evelyn-ys @jsntcy @kairu-ms @zhoxing-ms @calvinhzy @necusjz @bebound
-/src/azure-cli-core/azure/cli/core/_profile.py @jiasli @evelyn-ys @calvinhzy @bebound
-/src/azure-cli-core/azure/cli/core/auth/ @jiasli @evelyn-ys @calvinhzy @bebound
+/src/azure-cli-core/azure/cli/core/_profile.py @jiasli @evelyn-ys @bebound
+/src/azure-cli-core/azure/cli/core/auth/ @jiasli @evelyn-ys @bebound
 /src/azure-cli-core/azure/cli/core/extension/ @jsntcy @kairu-ms
 /src/azure-cli-core/azure/cli/core/style.py @jiasli @evelyn-ys @zhoxing-ms
 /src/azure-cli-core/azure/cli/core/aaz/ @kairu-ms @necusjz @calvinhzy @jsntcy
@@ -52,10 +52,10 @@
 /src/azure-cli/azure/cli/command_modules/network/ @jsntcy @kairu-ms @wangzelin007 @necusjz
 /src/azure-cli/azure/cli/command_modules/policyinsights/ @cheggert
 /src/azure-cli/azure/cli/command_modules/privatedns/ @jsntcy @kairu-ms @necusjz
-/src/azure-cli/azure/cli/command_modules/profile/ @jiasli @evelyn-ys @calvinhzy @bebound
+/src/azure-cli/azure/cli/command_modules/profile/ @jiasli @evelyn-ys @bebound
 /src/azure-cli/azure/cli/command_modules/rdbms/ @arde0708 @evelyn-ys @calvinhzy @alanenriqueo
 /src/azure-cli/azure/cli/command_modules/resource/ @zhoxing-ms @jsntcy @yanzhudd
-/src/azure-cli/azure/cli/command_modules/role/ @jiasli @evelyn-ys @calvinhzy @bebound
+/src/azure-cli/azure/cli/command_modules/role/ @jiasli @evelyn-ys @bebound
 /src/azure-cli/azure/cli/command_modules/search/ @huangbolun @kairu-ms
 /src/azure-cli/azure/cli/command_modules/servicebus/ @v-ajnava @zhoxing-ms @jsntcy @evelyn-ys
 /src/azure-cli/azure/cli/command_modules/serviceconnector/ @yungezz @houk-ms @xfz11 @yanzhudd @kairu-ms
@@ -65,4 +65,4 @@
 /src/azure-cli/azure/cli/command_modules/synapse/ @jsntcy @idear1203 @zesluo @evelyn-ys
 /src/azure-cli/azure/cli/command_modules/util/ @jiasli @zhoxing-ms @evelyn-ys
 /src/azure-cli/azure/cli/command_modules/vm/ @zhoxing-ms @jsntcy @wangzelin007 @yanzhudd @Drewm3 @TravisCragg-MSFT @nikhilpatel909 @sandeepraichura @hilaryw29 @GabstaMSFT @ramankumarlive @ushnaarshadkhan
-/src/azure-cli/azure/cli/command_modules/containerapp/ @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14 @Greedygre
+/src/azure-cli/azure/cli/command_modules/containerapp/ @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14 @Greedygre @zhoxing-ms @yanzhudd @ShichaoQiu

.github/policies/resourceManagement.yml

@@ -692,6 +692,18 @@ configuration:
             - bberera
             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: CodeSigning
+        then:
+        - mentionUsers:
+            mentionees:
+            - Jaxelr
+            - DawnWang17
+            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
@@ -1419,8 +1431,8 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - raedJarrar
-            - jifems
+            - dlacy7
+            - NateB2
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1576,7 +1588,9 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - jfggdl
+            - Kishp01
+            - veyaddan
+            - santoshallumicrosoft
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1624,6 +1638,7 @@ configuration:
             mentionees:
             - dkershaw10
             - baywet
+            - SteveMutungi254
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2125,7 +2140,6 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - SameergMS
             - yairgil
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
@@ -3094,6 +3108,7 @@ configuration:
             mentionees:
             - AzureAppServiceCLI
             - antcp
+            - yutanglin16
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -3108,6 +3123,19 @@ configuration:
             - vicancy
             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: Workloads
+        then:
+        - mentionUsers:
+            mentionees:
+            - jaskisin
+            - ajaygit158
+            - praveennet
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       description: Triage issues to the service team
     - if:
       - payloadType: Pull_Request
@@ -6370,5 +6398,25 @@ configuration:
           users:
           - ReaNAiveD
       description: '[SecurityInsights] Auto assign labels and reviewers based on PR title/description.'
+    - if:
+      - payloadType: Issues
+      - or:
+        - titleContains:
+            pattern: '[Aa]z [Qq]uantum'
+            isRegex: True
+        - bodyContains:
+            pattern: '[Aa]z [Qq]uantum'
+            isRegex: True
+      - or:
+        - isAction:
+            action: Opened
+      then:
+      - addLabel:
+          label: Auto-Assign
+      - addLabel:
+          label: Quantum
+      - addLabel:
+          label: Service Attention
+      description: '[Quantum] auto assign labels and users based on issue description.'
 onFailure:
 onSuccess:

.github/workflows/AddIssueComment.yml

@@ -4,7 +4,7 @@ on:
 
 jobs:
   thank-user:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       issues: write
     name: Say thanks for the Issue

.github/workflows/AddIssueCommentWithLabel.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   comment-non-security:
     if: contains(github.event.issue.labels.*.name, 'non-security')
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       issues: write
     name: Comment on issue

azure-pipelines.yml

@@ -7,7 +7,7 @@ trigger:
     include:
     - '*'
     exclude:
-    - 'release'
+    - 'release*'
 
 pr:
   branches:
@@ -210,7 +210,7 @@ jobs:
       artifactName: metadata
 
   - task: PipAuthenticate@1
-    condition: eq(variables['Build.SourceBranch'], 'refs/heads/release')
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     displayName: 'Pip Authenticate'
     inputs:
       artifactFeeds: $(AZURE_ARTIFACTS_FEEDS)
@@ -254,7 +254,7 @@ jobs:
         artifactName: metadata
 
     - task: PipAuthenticate@1
-      condition: eq(variables['Build.SourceBranch'], 'refs/heads/release')
+      condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
       displayName: 'Pip Authenticate'
       inputs:
         artifactFeeds: $(AZURE_ARTIFACTS_FEEDS)
@@ -444,7 +444,7 @@ jobs:
       versionSpec: 3.12
 
   - task: PipAuthenticate@1
-    condition: eq(variables['Build.SourceBranch'], 'refs/heads/release')
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     displayName: 'Pip Authenticate'
     inputs:
       artifactFeeds: $(AZURE_ARTIFACTS_FEEDS)
@@ -732,7 +732,7 @@ jobs:
     displayName: Install Docker
 
   - task: PipAuthenticate@1
-    condition: eq(variables['Build.SourceBranch'], 'refs/heads/release')
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     displayName: 'Pip Authenticate'
     inputs:
       artifactFeeds: $(AZURE_ARTIFACTS_FEEDS)
@@ -828,7 +828,7 @@ jobs:
   - bash: ./scripts/ci/install_docker.sh
     displayName: Install Docker
   - task: PipAuthenticate@1
-    condition: eq(variables['Build.SourceBranch'], 'refs/heads/release')
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     displayName: 'Pip Authenticate'
     inputs:
       artifactFeeds: $(AZURE_ARTIFACTS_FEEDS)
@@ -950,7 +950,7 @@ jobs:
   - bash: ./scripts/ci/install_docker.sh
     displayName: Install Docker
   - task: PipAuthenticate@1
-    condition: eq(variables['Build.SourceBranch'], 'refs/heads/release')
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     displayName: 'Pip Authenticate'
     inputs:
       artifactFeeds: $(AZURE_ARTIFACTS_FEEDS)
@@ -1056,7 +1056,7 @@ jobs:
 
 - job: CheckHeaders
   displayName: "Check License, History, and DocMap"
-
+  condition: and(not(contains(variables['Build.SourceBranch'], 'lts')), not(contains(variables['System.PullRequest.TargetBranch'], 'lts')))
   pool:
     name: ${{ variables.ubuntu_pool }}
   steps:

build_scripts/windows/scripts/build.cmd

@@ -205,9 +205,9 @@ for /f %%f in ('dir /b /s *.pyc') do (
 )
 popd
 
-REM Remove __pycache__
+REM Remove empty __pycache__ directories because .pyc files are already moved to parent directories
 echo remove pycache
-for /d /r %BUILDING_DIR%\Lib\site-packages\pip %%d in (__pycache__) do (
+for /d /r %BUILDING_DIR%\Lib\site-packages\ %%d in (__pycache__) do (
     if exist %%d rmdir /s /q "%%d"
 )
 

scripts/release/debian/test_deb_package.py

@@ -12,7 +12,7 @@
 mod_list = [mod for mod in sorted(os.listdir(root_dir)) if os.path.isdir(os.path.join(root_dir, mod)) and mod != '__pycache__']
 
 pytest_base_cmd = '/opt/az/bin/python3 -m pytest -v --forked -p no:warnings --log-level=WARN'
-pytest_parallel_cmd = '{} -n auto'.format(pytest_base_cmd)
+pytest_parallel_cmd = '{} -n logical'.format(pytest_base_cmd)
 
 # cloud: https://github.com/Azure/azure-cli/pull/14994
 # appservice: https://github.com/Azure/azure-cli/pull/19810