Merge branch 'dev' into jins-vmss-auto-repair

Author: Jing-song

.github/CODEOWNERS

@@ -37,7 +37,7 @@
 /src/azure-cli/azure/cli/command_modules/cosmosdb/ @evelyn-ys @calvinhzy @dmakwana @kristynhamasaki
 /src/azure-cli/azure/cli/command_modules/databoxedge/ @evelyn-ys
 /src/azure-cli/azure/cli/command_modules/dls/ @jsntcy @evelyn-ys @akharit @rahuldutta90
-/src/azure-cli/azure/cli/command_modules/dms/ @jsntcy @temandr @binuj
+/src/azure-cli/azure/cli/command_modules/dms/ @jsntcy @necusjz @temandr @binuj
 /src/azure-cli/azure/cli/command_modules/eventgrid/ @evelyn-ys @VidyaKukke
 /src/azure-cli/azure/cli/command_modules/eventhubs/ @jsntcy @v-ajnava
 /src/azure-cli/azure/cli/command_modules/extension/ @jsntcy @kairu-ms
@@ -56,7 +56,7 @@
 /src/azure-cli/azure/cli/command_modules/rdbms/ @evelyn-ys @calvinhzy @arde0708 @alanenriqueo
 /src/azure-cli/azure/cli/command_modules/resource/ @zhoxing-ms @jsntcy @yanzhudd
 /src/azure-cli/azure/cli/command_modules/role/ @jiasli @evelyn-ys @bebound
-/src/azure-cli/azure/cli/command_modules/search/ @kairu-ms @huangbolun
+/src/azure-cli/azure/cli/command_modules/search/ @kairu-ms @necusjz @huangbolun
 /src/azure-cli/azure/cli/command_modules/servicebus/ @zhoxing-ms @jsntcy @evelyn-ys @v-ajnava
 /src/azure-cli/azure/cli/command_modules/serviceconnector/ @kairu-ms @yanzhudd @yungezz @houk-ms @xfz11
 /src/azure-cli/azure/cli/command_modules/servicefabric/ @zhoxing-ms @jsntcy @yanzhudd @QingChenmsft

.github/policies/resourceManagement.yml

@@ -231,7 +231,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - dyu1208
+            - mbifeld
             - FumingZhang
             - andyliuliming
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
@@ -1484,8 +1484,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - alec-baird
-            - costinhagiu
+            - MichaelWu
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1761,6 +1760,7 @@ configuration:
             - schaabs
             - chen-karen
             - chandanrr
+            - cheathamb36
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2272,6 +2272,17 @@ configuration:
             - rajsell
             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: Neon Postgre
+        then:
+        - mentionUsers:
+            mentionees:
+            - alluri02
+            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
@@ -2372,8 +2383,7 @@ configuration:
         - mentionUsers:
             mentionees:
             - gopimsft
-            - gimotwanMSFT
-            - avripintoms
+            - Azure/azure-firewall
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2839,10 +2849,10 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - mwesigwaguma
-            - a-Santamaria
+            - iliu816
+            - a-santamaria
             - LukeSlev
-            - jkochhar
+            - Jkochhar
             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,6 +226,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
+    continueOnError: true
     inputs:
       BuildDropPath: 'build_scripts/windows/out/'
 
@@ -270,6 +271,7 @@ jobs:
 
     - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
       displayName: 'SBOM'
+      continueOnError: true
       inputs:
         BuildDropPath: 'build_scripts/windows/out/'
 
@@ -370,6 +372,7 @@ jobs:
 
     - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
       displayName: 'SBOM'
+      continueOnError: true
       inputs:
         BuildDropPath: $(Build.ArtifactStagingDirectory)
         DockerImagesToScan: 'clibuild$BUILD_BUILDNUMBER:latest'
@@ -451,6 +454,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
+    continueOnError: true
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
 
@@ -621,6 +625,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
+    continueOnError: true
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
 
@@ -732,6 +737,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
+    continueOnError: true
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
 
@@ -822,6 +828,7 @@ jobs:
       filePath: scripts/release/rpm/pipeline.sh
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
+    continueOnError: true
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
   - task: PublishPipelineArtifact@0
@@ -941,6 +948,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
+    continueOnError: true
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
 
@@ -1014,7 +1022,7 @@ jobs:
   displayName: "Check CLI Style"
   timeoutInMinutes: 120
   pool:
-    name: ${{ variables.ubuntu_pool }}
+    name: ${{ variables.ubuntu_multi_core_pool }}
   steps:
   - task: UsePythonVersion@0
     displayName: 'Use Python 3.12'
@@ -1076,7 +1084,7 @@ jobs:
   displayName: "Check CLI Linter"
 
   pool:
-    name: ${{ variables.ubuntu_pool }}
+    name: ${{ variables.ubuntu_multi_core_pool }}
   steps:
   - task: UsePythonVersion@0
     displayName: 'Use Python 3.12'
@@ -1126,8 +1134,9 @@ jobs:
           exit 1
         fi
 
-
 - job: CodegenCoverage
