Merge branch 'Azure:dev' into agentcreate

Author: eamonoreilly

.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/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)

src/azure-cli-core/setup.py

@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup, find_packages
 
-VERSION = "2.80.0"
+VERSION = "2.81.0"
 
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.

src/azure-cli/HISTORY.rst

@@ -3,6 +3,27 @@
 Release History
 ===============
 
+2.81.0
+++++++
+
+**AKS**
+
+* `az aks safeguards`: Add `--pss-level` parameter to support Pod Security Standards (#32432)
+* `az aks safeguards create`: Add validation to prevent duplicate resource creation (#32432)
+
+**ARM**
+
+* Fix #32098: `az bicep install`: Fix a bug where the installation was skipped when `--version` was specified unless `bicep.use_binary_from_path` was explicitly set to `false` (#32337)
+
+**Compute**
+
+* `az vm/vmss application set`: Add new parameter `--enable-automatic-upgrade` to support enabling application automatic upgrade (#32394)
+
+**NetAppFiles**
+
+* `az netappfiles volume-group create`: Add `--network-features` parameter for volume groups (#32423)
+* `az netappfiles volume replication list`: Add `--exclude` parameter to exclude deleted replications (#32423)
+
 2.80.0
 ++++++
 

src/azure-cli/azure/cli/__main__.py

@@ -17,7 +17,7 @@
 from knack.log import get_logger
 
 __author__ = "Microsoft Corporation <[email protected]>"
-__version__ = "2.80.0"
+__version__ = "2.81.0"
 
 
 logger = get_logger(__name__)

src/azure-cli/azure/cli/command_modules/acr/_docker_utils.py

@@ -28,7 +28,6 @@
 from ._constants import get_managed_sku
 from ._constants import ACR_AUDIENCE_RESOURCE_NAME
 from ._utils import get_registry_by_name, ResourceNotFound
-from .policy import acr_config_authentication_as_arm_show
 from ._format import add_timestamp
 from ._errors import CONNECTIVITY_TOOMANYREQUESTS_ERROR
 
@@ -135,18 +134,14 @@ def _get_aad_token_after_challenge(cli_ctx,
                                    artifact_repository,
                                    permission,
                                    is_diagnostics_context,
-                                   use_acr_audience,
                                    verify_user_permissions):
     authurl = urlparse(token_params['realm'])
     authhost = urlunparse((authurl[0], authurl[1], '/oauth2/exchange', '', '', ''))
 
     from azure.cli.core._profile import Profile
     profile = Profile(cli_ctx=cli_ctx)
 
-    scope = None
-    if use_acr_audience:
-        logger.debug("Using ACR audience token for authentication")
-        scope = "https://{}.azure.net".format(ACR_AUDIENCE_RESOURCE_NAME)
+    scope = "https://{}.azure.net".format(ACR_AUDIENCE_RESOURCE_NAME)
 
     # this might be a cross tenant scenario, so pass subscription to get_raw_token
     creds, _, tenant = profile.get_raw_token(subscription=get_subscription_id(cli_ctx),
@@ -267,7 +262,6 @@ def _get_aad_token(cli_ctx,
                    artifact_repository=None,
                    permission=None,
                    is_diagnostics_context=False,
-                   use_acr_audience=False,
                    verify_user_permissions=False):
     """Obtains refresh and access tokens for an AAD-enabled registry. Will return the allowed actions if
     verify_user_permissions is set to True.
@@ -296,7 +290,6 @@ def _get_aad_token(cli_ctx,
                                           artifact_repository,
                                           permission,
                                           is_diagnostics_context,
-                                          use_acr_audience,
                                           verify_user_permissions)
 
 
@@ -453,19 +446,12 @@ def _get_credentials(cmd,  # pylint: disable=too-many-statements
     if not registry or registry.sku.name in get_managed_sku(cmd):
         logger.info("Attempting to retrieve AAD refresh token...")
         try:
-            use_acr_audience = False
-
-            if registry:
-                aad_auth_policy = acr_config_authentication_as_arm_show(cmd, registry_name, resource_group_name)
-                use_acr_audience = (aad_auth_policy and aad_auth_policy.status == 'disabled')
-
             return login_server, EMPTY_GUID, _get_aad_token(cli_ctx,
                                                             login_server,
                                                             only_refresh_token,
                                                             repository,
                                                             artifact_repository,
-                                                            permission,
-                                                            use_acr_audience=use_acr_audience)
+                                                            permission)
         except CLIError as e:
             raise_toomanyrequests_error(str(e))
             logger.warning("%s: %s", AAD_TOKEN_BASE_ERROR_MESSAGE, str(e))