mitigate az group show (#30146)

Author: AllyW

src/azure-cli/azure/cli/command_modules/security/_utils.py

@@ -8,20 +8,16 @@
 )
 
 
-def run_cli_cmd(cmd, retry=0):
-    '''Run a CLI command
-    :param cmd: The CLI command to be executed
-    :param retry: The times to re-try
+def get_resource_group(cmd, resource_group_name):
+    '''Get resource group info
+    :param cmd: The cmd context
+    :param resource_group_name: The resource group to be fetched
     '''
-    import json
-    import subprocess
-
-    output = subprocess.run(cmd, shell=True, check=False, capture_output=True)
-    if output.returncode != 0:
-        if retry:
-            run_cli_cmd(cmd, retry - 1)
-        else:
-            raise CLIInternalError('Command execution failed, command is: '
-                                   '{}, error message is: {}'.format(cmd, output.stderr))
-
-    return json.loads(output.stdout) if output.stdout else json.loads(None)
+    from azure.cli.core.commands.client_factory import get_mgmt_service_client
+    from azure.cli.core.profiles import ResourceType
+    try:
+        resource_client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES)
+        resource_group = resource_client.resource_groups.get(resource_group_name)
+    except Exception as ex:  # pylint: disable=broad-except
+        raise CLIInternalError('Resource group fetch execution failed, error message is: {}'.format(str(ex)))
+    return resource_group

src/azure-cli/azure/cli/command_modules/security/custom.py

@@ -35,7 +35,7 @@
 from azure.core.exceptions import HttpResponseError
 from knack.log import get_logger
 from ._utils import (
-    run_cli_cmd
+    get_resource_group
 )
 
 logger = get_logger(__name__)
@@ -946,20 +946,20 @@ def delete_security_automation(client, resource_group_name, resource_name):
     return client.delete(resource_group_name, resource_name)
 
 
-def create_or_update_security_automation(client, resource_group_name, resource_name, scopes, sources, actions, location=None, etag=None, tags=None, description=None, isEnabled=None):
+def create_or_update_security_automation(cmd, client, resource_group_name, resource_name, scopes, sources, actions, location=None, etag=None, tags=None, description=None, isEnabled=None):
 
     if location is None:
-        resourceGroup = run_cli_cmd('az group show --name {}'.format(resource_group_name))
-        location = resourceGroup['location']
+        resourceGroup = get_resource_group(cmd, resource_group_name)
+        location = resourceGroup.location
     automation = create_security_automation_object(location, scopes, sources, actions, etag, tags, description, isEnabled)
     return client.create_or_update(resource_group_name, resource_name, automation)
 
 
-def validate_security_automation(client, resource_group_name, resource_name, scopes, sources, actions, location=None, etag=None, tags=None, description=None, isEnabled=None):
+def validate_security_automation(cmd, client, resource_group_name, resource_name, scopes, sources, actions, location=None, etag=None, tags=None, description=None, isEnabled=None):
 
     if location is None:
-        resourceGroup = run_cli_cmd('az group show --name {}'.format(resource_group_name))
-        location = resourceGroup['location']
+        resourceGroup = get_resource_group(cmd, resource_group_name)
+        location = resourceGroup.location
     automation = create_security_automation_object(location, scopes, sources, actions, etag, tags, description, isEnabled)
     return client.validate(resource_group_name, resource_name, automation)