Skip to content

Commit

Permalink
azurerm_policy_set_definition/azurerm_policy_definition - Reverse…
Browse files Browse the repository at this point in the history
… the order of policies lookup to favour builtin (#18338)
  • Loading branch information
Nepomuceno committed Oct 28, 2022
1 parent acddae7 commit c87c3bf
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions internal/services/policy/policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ func getPolicyDefinitionByDisplayName(ctx context.Context, client *policy.Defini

func getPolicyDefinitionByName(ctx context.Context, client *policy.DefinitionsClient, name, managementGroupName string) (res policy.Definition, err error) {
if managementGroupName == "" {
res, err = client.Get(ctx, name)
res, err = client.GetBuiltIn(ctx, name)
if utils.ResponseWasNotFound(res.Response) {
res, err = client.GetBuiltIn(ctx, name)
res, err = client.Get(ctx, name)
}
} else {
res, err = client.GetAtManagementGroup(ctx, name, managementGroupName)
Expand All @@ -63,9 +63,9 @@ func getPolicyDefinitionByName(ctx context.Context, client *policy.DefinitionsCl

func getPolicySetDefinitionByName(ctx context.Context, client *policy.SetDefinitionsClient, name, managementGroupID string) (res policy.SetDefinition, err error) {
if managementGroupID == "" {
res, err = client.Get(ctx, name)
res, err = client.GetBuiltIn(ctx, name)
if utils.ResponseWasNotFound(res.Response) {
res, err = client.GetBuiltIn(ctx, name)
res, err = client.Get(ctx, name)
}
} else {
res, err = client.GetAtManagementGroup(ctx, name, managementGroupID)
Expand Down

0 comments on commit c87c3bf

Please sign in to comment.