Fix safeguards -g/-n support and update test recordings

Author: Jenny Liu

src/aks-preview/azext_aks_preview/aks_safeguards_custom.py

@@ -10,6 +10,7 @@
 from azure.cli.core.aaz import AAZResourceGroupNameArg, AAZStrArg, has_value
 from azure.cli.core.azclierror import ArgumentUsageError, CLIError, HTTPError
 from azure.cli.core.util import send_raw_request
+from azure.mgmt.core.tools import is_valid_resource_id
 
 from azext_aks_preview.aaz.latest.aks.safeguards._create import Create
 from azext_aks_preview.aaz.latest.aks.safeguards._delete import Delete
@@ -40,6 +41,28 @@ def _validate_and_set_managed_cluster_argument(ctx):
             f"/subscriptions/{ctx.subscription_id}/resourceGroups/{args.resource_group}/"
             f"providers/Microsoft.ContainerService/managedClusters/{args.cluster_name}"
         )
+    else:
+        # If managed_cluster is provided but is not a full resource ID, treat it as a cluster name
+        # and require resource_group to be provided
+        managed_cluster_value = args.managed_cluster.to_serialized_data()
+
+        # Normalize resource ID: add leading slash if missing for backward compatibility
+        if managed_cluster_value and not managed_cluster_value.startswith('/'):
+            managed_cluster_value = f"/{managed_cluster_value}"
+
+        if not is_valid_resource_id(managed_cluster_value):
+            # It's just a cluster name, need resource group
+            if not has_value(args.resource_group):
+                raise ArgumentUsageError(
+                    "When providing cluster name via -c/--cluster, you must also provide -g/--resource-group."
+                )
+            # Build the full resource ID
+            managed_cluster_value = (
+                f"/subscriptions/{ctx.subscription_id}/resourceGroups/{args.resource_group}/"
+                f"providers/Microsoft.ContainerService/managedClusters/{managed_cluster_value.lstrip('/')}"
+            )
+
+        args.managed_cluster = managed_cluster_value
 
 
 def _add_resource_group_cluster_name_args(_args_schema):
@@ -60,7 +83,7 @@ def _add_resource_group_cluster_name_args(_args_schema):
              "or both --resource-group and --name, but not both.",
         required=False,
     )
-    _args_schema.managed_cluster.required = False
+    _args_schema.managed_cluster._required = False  # pylint: disable=protected-access
     return _args_schema
 
 

src/aks-preview/azext_aks_preview/tests/latest/recordings/test_aks_deployment_safeguards_argument_validation.yaml

