resolve merge conflicts

Author: johnsonaj

.changelog/37286.txt

@@ -0,0 +1,3 @@
+```release-note:new-data-source
+aws_rds_global_cluster
+```

.changelog/42829.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_lambda_function: Reset non-API attributes (`source_code_hash`, `s3_bucket`, `s3_key`, `s3_object_version` and `filename`) to their previous values when an update operation fails
+```

.changelog/44302.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_bedrockagentcore_api_key_credential_provider
+```

.changelog/44303.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_bedrockagentcore_browser
+```

.changelog/44542.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_ec2_transit_gateway_route_table_propagation.test: Fix bug causing `inconsistent final plan` errors
+```

.changelog/44604.txt

@@ -0,0 +1,9 @@
+```release-note:enhancement
+resource/aws_launch_template: Update EBS `throughput` maximum validation from 1000 to 2000 MiB/s for gp3 volumes
+```
+```release-note:enhancement
+resource/aws_imagebuilder_container_recipe: Update EBS `throughput` maximum validation from 1000 to 2000 MiB/s for gp3 volumes
+```
+```release-note:enhancement
+resource/aws_imagebuilder_image_recipe: Update EBS `throughput` maximum validation from 1000 to 2000 MiB/s for gp3 volumes
+```

.changelog/44609.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_vpc: Adds List support
+```

.changelog/44622.txt

@@ -0,0 +1,3 @@
+```release-note:new-data-source
+aws_vpn_connection
+```

.changelog/44638.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_quicksight_account_subscription: Add `admin_pro_group`, `author_pro_group`, and `reader_pro_group` arguments
+```
+
+```release-note:note
+resource/aws_quicksight_account_subscription: Because we cannot easily test all this functionality, it is best effort and we ask for community help in testing
+```

.ci/semgrep/tflog/tflog.go

@@ -0,0 +1,46 @@
+package main
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-log/tflog"
+)
+
+func noAssignment() {
+	ctx := context.Background()
+
+	// ruleid: setfield-without-assign
+	tflog.SetField(ctx, "field", "value")
+}
+
+func assigned() {
+	ctx := context.Background()
+
+	// ok: setfield-without-assign
+	ctx = tflog.SetField(ctx, "field", "value")
+}
+
+func returnedContext() context.Context {
+	ctx := context.Background()
+
+	// ok: setfield-without-assign
+	return tflog.SetField(ctx, "field", "value")
+}
+
+func declareAndAssign_SameName() {
+	ctx := context.Background()
+
+	for i := 0; i < 1; i++ {
+		// ok: setfield-without-assign
+		ctx := tflog.SetField(ctx, "field", "value")
+	}
+}
+
+func declareAndAssign_Rename() {
+	outerCtx := context.Background()
+
+	for i := 0; i < 1; i++ {
+		// ok: setfield-without-assign
+		innerCtx := tflog.SetField(outerCtx, "field", "value")
+	}
+}