Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/azure-cli/azure/cli/command_modules/resource/policy.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,13 @@ def ResolveScopeForList(self):
ctx = self.ctx
if has_value(ctx.args.scope):
scope_parts = ctx.args.scope._data.split('/')
if scope_parts[1] == 'providers' and len(scope_parts) > 4:
if len(scope_parts) > 4 and scope_parts[1] == 'providers':
ctx.args.management_group = scope_parts[4]
ctx.args.resource_group = None
elif scope_parts[1] == 'subscriptions':
elif len(scope_parts) > 2 and scope_parts[1] == 'subscriptions':
# store subscription from scope for later use
self.subscription_from_scope = scope_parts[2]
if len(scope_parts) > 3:
if len(scope_parts) > 4 and scope_parts[3].lower() == 'resourcegroups':
ctx.args.resource_group = scope_parts[4]
else:
ctx.args.resource_group = None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
_validate_deployment_name,
validate_lock_parameters,
)
from azure.cli.command_modules.resource.policy import Common
from azure.cli.core.azclierror import InvalidArgumentValueError


class NamespaceObject:
Expand Down Expand Up @@ -142,5 +144,43 @@ def test_generate_deployment_name_from_file(self):
self.assertEqual('deployment1', namespace.deployment_name)


class TestPolicyCommon(unittest.TestCase):

@staticmethod
def _create_policy_command(scope):
cmd = mock.MagicMock()
cmd.ctx = mock.MagicMock()
cmd.ctx.args = mock.MagicMock()
cmd.ctx.args.scope = mock.MagicMock()
cmd.ctx.args.scope._data = scope
cmd.ctx.args.management_group = None
cmd.ctx.args.resource_group = None
cmd.subscription_from_scope = None
return cmd

def test_resolve_scope_for_list_raises_for_short_scope(self):
cmd = self._create_policy_command('resource-group-name')

with self.assertRaises(InvalidArgumentValueError):
Common.ResolveScopeForList(cmd)

def test_resolve_scope_for_list_sets_resource_group_for_subscription_scope(self):
cmd = self._create_policy_command('/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-rg')

Common.ResolveScopeForList(cmd)

self.assertEqual('00000000-0000-0000-0000-000000000000', cmd.subscription_from_scope)
self.assertEqual('test-rg', cmd.ctx.args.resource_group)
self.assertIsNone(cmd.ctx.args.management_group)

def test_resolve_scope_for_list_sets_management_group_for_mg_scope(self):
cmd = self._create_policy_command('/providers/Microsoft.Management/managementGroups/test-mg')

Common.ResolveScopeForList(cmd)

self.assertEqual('test-mg', cmd.ctx.args.management_group)
self.assertIsNone(cmd.ctx.args.resource_group)


if __name__ == '__main__':
unittest.main()
Loading