Skip to content

Fix resource parsing and api version lookup. #2781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Travis Prescott (tjprescott) merged 2 commits into from
Apr 7, 2017
+108 −4
Merged

Fix resource parsing and api version lookup. #2781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85fb5f2
Fix ARM resource id parsing.
brendandburns Apr 6, 2017
839f0c4
Fix up API resource version lookup.
brendandburns Apr 6, 2017
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
4 changes: 2 additions & 2 deletions src/azure-cli-core/azure/cli/core/commands/arm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
logger = azlogging.get_az_logger(__name__)

regex = re.compile(
'/subscriptions/(?P<subscription>[^/]*)/resource[gG]roups/(?P<resource_group>[^/]*)'
'/subscriptions/(?P<subscription>[^/]*)(/resource[gG]roups/(?P<resource_group>[^/]*))?'
'/providers/(?P<namespace>[^/]*)/(?P<type>[^/]*)/(?P<name>[^/]*)'
'(/(?P<child_type>[^/]*)/(?P<child_name>[^/]*))?'
'((/providers/(?P<child_namespace>[^/]*))?/(?P<child_type>[^/]*)/(?P<child_name>[^/]*))?'
'(/(?P<grandchild_type>[^/]*)/(?P<grandchild_name>[^/]*))?')


Expand Down
98 changes: 98 additions & 0 deletions src/azure-cli-core/tests/test_arm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
# --------------------------------------------------------------------------------------------

import unittest

from azure.cli.core.commands.arm import parse_resource_id


class TestARM(unittest.TestCase):
def test_resource_parse(self):
tests = [{
'resource_id': '/subscriptions/fakesub/resourcegroups/testgroup/providers'
'/Microsoft.Storage/storageAccounts/foo/providers'
'/Microsoft.Authorization/locks/bar',
'expected': {
'name': 'foo',
'type': 'storageAccounts',
'namespace': 'Microsoft.Storage',
'child_name': 'bar',
'child_namespace': 'Microsoft.Authorization',
'child_type': 'locks',
'resource_group': 'testgroup',
'subscription': 'fakesub',
}
}, {
'resource_id': '/subscriptions/fakesub/resourcegroups/testgroup/providers'
'/Microsoft.Storage/storageAccounts/foo'
'/locks/bar',
'expected': {
'name': 'foo',
'type': 'storageAccounts',
'namespace': 'Microsoft.Storage',
'child_name': 'bar',
'child_type': 'locks',
'resource_group': 'testgroup',
'subscription': 'fakesub',
}
}, {
'resource_id': '/subscriptions/fakesub/resourcegroups/testgroup/providers'
'/Microsoft.Storage/storageAccounts/foo',
'expected': {
'name': 'foo',
'type': 'storageAccounts',
'namespace': 'Microsoft.Storage',
'resource_group': 'testgroup',
'subscription': 'fakesub',
}
}, {
'resource_id': '/subscriptions/fakesub/providers/Microsoft.Authorization'
'/locks/foo',
'expected': {
'name': 'foo',
'type': 'locks',
'namespace': 'Microsoft.Authorization',
'subscription': 'fakesub',
}
}, {
'resource_id': '/subscriptions/fakesub/resourcegroups/testgroup/providers'
'/Microsoft.Storage/storageAccounts/foo/providers'
'/Microsoft.Authorization/locks/bar/nets/gc',
'expected': {
'name': 'foo',
'type': 'storageAccounts',
'namespace': 'Microsoft.Storage',
'child_name': 'bar',
'child_namespace': 'Microsoft.Authorization',
'child_type': 'locks',
'grandchild_name': 'gc',
'grandchild_type': 'nets',
'resource_group': 'testgroup',
'subscription': 'fakesub',
}
}, {
'resource_id': '/subscriptions/fakesub/resourcegroups/testgroup/providers'
'/Microsoft.Storage/storageAccounts/foo'
'/locks/bar/nets/gc',
'expected': {
'name': 'foo',
'type': 'storageAccounts',
'namespace': 'Microsoft.Storage',
'child_name': 'bar',
'child_type': 'locks',
'grandchild_name': 'gc',
'grandchild_type': 'nets',
'resource_group': 'testgroup',
'subscription': 'fakesub',
}
}]

for test in tests:
resource = parse_resource_id(test['resource_id'])
self.assertDictEqual(resource, test['expected'])


if __name__ == "__main__":
unittest.main()
10 changes: 8 additions & 2 deletions src/command_modules/azure-cli-resource/azure/cli/command_modules/resource/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,15 +829,21 @@ def _resolve_api_version(rcf, resource_provider_namespace, parent_resource_path,
@staticmethod
def _resolve_api_version_by_id(rcf, resource_id):
parts = parse_resource_id(resource_id)
namespace = parts.get('child_namespace', parts['namespace'])
if parts.get('grandchild_type'):
parent = (parts['type'] + '/' + parts['name'] + '/' +
parts['child_type'] + '/' + parts['child_name'])
resource_type = parts['grandchild_type']
elif parts.get('child_type'):
parent = parts['type'] + '/' + parts['name']
# if the child resource has a provider namespace it is independent of the
# parent, so set the parent to empty
if parts.get('child_namespace') is not None:
parent = ''
else:
parent = parts['type'] + '/' + parts['name']
resource_type = parts['child_type']
else:
parent = None
resource_type = parts['type']

return _ResourceUtils._resolve_api_version(rcf, parts['namespace'], parent, resource_type)
return _ResourceUtils._resolve_api_version(rcf, namespace, parent, resource_type)