Applied change suggestions

Author: thenom

internal/service/bedrockagentcore/online_evaluation_config.go

@@ -344,7 +344,7 @@ func (r *onlineEvaluationConfigResource) Read(ctx context.Context, request resou
 		return
 	}
 
-	smerr.AddEnrich(ctx, &response.Diagnostics, r.flatten(ctx, out, &data))
+	smerr.AddEnrich(ctx, &response.Diagnostics, fwflex.Flatten(ctx, out, &data))
 	if response.Diagnostics.HasError() {
 		return
 	}
@@ -423,12 +423,6 @@ func (r *onlineEvaluationConfigResource) Delete(ctx context.Context, request res
 	}
 }
 
-func (r *onlineEvaluationConfigResource) flatten(ctx context.Context, onlineEvaluationConfig *bedrockagentcorecontrol.GetOnlineEvaluationConfigOutput, data *onlineEvaluationConfigResourceModel) diag.Diagnostics {
-	var diags diag.Diagnostics
-	diags.Append(fwflex.Flatten(ctx, onlineEvaluationConfig, data)...)
-	return diags
-}
-
 // Waiters.
 
 func waitOnlineEvaluationConfigCreated(ctx context.Context, conn *bedrockagentcorecontrol.Client, id string, timeout time.Duration) (*bedrockagentcorecontrol.GetOnlineEvaluationConfigOutput, error) {

internal/service/bedrockagentcore/online_evaluation_config_list.go

@@ -15,6 +15,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag"
 	"github.com/hashicorp/terraform-provider-aws/internal/framework"
+	fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex"
 	"github.com/hashicorp/terraform-provider-aws/internal/logging"
 	"github.com/hashicorp/terraform-provider-aws/internal/smerr"
 	inttypes "github.com/hashicorp/terraform-provider-aws/internal/types"
@@ -69,7 +70,7 @@ func (l *onlineEvaluationConfigListResource) List(ctx context.Context, request l
 			var data onlineEvaluationConfigResourceModel
 
 			l.SetResult(ctx, l.Meta(), request.IncludeResource, &data, &result, func() {
-				smerr.AddEnrich(ctx, &result.Diagnostics, l.flatten(ctx, output, &data))
+				smerr.AddEnrich(ctx, &result.Diagnostics, fwflex.Flatten(ctx, output, &data))
 				if result.Diagnostics.HasError() {
 					return
 				}

internal/service/bedrockagentcore/online_evaluation_config_test.go

@@ -242,6 +242,11 @@ func TestAccBedrockAgentCoreOnlineEvaluationConfig_update(t *testing.T) {
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
 					},
 				},
+				ConfigStateChecks: []statecheck.StateCheck{
+					statecheck.ExpectKnownValue(resourceName, tfjsonpath.New(names.AttrDescription), knownvalue.StringExact("Updated description")),
+					statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("rule").AtSliceIndex(0).AtMapKey("sampling_config").AtSliceIndex(0).AtMapKey("sampling_percentage"), knownvalue.Float64Exact(50.0)),
+					statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("rule").AtSliceIndex(0).AtMapKey("session_config").AtSliceIndex(0).AtMapKey("session_timeout_minutes"), knownvalue.Int64Exact(30)),
+				},
 			},
 		},
 	})
@@ -325,6 +330,12 @@ func TestAccBedrockAgentCoreOnlineEvaluationConfig_filters(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckOnlineEvaluationConfigExists(ctx, t, resourceName, &v),
 				),
+				ConfigStateChecks: []statecheck.StateCheck{
+					statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("rule").AtSliceIndex(0).AtMapKey("filter").AtSliceIndex(0).AtMapKey("key"), knownvalue.StringExact("environment")),
+					statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("rule").AtSliceIndex(0).AtMapKey("filter").AtSliceIndex(0).AtMapKey("operator"), knownvalue.StringExact("Equals")),
+					statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("rule").AtSliceIndex(0).AtMapKey("sampling_config").AtSliceIndex(0).AtMapKey("sampling_percentage"), knownvalue.Float64Exact(25.0)),
+					statecheck.ExpectKnownValue(resourceName, tfjsonpath.New("rule").AtSliceIndex(0).AtMapKey("session_config").AtSliceIndex(0).AtMapKey("session_timeout_minutes"), knownvalue.Int64Exact(20)),
+				},
 			},
 		},
 	})