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
     return _args_schema
 
 

src/aks-preview/azext_aks_preview/tests/latest/test_aks_safeguards.py

@@ -47,7 +47,7 @@ def test_aks_deployment_safeguards_basic(self):
         self.kwargs.update({
             'aks_name': self.create_random_name(prefix='akssafeguards-', length=20),
             'ssh_key_value': self.generate_ssh_keys(),
-            'vm_size': 'standard_a8_v2'
+            'vm_size': 'Standard_DS2_v2'
         })
 
         # Create AKS cluster
@@ -101,7 +101,7 @@ def test_aks_deployment_safeguards_with_pss(self):
         self.kwargs.update({
             'aks_name': self.create_random_name(prefix='akspss-', length=15),
             'ssh_key_value': self.generate_ssh_keys(),
-            'vm_size': 'standard_a8_v2'
+            'vm_size': 'Standard_DS2_v2'
         })
 
         # Create AKS cluster
@@ -155,7 +155,7 @@ def test_aks_deployment_safeguards_argument_validation(self):
         self.kwargs.update({
             'aks_name': self.create_random_name(prefix='aksval-', length=15),
             'ssh_key_value': self.generate_ssh_keys(),
-            'vm_size': 'standard_a8_v2'
+            'vm_size': 'Standard_DS2_v2'
         })
 
         # Create AKS cluster