Merge pull request #40304 from hashicorp/td-bedrock-guardrail-policy-…

…sets resource/aws_bedrock_guardrail: Convert `content_policy_config.filters_config` to Set
hashicorp · Nov 26, 2024 · dff0abb · dff0abb
2 parents 523ac85 + cb58eb0
commit dff0abb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/.changelog/40304.txt b/.changelog/40304.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_bedrock_guardrail: Fix perpetual diff if multiple `content_policy_config.filters_config`s are specified.
+```
diff --git a/internal/service/bedrock/guardrail.go b/internal/service/bedrock/guardrail.go
@@ -135,8 +135,8 @@ func (r *resourceGuardrail) Schema(ctx context.Context, req resource.SchemaReque
 				},
 				NestedObject: schema.NestedBlockObject{
 					Blocks: map[string]schema.Block{
-						"filters_config": schema.ListNestedBlock{
-							CustomType: fwtypes.NewListNestedObjectTypeOf[filtersConfig](ctx),
+						"filters_config": schema.SetNestedBlock{
+							CustomType: fwtypes.NewSetNestedObjectTypeOf[filtersConfig](ctx),
 							NestedObject: schema.NestedBlockObject{
 								Attributes: map[string]schema.Attribute{
 									"input_strength": schema.StringAttribute{
@@ -667,7 +667,7 @@ type resourceGuardrailData struct {
 }
 
 type contentPolicyConfig struct {
-	Filters fwtypes.ListNestedObjectValueOf[filtersConfig] `tfsdk:"filters_config"`
+	Filters fwtypes.SetNestedObjectValueOf[filtersConfig] `tfsdk:"filters_config"`
 }
 
 type filtersConfig struct {

diff --git a/internal/service/bedrock/guardrail_test.go b/internal/service/bedrock/guardrail_test.go
@@ -47,6 +47,8 @@ func TestAccBedrockGuardrail_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "blocked_outputs_messaging", "test"),
 					resource.TestCheckResourceAttr(resourceName, "content_policy_config.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "content_policy_config.0.filters_config.#", "2"),
+					resource.TestCheckResourceAttr(resourceName, "contextual_grounding_policy_config.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "contextual_grounding_policy_config.0.filters_config.#", "1"),
 					resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt),
 					resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test"),
 					resource.TestCheckNoResourceAttr(resourceName, names.AttrKMSKeyARN),

diff --git a/website/docs/r/bedrock_guardrail.html.markdown b/website/docs/r/bedrock_guardrail.html.markdown
@@ -86,7 +86,8 @@ The following arguments are optional:
 
 The `content_policy_config` configuration block supports the following arguments:
 
-* `filters_config` - (Optional) List of content filter configs in content policy. See [Filters Config](#content-filters-config) for more information.
+* `filters_config` - (Optional) Set of content filter configs in content policy.
+  See [Filters Config](#content-filters-config) for more information.
 
 #### Content Filters Config