resolve merge conflicts

Author: johnsonaj

.changelog/44304.txt

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

CHANGELOG.md

@@ -7,8 +7,11 @@ NOTES:
 FEATURES:
 
 * **New Data Source:** `aws_rds_global_cluster` ([#37286](https://github.com/hashicorp/terraform-provider-aws/issues/37286))
+* **New Data Source:** `aws_vpn_connection` ([#44622](https://github.com/hashicorp/terraform-provider-aws/issues/44622))
 * **New Resource:** `aws_bedrockagentcore_agent_runtime` ([#44301](https://github.com/hashicorp/terraform-provider-aws/issues/44301))
 * **New Resource:** `aws_bedrockagentcore_agent_runtime_endpoint` ([#44301](https://github.com/hashicorp/terraform-provider-aws/issues/44301))
+* **New Resource:** `aws_bedrockagentcore_api_key_credential_provider` ([#44302](https://github.com/hashicorp/terraform-provider-aws/issues/44302))
+* **New Resource:** `aws_bedrockagentcore_browser` ([#44303](https://github.com/hashicorp/terraform-provider-aws/issues/44303))
 
 ENHANCEMENTS:
 
@@ -21,6 +24,7 @@ ENHANCEMENTS:
 BUG FIXES:
 
 * resource/aws_ec2_transit_gateway_route_table_propagation.test: Fix bug causing `inconsistent final plan` errors ([#44542](https://github.com/hashicorp/terraform-provider-aws/issues/44542))
+* 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 ([#42829](https://github.com/hashicorp/terraform-provider-aws/issues/42829))
 
 ## 6.16.0 (October 9, 2025)
 

go.mod

@@ -33,17 +33,17 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/applicationsignals v1.16.0
 	github.com/aws/aws-sdk-go-v2/service/appmesh v1.34.6
 	github.com/aws/aws-sdk-go-v2/service/apprunner v1.38.7
-	github.com/aws/aws-sdk-go-v2/service/appstream v1.49.7
+	github.com/aws/aws-sdk-go-v2/service/appstream v1.50.0
 	github.com/aws/aws-sdk-go-v2/service/appsync v1.51.6
 	github.com/aws/aws-sdk-go-v2/service/arcregionswitch v1.2.8
 	github.com/aws/aws-sdk-go-v2/service/athena v1.55.6
 	github.com/aws/aws-sdk-go-v2/service/auditmanager v1.45.6
 	github.com/aws/aws-sdk-go-v2/service/autoscaling v1.59.3
 	github.com/aws/aws-sdk-go-v2/service/autoscalingplans v1.29.5
-	github.com/aws/aws-sdk-go-v2/service/backup v1.48.0
+	github.com/aws/aws-sdk-go-v2/service/backup v1.49.0
 	github.com/aws/aws-sdk-go-v2/service/batch v1.57.10
 	github.com/aws/aws-sdk-go-v2/service/bcmdataexports v1.11.8
-	github.com/aws/aws-sdk-go-v2/service/bedrock v1.47.2
+	github.com/aws/aws-sdk-go-v2/service/bedrock v1.48.0
 	github.com/aws/aws-sdk-go-v2/service/bedrockagent v1.50.6
 	github.com/aws/aws-sdk-go-v2/service/bedrockagentcorecontrol v1.10.0
 	github.com/aws/aws-sdk-go-v2/service/billing v1.8.0
@@ -79,7 +79,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/comprehend v1.40.6
 	github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.47.5
 	github.com/aws/aws-sdk-go-v2/service/configservice v1.58.2
-	github.com/aws/aws-sdk-go-v2/service/connect v1.141.0
+	github.com/aws/aws-sdk-go-v2/service/connect v1.142.0
 	github.com/aws/aws-sdk-go-v2/service/connectcases v1.32.0
 	github.com/aws/aws-sdk-go-v2/service/controltower v1.26.6
 	github.com/aws/aws-sdk-go-v2/service/costandusagereportservice v1.33.6
@@ -91,20 +91,20 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/dataexchange v1.39.6
 	github.com/aws/aws-sdk-go-v2/service/datapipeline v1.30.5
 	github.com/aws/aws-sdk-go-v2/service/datasync v1.55.0
-	github.com/aws/aws-sdk-go-v2/service/datazone v1.42.0
+	github.com/aws/aws-sdk-go-v2/service/datazone v1.43.0
 	github.com/aws/aws-sdk-go-v2/service/dax v1.29.1
 	github.com/aws/aws-sdk-go-v2/service/detective v1.37.7
 	github.com/aws/aws-sdk-go-v2/service/devicefarm v1.35.6
 	github.com/aws/aws-sdk-go-v2/service/devopsguru v1.39.6
 	github.com/aws/aws-sdk-go-v2/service/directconnect v1.37.6
 	github.com/aws/aws-sdk-go-v2/service/directoryservice v1.38.0
 	github.com/aws/aws-sdk-go-v2/service/dlm v1.34.6
-	github.com/aws/aws-sdk-go-v2/service/docdb v1.46.6
+	github.com/aws/aws-sdk-go-v2/service/docdb v1.47.0
 	github.com/aws/aws-sdk-go-v2/service/docdbelastic v1.19.6
 	github.com/aws/aws-sdk-go-v2/service/drs v1.35.6
 	github.com/aws/aws-sdk-go-v2/service/dsql v1.9.8
 	github.com/aws/aws-sdk-go-v2/service/dynamodb v1.51.0
-	github.com/aws/aws-sdk-go-v2/service/ec2 v1.255.0
+	github.com/aws/aws-sdk-go-v2/service/ec2 v1.257.0
 	github.com/aws/aws-sdk-go-v2/service/ecr v1.50.5
 	github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.37.6
 	github.com/aws/aws-sdk-go-v2/service/ecs v1.65.1
@@ -113,7 +113,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/elasticache v1.50.5
 	github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.7
 	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.33.6
-	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.6
+	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.51.0
 	github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.37.6
 	github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.32.6
 	github.com/aws/aws-sdk-go-v2/service/emr v1.54.5
@@ -134,7 +134,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/grafana v1.31.6
 	github.com/aws/aws-sdk-go-v2/service/greengrass v1.32.6
 	github.com/aws/aws-sdk-go-v2/service/groundstation v1.37.6
-	github.com/aws/aws-sdk-go-v2/service/guardduty v1.64.3
+	github.com/aws/aws-sdk-go-v2/service/guardduty v1.65.0
 	github.com/aws/aws-sdk-go-v2/service/healthlake v1.35.5
 	github.com/aws/aws-sdk-go-v2/service/iam v1.47.7
 	github.com/aws/aws-sdk-go-v2/service/identitystore v1.32.7
@@ -161,7 +161,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/lexmodelbuildingservice v1.33.5
 	github.com/aws/aws-sdk-go-v2/service/lexmodelsv2 v1.56.6
 	github.com/aws/aws-sdk-go-v2/service/licensemanager v1.36.6
-	github.com/aws/aws-sdk-go-v2/service/lightsail v1.49.1
+	github.com/aws/aws-sdk-go-v2/service/lightsail v1.50.0
 	github.com/aws/aws-sdk-go-v2/service/location v1.49.6
 	github.com/aws/aws-sdk-go-v2/service/lookoutmetrics v1.36.6
 	github.com/aws/aws-sdk-go-v2/service/m2 v1.25.6
@@ -197,7 +197,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/pinpoint v1.39.6
 	github.com/aws/aws-sdk-go-v2/service/pinpointsmsvoicev2 v1.25.5
 	github.com/aws/aws-sdk-go-v2/service/pipes v1.23.5
-	github.com/aws/aws-sdk-go-v2/service/polly v1.53.6
+	github.com/aws/aws-sdk-go-v2/service/polly v1.53.7
 	github.com/aws/aws-sdk-go-v2/service/pricing v1.39.6
 	github.com/aws/aws-sdk-go-v2/service/qbusiness v1.33.6
 	github.com/aws/aws-sdk-go-v2/service/qldb v1.30.6
@@ -256,11 +256,11 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/swf v1.32.5
 	github.com/aws/aws-sdk-go-v2/service/synthetics v1.41.0
 	github.com/aws/aws-sdk-go-v2/service/taxsettings v1.16.6
-	github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.16.6
+	github.com/aws/aws-sdk-go-v2/service/timestreaminfluxdb v1.17.0
 	github.com/aws/aws-sdk-go-v2/service/timestreamquery v1.35.5
 	github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.35.5
-	github.com/aws/aws-sdk-go-v2/service/transcribe v1.52.6
-	github.com/aws/aws-sdk-go-v2/service/transfer v1.66.0
+	github.com/aws/aws-sdk-go-v2/service/transcribe v1.53.0
+	github.com/aws/aws-sdk-go-v2/service/transfer v1.67.0
 	github.com/aws/aws-sdk-go-v2/service/verifiedpermissions v1.29.5
 	github.com/aws/aws-sdk-go-v2/service/vpclattice v1.19.0
 	github.com/aws/aws-sdk-go-v2/service/waf v1.30.5