Skip to content

Commit 1565a55

Browse files
authored
{Role} az role: Bump azure-mgmt-authorization to single-API SDK (#31859)
1 parent d7e8a34 commit 1565a55

File tree

11 files changed

+19496
-6360
lines changed

11 files changed

+19496
-6360
lines changed

src/azure-cli-core/azure/cli/core/profiles/_shared.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,7 @@ def default_api_version(self):
187187
ResourceType.MGMT_RESOURCE_MANAGEDAPPLICATIONS: '2019-07-01',
188188
ResourceType.MGMT_NETWORK_PRIVATEDNS: None,
189189
ResourceType.MGMT_KEYVAULT: None,
190-
ResourceType.MGMT_AUTHORIZATION: SDKProfile('2022-04-01', {
191-
'role_definitions': '2022-05-01-preview',
192-
'provider_operations_metadata': '2018-01-01-preview'
193-
}),
190+
ResourceType.MGMT_AUTHORIZATION: None,
194191
ResourceType.MGMT_CONTAINERREGISTRY: SDKProfile('2025-03-01-preview', {
195192
'agent_pools': '2025-03-01-preview',
196193
'tasks': '2025-03-01-preview',

src/azure-cli/azure/cli/command_modules/acs/_roleassignments.py

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,9 @@ def add_role_assignment_executor(cmd, role, assignee, resource_group_name=None,
9393
mod="models",
9494
operation_group="role_assignments",
9595
)
96-
if cmd.supported_api_version(min_api="2018-01-01-preview", resource_type=ResourceType.MGMT_AUTHORIZATION):
97-
parameters = RoleAssignmentCreateParameters(role_definition_id=role_id, principal_id=object_id,
98-
principal_type=assignee_principal_type)
99-
return assignments_client.create(scope, assignment_name, parameters, headers=custom_headers)
100-
101-
# for backward compatibility
102-
RoleAssignmentProperties = get_sdk(
103-
cmd.cli_ctx,
104-
ResourceType.MGMT_AUTHORIZATION,
105-
"RoleAssignmentProperties",
106-
mod="models",
107-
operation_group="role_assignments",
108-
)
109-
properties = RoleAssignmentProperties(role_definition_id=role_id, principal_id=object_id)
110-
return assignments_client.create(scope, assignment_name, properties, headers=custom_headers)
96+
parameters = RoleAssignmentCreateParameters(role_definition_id=role_id, principal_id=object_id,
97+
principal_type=assignee_principal_type)
98+
return assignments_client.create(scope, assignment_name, parameters, headers=custom_headers)
11199

112100

113101
def add_role_assignment(cmd, role, service_principal_msi_id, is_service_principal=True,
@@ -271,11 +259,9 @@ def delete_role_assignments_executor(
271259
def subnet_role_assignment_exists(cmd, scope):
272260
factory = get_auth_management_client(cmd.cli_ctx, scope)
273261
assignments_client = factory.role_assignments
274-
275-
if cmd.supported_api_version(min_api='2018-01-01-preview', resource_type=ResourceType.MGMT_AUTHORIZATION):
276-
for i in assignments_client.list_for_scope(scope=scope, filter='atScope()'):
277-
if i.scope == scope and i.role_definition_id.endswith(CONST_NETWORK_CONTRIBUTOR_ROLE_ID):
278-
return True
262+
for i in assignments_client.list_for_scope(scope=scope, filter='atScope()'):
263+
if i.scope == scope and i.role_definition_id.endswith(CONST_NETWORK_CONTRIBUTOR_ROLE_ID):
264+
return True
279265
return False
280266

281267

src/azure-cli/azure/cli/command_modules/aro/tests/latest/recordings/test_aro_public_cluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,7 +1280,7 @@ interactions:
12801280
User-Agent:
12811281
- AZURECLI/2.65.0 azsdk-python-core/1.31.0 Python/3.11.9 (macOS-14.7-x86_64-i386-64bit)
12821282
method: GET
1283-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_aro000001/providers/Microsoft.Network/virtualNetworks/dev-vnet/providers/Microsoft.Authorization/permissions?api-version=2015-07-01
1283+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_aro000001/providers/Microsoft.Network/virtualNetworks/dev-vnet/providers/Microsoft.Authorization/permissions?api-version=2022-05-01-preview
12841284
response:
12851285
body:
12861286
string: '{"value":[{"actions":["*/read","Microsoft.Authorization/*","Microsoft.Support/*"],"notActions":[]},{"actions":["*"],"notActions":["Microsoft.Authorization/*/Delete","Microsoft.Authorization/*/Write","Microsoft.Authorization/elevateAccess/Action","Microsoft.Blueprint/blueprintAssignments/write","Microsoft.Blueprint/blueprintAssignments/delete","Microsoft.Compute/galleries/share/action","Microsoft.Purview/consents/write","Microsoft.Purview/consents/delete","Microsoft.Resources/deploymentStacks/manageDenySetting/action"]}]}'
@@ -2117,7 +2117,7 @@ interactions:
21172117
User-Agent:
21182118
- AZURECLI/2.65.0 azsdk-python-core/1.31.0 Python/3.11.9 (macOS-14.7-x86_64-i386-64bit)
21192119
method: GET
2120-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_aro000001/providers/Microsoft.Network/virtualNetworks/dev-vnet/providers/Microsoft.Authorization/permissions?api-version=2015-07-01
2120+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_aro000001/providers/Microsoft.Network/virtualNetworks/dev-vnet/providers/Microsoft.Authorization/permissions?api-version=2022-05-01-preview
21212121
response:
21222122
body:
21232123
string: '{"value":[{"actions":["*/read","Microsoft.Authorization/*","Microsoft.Support/*"],"notActions":[]},{"actions":["*"],"notActions":["Microsoft.Authorization/*/Delete","Microsoft.Authorization/*/Write","Microsoft.Authorization/elevateAccess/Action","Microsoft.Blueprint/blueprintAssignments/write","Microsoft.Blueprint/blueprintAssignments/delete","Microsoft.Compute/galleries/share/action","Microsoft.Purview/consents/write","Microsoft.Purview/consents/delete","Microsoft.Resources/deploymentStacks/manageDenySetting/action"]}]}'

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3153,10 +3153,7 @@ def list_provider_permissions(cmd, resource_provider_namespace):
31533153

31543154

31553155
def show_provider_operations(cmd, resource_provider_namespace):
3156-
version = getattr(get_api_version(cmd.cli_ctx, ResourceType.MGMT_AUTHORIZATION), 'provider_operations_metadata')
31573156
auth_client = _authorization_management_client(cmd.cli_ctx)
3158-
if version == '2015-07-01':
3159-
return auth_client.provider_operations_metadata.get(resource_provider_namespace, api_version=version)
31603157
return auth_client.provider_operations_metadata.get(resource_provider_namespace)
31613158

31623159

0 commit comments

Comments
 (0)