Merge branch 'Azure:dev' into ibrahimmo/addAssignmentRestrictions

Author: mohamedyilmaz123

.github/ISSUE_TEMPLATE/what_if.yml

@@ -0,0 +1,86 @@
+name: "What-If Feature Issue"
+description: Report issues or request enhancements for Azure CLI What-If feature
+labels: ["what-if"]
+body:
+  - type: markdown
+    id: intro
+    attributes:
+      value: |
+        Thank you for reporting an issue related to preview of changes (--what-if) or export to Bicep (--export-bicep) with az cli! Please provide as much detail as possible.
+
+  - type: dropdown
+    id: issue-type
+    attributes:
+      label: Issue Type
+      description: What type of issue are you reporting?
+      options:
+        - Bug Report
+        - Feature Request
+        - Documentation Issue
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Provide a clear description of the issue or feature request
+      placeholder: Describe what happened or what you'd like to see
+    validations:
+      required: true
+
+  - type: textarea
+    id: command
+    attributes:
+      label: Command or Script
+      description: Provide the command or script that helps reproducing or demonstrate the issue
+      placeholder: |
+        - az vm create --what-if --export-bicep
+        - N/A if not applicable
+      render: shell
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Behavior
+      description: What did you expect to happen?
+      placeholder: |
+        - Describe the expected outcome
+        - N/A if not applicable
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual Behavior
+      description: What actually happened?
+      placeholder: |
+        - Describe what actually occurred
+        - N/A if not applicable
+    validations:
+      required: true
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: Environment
+      description: Provide environment details
+      placeholder: |
+        - OS: Windows 11 / Ubuntu 22.04 / macOS 14
+        - Tool Version: Azure CLI 2.80.0
+        - Python Version: 3.12.10
+        - N/A if not applicable
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description: Add any other context, screenshots, or logs
+      placeholder: Any additional information that might be helpful
+    validations:
+      required: false

.github/policies/resourceManagement.yml

@@ -636,6 +636,17 @@ configuration:
             - us6193
             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: Blob Storage SFTP
+        then:
+        - mentionUsers:
+            mentionees:
+            - greeshma-microsoft
+            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
@@ -1433,7 +1444,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - rgreenMSFT
+            - amarjeetkr
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1546,6 +1557,21 @@ configuration:
             - nberdy
             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: Device Registry
+        then:
+        - mentionUsers:
+            mentionees:
+            - c-ryan-k
+            - digimaun
+            - rohankhandelwal
+            - mryanlo
+            - atastrophic
+            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
@@ -1567,7 +1593,6 @@ configuration:
         - mentionUsers:
             mentionees:
             - anishtrakru
-            - derekbekoe
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1578,7 +1603,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - sourabhguha
+            - YingXue
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1628,6 +1653,17 @@ configuration:
             - Saglodha
             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: Fabric
+        then:
+        - mentionUsers:
+            mentionees:
+            - xinzhizou
+            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
@@ -1647,9 +1683,9 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - AnatoliB
-            - Francisco-Gamino
-            - shreyabatra4
+            - kamperiadis
+            - amamounelsayed
+            - khkh-ms
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -1744,20 +1780,8 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - iluican
-            - jlian
-            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: IotDPS
-        then:
-        - mentionUsers:
-            mentionees:
-            - iluican
-            - jlian
+            - digimaun
+            - Azure/azure-iot-cli-triage
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2713,8 +2737,11 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - shariq-mcs
-            - MSFTeegarden
+            - abhijitch_microsoft
+            - yuvalm_microsoft
+            - nikitagarg_microsoft
+            - sanar_microsoft
+            - cawa_microsoft
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2827,10 +2854,10 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - bleroy
-            - tjacobhi
-            - markheff
-            - miwelsh
+            - kuanlu95
+            - efrainretana
+            - mattgotteiner
+            - Draconicida
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2853,6 +2880,7 @@ configuration:
         - mentionUsers:
             mentionees:
             - nazang
+            - mooshc
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -3063,6 +3091,20 @@ configuration:
             - S-J-M
             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: StorageDiscovery
+        then:
+        - mentionUsers:
+            mentionees:
+            - shanefujs
+            - apurv2304
+            - skallurk
+            - vdziunms
+            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

