Skip to content

{Role} Remove code for classic events #16581

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
jiasli merged 2 commits into from
Jan 20, 2021
Merged

{Role} Remove code for classic events #16581

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba80fbc
Remove code for classic events
jiasli Jan 19, 2021
adfde21
style
jiasli Jan 19, 2021
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
32 changes: 5 additions & 27 deletions src/azure-cli/azure/cli/command_modules/role/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,25 +316,23 @@ def _get_assignment_events(cli_ctx, start_time=None, end_time=None):
odata_filters = 'resourceProvider eq Microsoft.Authorization and {}'.format(time_filter)

activity_log = list(client.activity_logs.list(filter=odata_filters))
start_events, end_events, offline_events = {}, {}, []
start_events, end_events = {}, {}

for item in activity_log:
if item.http_request:
if item.operation_name.value.startswith('Microsoft.Authorization/roleAssignments'):
if item.status.value == 'Started':
start_events[item.operation_id] = item
else:
end_events[item.operation_id] = item
elif item.event_name and item.event_name.value.lower() == 'classicadministrators':
offline_events.append(item)
return start_events, end_events, offline_events, client
return start_events, end_events


# A custom command around 'monitoring' events to produce understandable output for RBAC audit, a common scenario.
def list_role_assignment_change_logs(cmd, start_time=None, end_time=None): # pylint: disable=too-many-branches
# pylint: disable=too-many-nested-blocks, too-many-statements
result = []
worker = MultiAPIAdaptor(cmd.cli_ctx)
start_events, end_events, offline_events, client = _get_assignment_events(cmd.cli_ctx, start_time, end_time)
start_events, end_events = _get_assignment_events(cmd.cli_ctx, start_time, end_time)

# Use the resource `name` of roleDefinitions as keys, instead of `id`, because `id` can be inherited.
# name: b24988ac-6180-42a0-ab88-20f7382dd24c
Expand All @@ -349,8 +347,7 @@ def list_role_assignment_change_logs(cmd, start_time=None, end_time=None): # py
continue

entry = {}
op = e.operation_name and e.operation_name.value
if (op.lower().startswith('microsoft.authorization/roleassignments') and e.status.value == 'Succeeded'):
if e.status.value == 'Succeeded':
s, payload = start_events[op_id], None
entry = dict.fromkeys(
['principalId', 'principalName', 'scope', 'scopeName', 'scopeType', 'roleDefinitionId', 'roleName'],
Expand Down Expand Up @@ -409,25 +406,6 @@ def list_role_assignment_change_logs(cmd, start_time=None, end_time=None): # py
for e in result:
e['principalName'] = principal_dics.get(e['principalId'], None)

offline_events = [x for x in offline_events if (x.status and x.status.value == 'Succeeded' and x.operation_name and
x.operation_name.value.lower().startswith(
'microsoft.authorization/classicadministrators'))]
for e in offline_events:
entry = {
'timestamp': e.event_timestamp,
'caller': 'Subscription Admin',
'roleDefinitionId': None,
'principalId': None,
'principalType': 'User',
'scope': '/subscriptions/' + client.config.subscription_id,
'scopeType': 'Subscription',
'scopeName': client.config.subscription_id,
}
if e.properties:
entry['principalName'] = e.properties.get('adminEmail')
entry['roleName'] = e.properties.get('adminType')
result.append(entry)

return result


Expand Down