Merge pull request #4630 from Azure/cadenmarchese/cli-downstreaming

sync our development extension with azure-cli upstream module

Author: mociarain

python/az/aro/azext_aro/_validators.py

@@ -128,8 +128,8 @@ def validate_pull_secret(namespace):
                 namespace.pull_secret = file.read().rstrip('\n')
 
         if not isinstance(json.loads(namespace.pull_secret), dict):
-            raise Exception()
-    except Exception as e:
+            raise ValueError("Pull secret must be a valid JSON object")
+    except (ValueError, json.JSONDecodeError) as e:
         raise InvalidArgumentValueError("Invalid --pull-secret.") from e
 
 

python/az/aro/azext_aro/aaz/latest/identity/__cmd_group.py

@@ -11,9 +11,6 @@
 from azure.cli.core.aaz import *
 
 
-@register_command_group(
-    "identity",
-)
 class __CMDGroup(AAZCommandGroup):
     """Manage Managed Identity
     """

python/az/aro/azext_aro/aaz/latest/identity/_create.py

@@ -11,9 +11,6 @@
 from azure.cli.core.aaz import *
 
 
-@register_command(
-    "identity create",
-)
 class Create(AAZCommand):
     """Create an identity in the specified subscription and resource group.
     """

python/az/aro/azext_aro/aaz/latest/identity/_delete.py

@@ -11,10 +11,6 @@
 from azure.cli.core.aaz import *
 
 
-@register_command(
-    "identity delete",
-    confirmation="Are you sure you want to perform this operation?",
-)
 class Delete(AAZCommand):
     """Delete the identity.
     """

python/az/aro/azext_aro/aaz/latest/network/vnet/__cmd_group.py

@@ -14,7 +14,7 @@
 class __CMDGroup(AAZCommandGroup):
     """Check if a private IP address is available for use within a virtual network.
 
-    To learn more about Virtual Networks visit https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network.
+    To learn more about Virtual Networks visit https://learn.microsoft.com/azure/virtual-network/virtual-network-manage-network.
     """
     pass
 

python/az/aro/azext_aro/aaz/latest/network/vnet/subnet/__cmd_group.py

@@ -14,7 +14,7 @@
 class __CMDGroup(AAZCommandGroup):
     """Manage subnets in an Azure Virtual Network.
 
-    To learn more about subnets visit https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-subnet.
+    To learn more about subnets visit https://learn.microsoft.com/azure/virtual-network/virtual-network-manage-subnet.
     """
     pass
 

python/az/aro/azext_aro/tests/latest/integration/recordings/test_aro_get_versions.yaml

@@ -0,0 +1,44 @@
+interactions:
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      CommandName:
+      - aro get-versions
+      Connection:
+      - keep-alive
+      ParameterSetName:
+      - --location
+      User-Agent:
+      - AZURECLI/2.0.0
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.RedHatOpenShift/locations/eastus/openShiftVersions?api-version=2025-07-25
+  response:
+    body:
+      string: '{"value":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.RedHatOpenShift/locations/eastus/openshiftversions/4.10.0","name":"4.10.0","type":"Microsoft.RedHatOpenShift/locations/openshiftversions","properties":{"version":"4.10.0"}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.RedHatOpenShift/locations/eastus/openshiftversions/4.11.0","name":"4.11.0","type":"Microsoft.RedHatOpenShift/locations/openshiftversions","properties":{"version":"4.11.0"}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.RedHatOpenShift/locations/eastus/openshiftversions/4.12.0","name":"4.12.0","type":"Microsoft.RedHatOpenShift/locations/openshiftversions","properties":{"version":"4.12.0"}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.RedHatOpenShift/locations/eastus/openshiftversions/4.13.0","name":"4.13.0","type":"Microsoft.RedHatOpenShift/locations/openshiftversions","properties":{"version":"4.13.0"}},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.RedHatOpenShift/locations/eastus/openshiftversions/4.14.0","name":"4.14.0","type":"Microsoft.RedHatOpenShift/locations/openshiftversions","properties":{"version":"4.14.0"}}]}'
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '1234'
+      content-type:
+      - application/json; charset=utf-8
+      date:
+      - Thu, 20 Feb 2026 15:00:00 GMT
+      expires:
+      - '-1'
+      pragma:
+      - no-cache
+      strict-transport-security:
+      - max-age=31536000; includeSubDomains
+      vary:
+      - Accept-Encoding
+      x-content-type-options:
+      - nosniff
+    status:
+      code: 200
+      message: OK
+version: 1