Skip to content

Commit 42ec214

Browse files
committed
Refactor template spec functions to simplify subscription_id usage
Removed redundant subscription_id variable assignments in template spec-related functions. Now, subscription_id is passed directly from parsed resource ID when template_spec is provided, improving code clarity and reducing duplication.
1 parent c717b9d commit 42ec214

File tree

1 file changed

+4
-12
lines changed
  • src/azure-cli/azure/cli/command_modules/resource

1 file changed

+4
-12
lines changed

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2302,16 +2302,14 @@ def delete_deployment_script(cmd, resource_group_name, name):
23022302

23032303

23042304
def get_template_spec(cmd, resource_group_name=None, name=None, version=None, template_spec=None):
2305-
subscription_id = None
23062305
if template_spec:
23072306
id_parts = parse_resource_id(template_spec)
2308-
subscription_id = id_parts.get('subscription')
23092307
resource_group_name = id_parts.get('resource_group')
23102308
name = id_parts.get('name')
23112309
version = id_parts.get('resource_name')
23122310
if version == name:
23132311
version = None
2314-
rcf = _resource_templatespecs_client_factory(cmd.cli_ctx, subscription_id=subscription_id)
2312+
rcf = _resource_templatespecs_client_factory(cmd.cli_ctx, subscription_id=id_parts.get('subscription') if template_spec else None)
23152313
if version:
23162314
return rcf.template_spec_versions.get(resource_group_name, name, version)
23172315
retrieved_template = rcf.template_specs.get(resource_group_name, name, expand="versions")
@@ -2383,16 +2381,14 @@ def create_template_spec(cmd, resource_group_name, name, template_file=None, loc
23832381

23842382
def update_template_spec(cmd, resource_group_name=None, name=None, template_spec=None, template_file=None, display_name=None,
23852383
description=None, version=None, version_description=None, tags=None, ui_form_definition_file=None):
2386-
subscription_id = None
23872384
if template_spec:
23882385
id_parts = parse_resource_id(template_spec)
2389-
subscription_id = id_parts.get('subscription')
23902386
resource_group_name = id_parts.get('resource_group')
23912387
name = id_parts.get('name')
23922388
version = id_parts.get('resource_name')
23932389
if version == name:
23942390
version = None
2395-
rcf = _resource_templatespecs_client_factory(cmd.cli_ctx, subscription_id=subscription_id)
2391+
rcf = _resource_templatespecs_client_factory(cmd.cli_ctx, subscription_id=id_parts.get('subscription') if template_spec else None)
23962392

23972393
existing_template, artifacts, input_ui_form_definition = None, None, None
23982394
if template_file:
@@ -2448,16 +2444,14 @@ def update_template_spec(cmd, resource_group_name=None, name=None, template_spec
24482444

24492445

24502446
def export_template_spec(cmd, output_folder, resource_group_name=None, name=None, version=None, template_spec=None):
2451-
subscription_id = None
24522447
if template_spec:
24532448
id_parts = parse_resource_id(template_spec)
2454-
subscription_id = id_parts.get('subscription')
24552449
resource_group_name = id_parts.get('resource_group')
24562450
name = id_parts.get('name')
24572451
version = id_parts.get('resource_name')
24582452
if version == name:
24592453
version = None
2460-
rcf = _resource_templatespecs_client_factory(cmd.cli_ctx, subscription_id=subscription_id)
2454+
rcf = _resource_templatespecs_client_factory(cmd.cli_ctx, subscription_id=id_parts.get('subscription') if template_spec else None)
24612455
if not version:
24622456
raise IncorrectUsageError('Please specify the template spec version for export')
24632457
exported_template = rcf.template_spec_versions.get(resource_group_name, name, version)
@@ -2466,16 +2460,14 @@ def export_template_spec(cmd, output_folder, resource_group_name=None, name=None
24662460

24672461

24682462
def delete_template_spec(cmd, resource_group_name=None, name=None, version=None, template_spec=None):
2469-
subscription_id = None
24702463
if template_spec:
24712464
id_parts = parse_resource_id(template_spec)
2472-
subscription_id = id_parts.get('subscription')
24732465
resource_group_name = id_parts.get('resource_group')
24742466
name = id_parts.get('name')
24752467
version = id_parts.get('resource_name')
24762468
if version == name:
24772469
version = None
2478-
rcf = _resource_templatespecs_client_factory(cmd.cli_ctx, subscription_id=subscription_id)
2470+
rcf = _resource_templatespecs_client_factory(cmd.cli_ctx, subscription_id=id_parts.get('subscription') if template_spec else None)
24792471
if version:
24802472
return rcf.template_spec_versions.delete(resource_group_name=resource_group_name, template_spec_name=name, template_spec_version=version)
24812473
return rcf.template_specs.delete(resource_group_name=resource_group_name, template_spec_name=name)

0 commit comments

Comments
 (0)