@@ -97,7 +97,7 @@ interactions:
     body: '{"location": "westus2", "sku": {"name": "Base", "tier": "Free"}, "identity":
       {"type": "SystemAssigned"}, "kind": "Base", "properties": {"kubernetesVersion":
       "", "dnsPrefix": "aksval-lqt-cli-000001-26fe00", "agentPoolProfiles": [{"count":
-      3, "vmSize": "standard_a8_v2", "osDiskSizeGB": 0, "workloadRuntime": "OCIContainer",
+      3, "vmSize": "Standard_DS2_v2", "osDiskSizeGB": 0, "workloadRuntime": "OCIContainer",
       "osType": "Linux", "enableAutoScaling": false, "type": "VirtualMachineScaleSets",
       "mode": "System", "orchestratorVersion": "", "upgradeSettings": {}, "upgradeSettingsBlueGreen":
       {}, "enableNodePublicIP": false, "scaleSetPriority": "Regular", "scaleSetEvictionPolicy":
@@ -140,7 +140,7 @@ interactions:
         \ \"fqdn\": \"aksval-lqt-cli-000001-26fe00-8wql3q5r.hcp.westus2.staging.azmk8s.io\",\n
         \ \"azurePortalFQDN\": \"aksval-lqt-cli-000001-26fe00-8wql3q5r.portal.hcp.westus2.staging.azmk8s.io\",\n
         \ \"agentPoolProfiles\": [\n   {\n    \"name\": \"nodepool1\",\n    \"count\":
-        3,\n    \"vmSize\": \"standard_a8_v2\",\n    \"osDiskSizeGB\": 256,\n    \"osDiskType\":
+        3,\n    \"vmSize\": \"Standard_DS2_v2\",\n    \"osDiskSizeGB\": 256,\n    \"osDiskType\":
         \"Managed\",\n    \"kubeletDiskType\": \"OS\",\n    \"workloadRuntime\": \"OCIContainer\",\n
         \   \"maxPods\": 250,\n    \"type\": \"VirtualMachineScaleSets\",\n    \"enableAutoScaling\":
         false,\n    \"scaleDownMode\": \"Delete\",\n    \"provisioningState\": \"Creating\",\n
@@ -1229,7 +1229,7 @@ interactions:
         \ \"fqdn\": \"aksval-lqt-cli-000001-26fe00-8wql3q5r.hcp.westus2.staging.azmk8s.io\",\n
         \ \"azurePortalFQDN\": \"aksval-lqt-cli-000001-26fe00-8wql3q5r.portal.hcp.westus2.staging.azmk8s.io\",\n
         \ \"agentPoolProfiles\": [\n   {\n    \"name\": \"nodepool1\",\n    \"count\":
-        3,\n    \"vmSize\": \"standard_a8_v2\",\n    \"osDiskSizeGB\": 256,\n    \"osDiskType\":
+        3,\n    \"vmSize\": \"Standard_DS2_v2\",\n    \"osDiskSizeGB\": 256,\n    \"osDiskType\":
         \"Managed\",\n    \"kubeletDiskType\": \"OS\",\n    \"workloadRuntime\": \"OCIContainer\",\n
         \   \"maxPods\": 250,\n    \"type\": \"VirtualMachineScaleSets\",\n    \"enableAutoScaling\":
         false,\n    \"scaleDownMode\": \"Delete\",\n    \"provisioningState\": \"Succeeded\",\n
@@ -1331,7 +1331,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.79.0 azsdk-python-core/1.35.0 Python/3.12.12 (Linux-6.8.0-1030-azure-x86_64-with-glibc2.41)
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli-000001/providers/Microsoft.ContainerService/managedClusters/aksval-000002/providers/Microsoft.ContainerService/deploymentSafeguards/default?api-version=2025-05-02-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli-000001/providers/Microsoft.ContainerService/managedClusters/aksval-000002/providers/Microsoft.ContainerService/deploymentSafeguards/default?api-version=2025-07-01
   response:
     body:
       string: '{"eTag":"8734c920-5908-49de-b248-97ac4460c414","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-000001/providers/Microsoft.ContainerService/managedClusters/aksval-000002/providers/Microsoft.ContainerService/deploymentSafeguards/default","name":"default","properties":{"level":"Warn","podSecurityStandardsLevel":"Privileged","provisioningState":"Creating","systemExcludedNamespaces":["aks-command","kube-system","calico-system","tigera-system","gatekeeper-system","azappconfig-system","azureml","dapr-system","dataprotection-microsoft","flux-system","acstor","sc-system","azure-extensions-usage-system","app-routing-system","aks-periscope","aks-istio-system","aks-istio-ingress","aks-istio-egress"]},"type":"Microsoft.ContainerService/deploymentSafeguards"}'
@@ -1531,7 +1531,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.79.0 azsdk-python-core/1.35.0 Python/3.12.12 (Linux-6.8.0-1030-azure-x86_64-with-glibc2.41)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli-000001/providers/Microsoft.ContainerService/managedClusters/aksval-000002/providers/Microsoft.ContainerService/deploymentSafeguards/default?api-version=2025-05-02-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli-000001/providers/Microsoft.ContainerService/managedClusters/aksval-000002/providers/Microsoft.ContainerService/deploymentSafeguards/default?api-version=2025-07-01
   response:
     body:
       string: '{"eTag":"64ab911c-c024-4310-aa14-a94c344ee710","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-000001/providers/Microsoft.ContainerService/managedClusters/aksval-000002/providers/Microsoft.ContainerService/deploymentSafeguards/default","name":"default","properties":{"level":"Warn","podSecurityStandardsLevel":"Privileged","provisioningState":"Succeeded","systemExcludedNamespaces":["aks-command","kube-system","calico-system","tigera-system","gatekeeper-system","azappconfig-system","azureml","dapr-system","dataprotection-microsoft","flux-system","acstor","sc-system","azure-extensions-usage-system","app-routing-system","aks-periscope","aks-istio-system","aks-istio-ingress","aks-istio-egress"]},"type":"Microsoft.ContainerService/deploymentSafeguards"}'
@@ -1581,7 +1581,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.79.0 azsdk-python-core/1.35.0 Python/3.12.12 (Linux-6.8.0-1030-azure-x86_64-with-glibc2.41)
     method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-000001/providers/Microsoft.ContainerService/managedClusters/aksval-000002/providers/Microsoft.ContainerService/deploymentSafeguards/default?api-version=2025-05-02-preview
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli-000001/providers/Microsoft.ContainerService/managedClusters/aksval-000002/providers/Microsoft.ContainerService/deploymentSafeguards/default?api-version=2025-07-01
   response:
     body:
       string: ''