Skip to content
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

Jump to bottom

{PolicyInsights} Fix #26716: Fix bug that caused invalid subscription id in request uri #26952

Merged
merged 3 commits into from
Jul 21, 2023
Merged

{PolicyInsights} Fix #26716: Fix bug that caused invalid subscription id in request uri #26952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c675e07
Added bugfix
samarthlakhotia Jul 20, 2023
5c1afda
Style fix
samarthlakhotia Jul 21, 2023
ecd9b81
Update src/azure-cli/setup.py
samarthlakhotia Jul 21, 2023
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
108 changes: 62 additions & 46 deletions src/azure-cli/azure/cli/command_modules/policyinsights/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def list_policy_events(
filter_clause=None,
apply_clause=None):

from azure.mgmt.policyinsights.models import QueryOptions
from azure.mgmt.policyinsights.models import QueryOptions, PolicyEventsResourceType

query_options = QueryOptions(
top=top_value,
Expand All @@ -46,25 +46,29 @@ def list_policy_events(
if policy_assignment_name:
if resource_group_name:
events = client.list_query_results_for_resource_group_level_policy_assignment(
subscription_id,
resource_group_name,
policy_assignment_name,
query_options)
subscription_id=subscription_id,
resource_group_name=resource_group_name,
policy_assignment_name=policy_assignment_name,
query_options=query_options,
policy_events_resource=PolicyEventsResourceType.DEFAULT)
else:
events = client.list_query_results_for_subscription_level_policy_assignment(
subscription_id,
policy_assignment_name,
query_options)
subscription_id=subscription_id,
policy_assignment_name=policy_assignment_name,
query_options=query_options,
policy_events_resource=PolicyEventsResourceType.DEFAULT)
elif policy_definition_name:
events = client.list_query_results_for_policy_definition(
subscription_id,
policy_definition_name,
query_options)
subscription_id=subscription_id,
policy_definition_name=policy_definition_name,
query_options=query_options,
policy_events_resource=PolicyEventsResourceType.DEFAULT)
elif policy_set_definition_name:
events = client.list_query_results_for_policy_set_definition(
subscription_id,
policy_set_definition_name,
query_options)
subscription_id=subscription_id,
policy_set_definition_name=policy_set_definition_name,
query_options=query_options,
policy_events_resource=PolicyEventsResourceType.DEFAULT)
elif resource:
if not is_valid_resource_id(resource):
if resource_type_parent:
Expand All @@ -79,21 +83,25 @@ def list_policy_events(
type=resource_type,
name=resource)
events = client.list_query_results_for_resource(
resource,
query_options)
resource_id=resource,
query_options=query_options,
policy_events_resource=PolicyEventsResourceType.DEFAULT)
elif resource_group_name:
events = client.list_query_results_for_resource_group(
subscription_id,
resource_group_name,
query_options)
subscription_id=subscription_id,
resource_group_name=resource_group_name,
query_options=query_options,
policy_events_resource=PolicyEventsResourceType.DEFAULT)
elif management_group_name:
events = client.list_query_results_for_management_group(
management_group_name,
query_options)
management_group_name=management_group_name,
query_options=query_options,
policy_events_resource=PolicyEventsResourceType.DEFAULT)
else:
events = client.list_query_results_for_subscription(
subscription_id,
query_options)
subscription_id=subscription_id,
query_options=query_options,
policy_events_resource=PolicyEventsResourceType.DEFAULT)

return events

Expand Down Expand Up @@ -218,7 +226,7 @@ def summarize_policy_states(
top_value=None,
filter_clause=None):

from azure.mgmt.policyinsights.models import QueryOptions
from azure.mgmt.policyinsights.models import QueryOptions, PolicyStatesSummaryResourceType

