From 29d60b0b44c7b9d2e77babb1c636559585030213 Mon Sep 17 00:00:00 2001 From: Fred-sun <37327967+Fred-sun@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:54:57 +0800 Subject: [PATCH] Lexicalized resource ids should get 'subscription' instead of' subscription_id' (#1720) --- plugins/module_utils/azure_rm_common.py | 2 +- plugins/modules/azure_rm_image.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/module_utils/azure_rm_common.py b/plugins/module_utils/azure_rm_common.py index 092ebdb47..a7e43c246 100644 --- a/plugins/module_utils/azure_rm_common.py +++ b/plugins/module_utils/azure_rm_common.py @@ -609,7 +609,7 @@ def parse_resource_to_dict(self, resource): ''' resource_dict = parse_resource_id(resource) if not isinstance(resource, dict) else resource resource_dict['resource_group'] = resource_dict.get('resource_group', self.resource_group) - resource_dict['subscription_id'] = resource_dict.get('subscription_id', self.subscription_id) + resource_dict['subscription_id'] = resource_dict.get('subscription', self.subscription_id) return resource_dict def serialize_obj(self, obj, class_name, enum_modules=None): diff --git a/plugins/modules/azure_rm_image.py b/plugins/modules/azure_rm_image.py index 4c67cb6a7..7f607e3a0 100644 --- a/plugins/modules/azure_rm_image.py +++ b/plugins/modules/azure_rm_image.py @@ -262,7 +262,7 @@ def resolve_storage_source(self, source): self.fail("source parameter should be in type string or dictionary") if tokenize.get('type') == 'disks': disk = format_resource_id(tokenize['name'], - tokenize.get('subscription_id') or self.subscription_id, + tokenize.get('subscription') or self.subscription_id, 'Microsoft.Compute', 'disks', tokenize.get('resource_group') or self.resource_group) @@ -270,7 +270,7 @@ def resolve_storage_source(self, source): if tokenize.get('type') == 'snapshots': snapshot = format_resource_id(tokenize['name'], - tokenize.get('subscription_id') or self.subscription_id, + tokenize.get('subscription') or self.subscription_id, 'Microsoft.Compute', 'snapshots', tokenize.get('resource_group') or self.resource_group)