From 75326822c5576bf121b01e0ce1d04ea072d68dc2 Mon Sep 17 00:00:00 2001 From: Matt White Date: Mon, 6 Jul 2020 22:27:15 +0100 Subject: [PATCH 1/3] Remove incorrect validatefunc --- azurerm/internal/services/policy/policy_remediation_resource.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/azurerm/internal/services/policy/policy_remediation_resource.go b/azurerm/internal/services/policy/policy_remediation_resource.go index d4b4c4c96685..faac3d5af229 100644 --- a/azurerm/internal/services/policy/policy_remediation_resource.go +++ b/azurerm/internal/services/policy/policy_remediation_resource.go @@ -77,8 +77,6 @@ func resourceArmPolicyRemediation() *schema.Resource { Optional: true, // TODO: remove this suppression when github issue https://github.com/Azure/azure-rest-api-specs/issues/8353 is addressed DiffSuppressFunc: suppress.CaseDifference, - // TODO: use the validation function in azurerm_policy_definition when implemented - ValidateFunc: validate.PolicyDefinitionID, }, }, } From d0f7464f6bd609a079fca33ebd7a0862bb46e36e Mon Sep 17 00:00:00 2001 From: Matt White Date: Mon, 6 Jul 2020 22:40:35 +0100 Subject: [PATCH 2/3] Clarify documentation --- website/docs/r/policy_remediation.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/policy_remediation.html.markdown b/website/docs/r/policy_remediation.html.markdown index 35ae6e1ebdcb..f54e3880a500 100644 --- a/website/docs/r/policy_remediation.html.markdown +++ b/website/docs/r/policy_remediation.html.markdown @@ -95,7 +95,7 @@ The following arguments are supported: * `policy_assignment_id` - (Required) The resource ID of the policy assignment that should be remediated. -* `policy_definition_reference_id` - (Optional) The policy definition reference ID of the individual definition that should be remediated. Required when the policy assignment being remediated assigns a policy set definition. +* `policy_definition_reference_id` - (Optional) The policy definition reference ID of the individual definition that should be remediated. Required when the policy assignment being remediated assigns a policy set definition. Note: this is not the resourceId of the policy definition, it is a unique id (within the policy set definition) for this policy definition. * `location_filters` - (Optional) A list of the resource locations that will be remediated. From 517506401d8bd49efcf81f6baf46311a00e865d9 Mon Sep 17 00:00:00 2001 From: Matt White Date: Tue, 7 Jul 2020 08:41:48 +0100 Subject: [PATCH 3/3] Further clarify docs Co-authored-by: Arcturus --- website/docs/r/policy_remediation.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/policy_remediation.html.markdown b/website/docs/r/policy_remediation.html.markdown index f54e3880a500..736e407e20a4 100644 --- a/website/docs/r/policy_remediation.html.markdown +++ b/website/docs/r/policy_remediation.html.markdown @@ -95,7 +95,7 @@ The following arguments are supported: * `policy_assignment_id` - (Required) The resource ID of the policy assignment that should be remediated. -* `policy_definition_reference_id` - (Optional) The policy definition reference ID of the individual definition that should be remediated. Required when the policy assignment being remediated assigns a policy set definition. Note: this is not the resourceId of the policy definition, it is a unique id (within the policy set definition) for this policy definition. +* `policy_definition_reference_id` - (Optional) The unique ID for the policy definition within the policy set definition that should be remediated. Required when the policy assignment being remediated assigns a policy set definition. * `location_filters` - (Optional) A list of the resource locations that will be remediated.