.github/workflows/RunIssueSentinel.yml

@@ -12,6 +12,5 @@ jobs:
       - name: Run Issue Sentinel
         uses: Azure/issue-sentinel@v1
         with:
-          password: ${{secrets.ISSUE_SENTINEL_PASSWORD}}
           enable-similar-issues-scanning: true
           enable-security-issues-scanning: true

.vscode/launch.json

@@ -3,7 +3,7 @@
     "configurations": [
         {
             "name": "Azure CLI Debug (Integrated Console)",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "python": "${command:python.interpreterPath}",
             "program": "${workspaceRoot}/src/azure-cli/azure/cli/__main__.py",
@@ -12,33 +12,24 @@
                 "--help"
             ],
             "console": "integratedTerminal",
-            "debugOptions": [
-                "WaitOnAbnormalExit",
-                "WaitOnNormalExit",
-                "RedirectOutput"
-            ],
             "justMyCode": false
         },
         {
             "name": "Azure CLI Debug (External Console)",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "stopOnEntry": true,
             "python": "${command:python.interpreterPath}",
             "program": "${workspaceRoot}/src/azure-cli/azure/cli/__main__.py",
             "cwd": "${workspaceRoot}",
             "args": [
-                "--help"
+                "--version"
             ],
             "console": "externalTerminal",
-            "debugOptions": [
-                "WaitOnAbnormalExit",
-                "WaitOnNormalExit"
-            ]
         },
         {
             "name": "Azdev Scripts",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "python": "${command:python.interpreterPath}",
             "program": "${workspaceRoot}/tools/automation/__main__.py",
@@ -47,11 +38,6 @@
                 "--help"
             ],
             "console": "integratedTerminal",
-            "debugOptions": [
-                "WaitOnAbnormalExit",
-                "WaitOnNormalExit",
-                "RedirectOutput"
-            ]
         }
     ]
-}
+}

src/azure-cli-core/HISTORY.rst

@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.81.0
+++++++
+* Minor fixes
+
 2.80.0
 ++++++
 * Minor fixes

src/azure-cli-core/azure/cli/core/__init__.py

@@ -4,7 +4,7 @@
 # --------------------------------------------------------------------------------------------
 # pylint: disable=line-too-long
 
-__version__ = "2.80.0"
+__version__ = "2.81.0"
 
 import os
 import sys
@@ -120,6 +120,9 @@ def get_cli_version(self):
 
     def show_version(self):
         from azure.cli.core.util import get_az_version_string, show_updates
+        from azure.cli.core import telemetry
+
+        telemetry.set_command_details(command="", parameters=["--version"])
 
         ver_string, updates_available_components = get_az_version_string()
         print(ver_string)

src/azure-cli-core/azure/cli/core/tests/test_telemetry.py

@@ -4,6 +4,7 @@
 # --------------------------------------------------------------------------------------------
 
 import unittest
+from unittest import mock
 
 
 class TestCoreTelemetry(unittest.TestCase):
@@ -57,3 +58,24 @@ def test_cloud_forbid_telemetry(self):
             # mock to add current cloud name in CLOUDS_FORBIDDING_TELEMETRY
             with mock.patch('azure.cli.core.cloud.CLOUDS_FORBIDDING_TELEMETRY', [az_cli.cloud.name]):
                 self.assertFalse(telemetry.is_telemetry_enabled())
+
+    @mock.patch('azure.cli.core.util.get_az_version_string')
+    def test_show_version_sets_telemetry_params(self, mock_get_version):
+        """Test show_version telemetry state is same regardless of available updates."""
+        from azure.cli.core.mock import DummyCli
+        from azure.cli.core import telemetry
+        from knack.completion import ARGCOMPLETE_ENV_NAME
+
+        mock_get_version.return_value = ("azure-cli 2.80.0", ["core", "extension1"])
+
+        telemetry.start()
+
+        cli = DummyCli()
+        telemetry.set_application(cli, ARGCOMPLETE_ENV_NAME)
+
+        cli.show_version()
+
+        session = telemetry._session
+        self.assertEqual(session.command, "")
+        self.assertEqual(session.parameters, ["--version"])
+        self.assertIsNone(session.raw_command)