+  condition: in(variables['Build.Reason'], 'BatchedCI', 'IndividualCI')
+  timeoutInMinutes: 180
   displayName: "Codegen Coverage"
   continueOnError: true
   pool:
@@ -1147,14 +1156,29 @@ jobs:
       azdev extension repo add ./azure-cli-extensions
       pip install setuptools==70.0.0 wheel==0.30.0
       azdev extension add "*"
+      pip install msrestazure markupsafe==2.0.1
       # Some extension will change the dependence, so run `azdev setup` again after all extensions installed.
-      azdev setup -c $CLI_REPO_PATH -r ./azure-cli-extensions
-      # CLI repo only
-      azdev statistics list-command-table CLI --statistics-only
-      # CLI + EXT repos
-      pip install jinja2 -U
-      azdev statistics list-command-table --statistics-only > /tmp/codegen_report.json
-      python s/scripts/ci/codegen_report.py
+      azdev setup -c ./s -r ./azure-cli-extensions
+
+      mkdir -p /tmp/module_stats
+
+      find /mnt/vss/_work/1/s/src/azure-cli/azure/cli/command_modules/ -mindepth 1 -maxdepth 1 -type d -printf "%f\n" | grep -v '^__pycache__$' > /mnt/vss/_work/1/s/scripts/ci/core_modules.txt
+      echo "=== Core Modules ==="
+      cat /mnt/vss/_work/1/s/scripts/ci/core_modules.txt
+
+      find /mnt/vss/_work/1/azure-cli-extensions/src/ -mindepth 1 -maxdepth 1 -type d -printf "%f\n" | grep -v '^__pycache__$' > /mnt/vss/_work/1/s/scripts/ci/extension_modules.txt
+      echo "=== Extension Modules ==="
+      cat /mnt/vss/_work/1/s/scripts/ci/extension_modules.txt
+
+      for module in $(cat /mnt/vss/_work/1/s/scripts/ci/core_modules.txt); do
+        azdev statistics list-command-table $module --statistics-only > /tmp/module_stats/${module}.json || true
+      done
+
+      for module in $(cat /mnt/vss/_work/1/s/scripts/ci/extension_modules.txt); do
+        azdev statistics list-command-table $module --statistics-only > /tmp/module_stats/${module}.json || true
+      done
+      azdev statistics list-command-table --statistics-only > /tmp/codegen_report.json || true
+      python /mnt/vss/_work/1/s/scripts/ci/codegen_report.py
     env:
       BUILD_ID: $(Build.BuildId)
       BUILD_BRANCH: $(Build.SourceBranchName)

doc/how_to_introduce_breaking_changes.md

@@ -319,13 +319,13 @@ This way, the pre-announcement wouldn't be displayed unless running into the bra
 Before you publish the breaking changes, you need to make sure that the announcement is ready for the Upcoming Breaking Change Documentation. To do that, run this command:
 
 ```commandline
-azdev genereate-breaking-change-report
+azdev generate-breaking-change-report
 ```
 
 If your breaking change is not for the next breaking change window, you can see all the announcements by using `--target-version None` like this:
 
 ```commandline
-azdev genereate-breaking-change-report --target-version None
+azdev generate-breaking-change-report --target-version None
 ```
 
 The output should be a JSON object including the pre-announcement you made.
@@ -347,5 +347,5 @@ The Upcoming Breaking Change Documentation includes:
 The documentation is generated through `azdev` tool. You can preview the documentation locally through the following command.
 
 ```commandline
-azdev genereate-breaking-change-report CLI --output-format markdown
+azdev generate-breaking-change-report CLI --output-format markdown
 ```

doc/sphinx/azhelpgen/__init__.py

@@ -2,5 +2,3 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
-import pkg_resources
-pkg_resources.declare_namespace(__name__)

doc/sphinx/cligroup/__init__.py

@@ -2,5 +2,3 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
-import pkg_resources
-pkg_resources.declare_namespace(__name__)

linter_exclusions.yml

@@ -1248,6 +1248,9 @@ cloud register:
     endpoint_active_directory_resource_id:
       rule_exclusions:
       - option_length_too_long
+    endpoint_microsoft_graph_resource_id:
+      rule_exclusions:
+      - option_length_too_long
     endpoint_resource_manager:
       rule_exclusions:
       - option_length_too_long
@@ -1257,6 +1260,9 @@ cloud register:
     endpoint_vm_image_alias_doc:
       rule_exclusions:
       - option_length_too_long
+    skip_endpoint_discovery:
+      rule_exclusions:
+      - option_length_too_long
     suffix_acr_login_server_endpoint:
       rule_exclusions:
       - option_length_too_long
@@ -1289,6 +1295,9 @@ cloud update:
     endpoint_active_directory_resource_id:
       rule_exclusions:
       - option_length_too_long
+    endpoint_microsoft_graph_resource_id:
+      rule_exclusions:
+        - option_length_too_long
     endpoint_resource_manager:
       rule_exclusions:
       - option_length_too_long
@@ -1298,6 +1307,9 @@ cloud update:
     endpoint_vm_image_alias_doc:
       rule_exclusions:
       - option_length_too_long
