Move deployments commands into separate file

Author: anthony-c-martin

src/azure-cli/azure/cli/command_modules/resource/_client_factory.py

@@ -3,13 +3,18 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-
 def _resource_client_factory(cli_ctx, **_):
     from azure.cli.core.commands.client_factory import get_mgmt_service_client
     from azure.cli.core.profiles import ResourceType
     return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES)
 
 
+def _resource_deployments_client_factory(cli_ctx, **_):
+    from azure.cli.core.commands.client_factory import get_mgmt_service_client
+    from azure.cli.core.profiles import ResourceType
+    return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES)
+
+
 def _resource_feature_client_factory(cli_ctx, **_):
     from azure.cli.core.commands.client_factory import get_mgmt_service_client
     from azure.cli.core.profiles import ResourceType
@@ -76,7 +81,7 @@ def _resource_privatelinks_client_factory(cli_ctx, **_):
     return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_PRIVATELINKS)
 
 
-def cf_resource_groups(cli_ctx, _):
+def cf_resource_groups(cli_ctx, *_):
     return _resource_client_factory(cli_ctx).resource_groups
 
 
@@ -92,12 +97,16 @@ def cf_tags(cli_ctx, _):
     return _resource_client_factory(cli_ctx).tags
 
 
-def cf_deployments(cli_ctx, _):
-    return _resource_client_factory(cli_ctx).deployments
+def cf_deployments(cli_ctx, *_):
+    return _resource_deployments_client_factory(cli_ctx).deployments
 
 
-def cf_deployment_operations(cli_ctx, _):
-    return _resource_client_factory(cli_ctx).deployment_operations
+def cf_deployment_operations(cli_ctx, *_):
+    return _resource_deployments_client_factory(cli_ctx).deployment_operations
+
+
+def cf_deploymentscripts(cli_ctx, *_):
+    return _resource_deploymentscripts_client_factory(cli_ctx).deployment_scripts
 
 
 def cf_features(cli_ctx, _):
@@ -128,10 +137,6 @@ def cf_resource_links(cli_ctx, _):
     return _resource_links_client_factory(cli_ctx).resource_links
 
 
-def cf_resource_deploymentscripts(cli_ctx, _):
-    return _resource_deploymentscripts_client_factory(cli_ctx).deployment_scripts
-
-
 def cf_resource_managedapplications(cli_ctx, _):
     return _resource_managedapps_client_factory(cli_ctx).applications
 
@@ -160,11 +165,11 @@ def cf_hierarchy_settings(cli_ctx, _):
     return _resource_managementgroups_client_factory(cli_ctx).hierarchy_settings
 
 
-def cf_resource_templatespecs(cli_ctx, _):
+def cf_resource_templatespecs(cli_ctx, *_):
     return _resource_templatespecs_client_factory(cli_ctx).template_specs
 
 
-def cf_resource_deploymentstacks(cli_ctx, _):
+def cf_resource_deploymentstacks(cli_ctx, *_):
     return _resource_deploymentstacks_client_factory(cli_ctx).deployment_stacks
 
 

src/azure-cli/azure/cli/command_modules/resource/_packing_engine.py

@@ -8,7 +8,7 @@
 from knack.util import CLIError
 from azure.cli.core.azclierror import BadRequestError
 from azure.cli.core.util import read_file_content, shell_safe_json_parse
-from azure.cli.command_modules.resource.custom import _remove_comments_from_json
+from azure.cli.command_modules.resource.custom_deployments import _remove_comments_from_json
 from azure.cli.core.profiles import ResourceType, get_sdk
 
 

src/azure-cli/azure/cli/command_modules/resource/commands.py

@@ -16,7 +16,7 @@
 from azure.cli.command_modules.resource._client_factory import (
     cf_resource_groups, cf_providers, cf_features, cf_feature_registrations, cf_tags, cf_deployments,
     cf_deployment_operations, cf_policy_definitions, cf_policy_set_definitions, cf_policy_exemptions, cf_resource_links, cf_resource_deploymentstacks,
-    cf_resource_deploymentscripts, cf_resource_managedapplications, cf_resource_managedappdefinitions, cf_management_groups, cf_management_groups_mixin, cf_management_group_subscriptions, cf_management_group_entities, cf_hierarchy_settings, cf_resource_templatespecs, cf_resource_resourcemanagementprivatelinks, cf_resource_privatelinkassociations)
+    cf_deploymentscripts, cf_resource_managedapplications, cf_resource_managedappdefinitions, cf_management_groups, cf_management_groups_mixin, cf_management_group_subscriptions, cf_management_group_entities, cf_hierarchy_settings, cf_resource_templatespecs, cf_resource_resourcemanagementprivatelinks, cf_resource_privatelinkassociations)
 from azure.cli.command_modules.resource._validators import (
     process_deployment_create_namespace, process_ts_create_or_update_namespace, _validate_template_spec, _validate_template_spec_out,
     process_assign_identity_namespace, process_assignment_create_namespace, validate_deployment_stack_files)
@@ -200,7 +200,7 @@ def load_command_table(self, _):
 
     resource_deploymentscripts_sdk = CliCommandType(
         operations_tmpl='azure.mgmt.resource.deploymentscripts.operations#ResourceLinksOperations.{}',
-        client_factory=cf_resource_deploymentscripts,
+        client_factory=cf_deploymentscripts,
         resource_type=ResourceType.MGMT_RESOURCE_DEPLOYMENTSCRIPTS
     )