query_options = QueryOptions(
top=top_value,
Expand All @@ -231,25 +239,29 @@ def summarize_policy_states(
if policy_assignment_name:
if resource_group_name:
summary = client.summarize_for_resource_group_level_policy_assignment(
subscription_id,
resource_group_name,
policy_assignment_name,
query_options)
subscription_id=subscription_id,
resource_group_name=resource_group_name,
policy_assignment_name=policy_assignment_name,
query_options=query_options,
policy_states_summary_resource=PolicyStatesSummaryResourceType.LATEST)
else:
summary = client.summarize_for_subscription_level_policy_assignment(
subscription_id,
policy_assignment_name,
query_options)
subscription_id=subscription_id,
policy_assignment_name=policy_assignment_name,
query_options=query_options,
policy_states_summary_resource=PolicyStatesSummaryResourceType.LATEST)
elif policy_definition_name:
summary = client.summarize_for_policy_definition(
subscription_id,
policy_definition_name,
query_options)
subscription_id=subscription_id,
policy_definition_name=policy_definition_name,
query_options=query_options,
policy_states_summary_resource=PolicyStatesSummaryResourceType.LATEST)
elif policy_set_definition_name:
summary = client.summarize_for_policy_set_definition(
subscription_id,
policy_set_definition_name,
query_options)
subscription_id=subscription_id,
policy_set_definition_name=policy_set_definition_name,
query_options=query_options,
policy_states_summary_resource=PolicyStatesSummaryResourceType.LATEST)
elif resource:
resource = _build_resource_id(
subscription_id,
Expand All @@ -259,21 +271,25 @@ def summarize_policy_states(
resource_type_parent,
resource_type)
summary = client.summarize_for_resource(
resource,
query_options)
resource_id=resource,
query_options=query_options,
policy_states_summary_resource=PolicyStatesSummaryResourceType.LATEST)
elif resource_group_name:
summary = client.summarize_for_resource_group(
subscription_id,
resource_group_name,
query_options)
subscription_id=subscription_id,
resource_group_name=resource_group_name,
query_options=query_options,
policy_states_summary_resource=PolicyStatesSummaryResourceType.LATEST)
elif management_group_name:
summary = client.summarize_for_management_group(
management_group_name,
query_options)
management_group_name=management_group_name,
query_options=query_options,
policy_states_summary_resource=PolicyStatesSummaryResourceType.LATEST)
else:
summary = client.summarize_for_subscription(
subscription_id,
query_options)
subscription_id=subscription_id,
query_options=query_options,
policy_states_summary_resource=PolicyStatesSummaryResourceType.LATEST)

return summary.value[0]

Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.Darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ azure-mgmt-media==9.0.0
azure-mgmt-monitor==5.0.0
azure-mgmt-msi==7.0.0
azure-mgmt-netapp==10.0.0
azure-mgmt-policyinsights==1.1.0b2
azure-mgmt-policyinsights==1.1.0b4
azure-mgmt-privatedns==1.0.0
azure-mgmt-rdbms==10.2.0b10
azure-mgmt-recoveryservices==2.4.0
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.Linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ azure-mgmt-media==9.0.0
azure-mgmt-monitor==5.0.0
azure-mgmt-msi==7.0.0
azure-mgmt-netapp==10.0.0
azure-mgmt-policyinsights==1.1.0b2
azure-mgmt-policyinsights==1.1.0b4
azure-mgmt-privatedns==1.0.0
azure-mgmt-rdbms==10.2.0b10
azure-mgmt-recoveryservices==2.4.0
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ azure-mgmt-media==9.0.0
azure-mgmt-monitor==5.0.0
azure-mgmt-msi==7.0.0
azure-mgmt-netapp==10.0.0
azure-mgmt-policyinsights==1.1.0b2
azure-mgmt-policyinsights==1.1.0b4
azure-mgmt-privatedns==1.0.0
azure-mgmt-rdbms==10.2.0b10
azure-mgmt-recoveryservices==2.4.0
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
'azure-mgmt-monitor~=5.0.0',
'azure-mgmt-msi~=7.0.0',
'azure-mgmt-netapp~=10.0.0',
'azure-mgmt-policyinsights~=1.1.0b2',
'azure-mgmt-policyinsights==1.1.0b4',
'azure-mgmt-privatedns~=1.0.0',
'azure-mgmt-rdbms~=10.2.0b10',
'azure-mgmt-recoveryservicesbackup~=6.0.0',
Expand Down