+    skip_endpoint_discovery:
+      rule_exclusions:
+        - option_length_too_long
     suffix_acr_login_server_endpoint:
       rule_exclusions:
       - option_length_too_long

scripts/ci/codegen_report.py

@@ -19,6 +19,88 @@
 BUILD_ID = os.environ.get('BUILD_ID', None)
 BUILD_BRANCH = os.environ.get('BUILD_BRANCH', None)
 
+def load_module_stats():
+    stats_dir = "/tmp/module_stats"
+    all_stats = {}
+
+    with open("/mnt/vss/_work/1/s/scripts/ci/core_modules.txt", "r") as f:
+        core_modules = [line.strip() for line in f.readlines()]
+
+    with open("/mnt/vss/_work/1/s/scripts/ci/extension_modules.txt", "r") as f:
+        extension_modules = [line.strip() for line in f.readlines()]
+
+    for module in core_modules + extension_modules:
+        stats_file = os.path.join(stats_dir, f"{module}.json")
+        if os.path.exists(stats_file):
+            with open(stats_file, "r") as f:
+                try:
+                    stats = json.load(f)
+                    codegenV1 = stats.get("codegenV1", 0)
+                    codegenV2 = stats.get("codegenV2", 0)
+                    total = stats.get("total", 0)
+                    manual = total - codegenV1 - codegenV2
+                    all_stats[module] = {
+                        "codegenV1": codegenV1,
+                        "codegenV2": codegenV2,
+                        "manual": manual,
+                        "total": total,
+                        "type": "core" if module in core_modules else "extension"
+                    }
+                except json.JSONDecodeError:
+                    logger.info(f"Warning: Could not parse {stats_file}")
+    return all_stats
+
+def analyze_stats(all_stats):
+    counters = {
+        "manual": {"core": 0, "extension": 0},
+        "mixed": {"core": 0, "extension": 0},
+        "codegen": {"core": 0, "extension": 0},
+        "codegenV1": {"core": 0, "extension": 0},
+        "total": {"core": 0, "extension": 0}
+    }
+    for _, stats in all_stats.items():
+        module_type = stats["type"]
+        counters["total"][module_type] += 1
+        if stats["manual"] > 0 and (stats["codegenV1"] > 0 or stats["codegenV2"] > 0):
+            counters["mixed"][module_type] += 1
+        if stats["codegenV1"] > 0 or stats["codegenV2"] > 0:
+            counters["codegen"][module_type] += 1
+        if stats["codegenV1"] > 0:
+            counters["codegenV1"][module_type] += 1
+    counters["manual"]["core"] = counters["total"]["core"] - counters["codegen"]["core"]
+    counters["manual"]["extension"] = counters["total"]["extension"] - counters["codegen"]["extension"]
+    return counters
+
+def print_results(counters):
+    logger.info("\n===== Codegen Coverage Report =====")
+    logger.info("\n1. Manual Modules:")
+    logger.info(f"   Core: {counters['manual']['core']}")
+    logger.info(f"   Extension: {counters['manual']['extension']}")
+    logger.info("\n2. Mixed Modules:")
+    logger.info(f"   Core: {counters['mixed']['core']}")
+    logger.info(f"   Extension: {counters['mixed']['extension']}")
+    logger.info("\n3. Codegen Modules:")
+    logger.info(f"   Core: {counters['codegen']['core']}")
+    logger.info(f"   Extension: {counters['codegen']['extension']}")
+    logger.info("\n4. CodegenV1 Modules:")
+    logger.info(f"   Core: {counters['codegenV1']['core']}")
+    logger.info(f"   Extension: {counters['codegenV1']['extension']}")
+    logger.info("\n5. Total Modules:")
+    logger.info(f"   Core: {counters['total']['core']}")
+    logger.info(f"   Extension: {counters['total']['extension']}")
+
+def analyze_and_report():
+    all_stats = load_module_stats()
+    counters = analyze_stats(all_stats)
+    print_results(counters)
+    output = {
+        "detailed_stats": all_stats,
+        "summary": counters
+    }
+    logger.info("\n=== Detailed JSON Output ===")
+    logger.info(json.dumps(output, indent=2))
+    with open("/tmp/module_stats_summary.json", "w") as f:
+        json.dump(output, f, indent=2)
 
 def generate_csv():
     data = []
@@ -31,9 +113,11 @@ def generate_csv():
     is_release = True if BUILD_BRANCH == 'release' else False
     date = (datetime.datetime.utcnow() + datetime.timedelta(hours=8)).strftime("%Y-%m-%d")
     data.append([BUILD_ID, manual, codegenv1, codegenv2, total, is_release, date])
-    logger.info(f'Finish generate data for codegen report: {data}')
+    logger.info('Finish generate data for codegen report:')
+    logger.info("BUILD_ID, manual, codegenv1, codegenv2, total, is_release, date")
+    logger.info(f'{data}')
     return data
 
-
 if __name__ == '__main__':
+    analyze_and_report()
     generate_csv()