Merge remote-tracking branch 'upstream/main' into f-aws_wafv2_web_acl…

…-custom-response-body

.changelog/10036.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_s3_bucket_object: Existing resource can now be imported
+```

.changelog/10807.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_instance: Add support for configuration with Launch Template
+```

.changelog/10817.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+aws_ec2_host
+```
+
+```release-note:new-data-source
+aws_ec2_host
+```

.changelog/10969.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_cloudformation_stack_set_instance: Retry when `OperationInProgress` errors are returned from the AWS API
+```
+
+```release-note:enhancement
+resource/aws_cloudformation_stack_set: Retry when `OperationInProgress` errors are returned from the AWS API
+```

.changelog/11522.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_s3_bucket_object: Add `source_hash` argument to compliment `etag`'s encryption limitations
+```

.changelog/11795.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_s3_bucket: Retry on `PutBucketEncryption` HTTP 409 errors due to eventual consistency
+```

.changelog/12370.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+aws_rds_cluster_role_association
+```
+
+```release-note:enhancement
+aws_rds_cluster: Set `iam_roles` as Computed to prevent drift when the `aws_rds_cluster_role_association` resource is used
+```

.changelog/12436.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_iam_role: Retry `assume_role_policy` updates for IAM eventual consistency
+```

.changelog/12548.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_db_instance: Ignore allocated_storage for replica at creation time
+```

.changelog/13127.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_spot_fleet_request: Add `on_demand_allocation_strategy`, `on_demand_max_total_price`, and `on_demand_target_capacity` arguments
+```

.changelog/13453.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_route53_record: Support `set_identifier` values containing `_`
+```

.changelog/13474.txt

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

.changelog/13564.txt

@@ -0,0 +1,7 @@
+```release-note:new-data-source
+aws_eks_node_groups
+```
+
+```release-note:new-data-source
+aws_eks_node_group
+```

.changelog/13783.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+aws_dynamodb_tag
+```
+
+```release-note:new-resource
+aws_ecs_tag
+```

.changelog/14627.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_msk_cluster: Don't recreate cluster if order of `broker_node_group_info.client_subnets` or `broker_node_group_info.security_groups` entries change
+```

.changelog/14671.txt

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

.changelog/14714.txt

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

.changelog/15167.txt

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

.changelog/15241.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_guardduty_organization_configuration: Add `datasources` argument
+```

.changelog/15360.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_placement_group: Add `partition_count` argument
+```

.changelog/15661.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_msk_cluster: Add `zookeeper_connect_string_tls` attribute
+```

.changelog/16010.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_rds_cluster_parameter_group: Handle paginated response when reading parameters from RDS cluster parameter group.
+```

.changelog/16373.txt

@@ -0,0 +1,3 @@
+```release-notes:new-resource
+aws_ebs_snapshot_import
+```

.changelog/16471.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_iot_topic_rule: Correctly update resource on `error_action` change
+```

.changelog/16489.txt

@@ -0,0 +1,11 @@
+```release-note:new-resource
+aws_dx_hosted_connection
+```
+
+```release-note:new-resource
+aws_dx_connection_confirmation
+```
+
+```release-note:enhancement
+resource/aws_dx_lag: Add `connection_id` argument
+```

.changelog/16504.txt

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

.changelog/16629.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+aws_elasticache_user
+```
+
+```release-note:new-data-source
+aws_elasticache_user
+```

.changelog/16704.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+data-source/aws_ec2_instance_type_offerings: Add `locations` and `location_types` attributes
+```

.changelog/16709.txt

@@ -0,0 +1,8 @@
+```release-note:new-resource
+aws_connect_instance
+```
+
+```release-note:new-data-source
+aws_connect_instance
+```
+

.changelog/16850.txt

@@ -1,3 +1,3 @@
-```release-notes:enhancement
+```release-note:enhancement
 resource/aws_batch_job_definition: Add `platform_capabilities` attribute
-```
+```

.changelog/16854.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+aws_connect_contact_flow
+```
+
+```release-note:new-data-source
+aws_connect_contact_flow
+```

.changelog/16874.txt

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

.changelog/16908.txt

@@ -1,3 +1,3 @@
-```release-notes:enhancement
+```release-note:enhancement
 resource/aws_instance: Add `capacity_reservation_specification` argument
-```
+```

.changelog/16916.txt

@@ -1,3 +1,3 @@
-```release-notes:enhancement
+```release-note:enhancement
 resource/aws_lakeformation_permissions: Allow `principal` to be an AWS account ID or an IAM group, ou, or organization
-```
+```

.changelog/16942.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_ecs_capacity_provider: Allow updates to the `auto_scaling_group_provider` argument without recreating the resource
+```

.changelog/16961.txt

@@ -1,3 +1,3 @@
-```release-notes:enhancement
+```release-note:enhancement
 resource/aws_route: Add `carrier_gateway_id` attribute
 ```

.changelog/16963.txt

@@ -1,3 +1,3 @@
-```release-notes:enhancement
+```release-note:enhancement
 data-source/aws_route: Add `carrier_gateway_id` attribute
 ```

.changelog/16979.txt

@@ -1,11 +1,11 @@
-```release-notes:enhancement
+```release-note:enhancement
 resource/aws_default_route_table: Add `arn` attribute
 ```
 
-```release-notes:enhancement
+```release-note:enhancement
 resource/aws_route_table: Add `arn` attribute
 ```
 
-```release-notes:enhancement
+```release-note:enhancement
 resource/aws_route_table: Add `carrier_gateway_id` attribute to `route` configuration block
 ```

.changelog/17001.txt

@@ -1,7 +1,7 @@
-```release-notes:enhancement
+```release-note:enhancement
 data-source/aws_route_table: Add `arn` attribute
 ```
 
-```release-notes:enhancement
+```release-note:enhancement
 data-source/aws_route_table: Add `carrier_gateway_id` attribute to `routes` list
 ```

.changelog/17046.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+data-source/aws_ec2_coip_pool: Add `arn` attribute
+```

.changelog/17111.txt

@@ -0,0 +1,19 @@
+```release-note:bug
+resource/aws_rds_cluster_instance: Remove force new resource on the `engine_version` parameter to allow upgrade without remove instances
+```
+
+```release-note:enhancement
+resource/aws_rds_cluster: Add `db_instance_parameter_group_name` attribute to allow major version upgrade using custom parameter groups
+```
+
+```release-note:enhancement
+resource/rds_cluster_instance: Add `performance_insights_retention_period` attribute
+```
+
+```release-note:bug
+resource/aws_rds_cluster: Add possible pending states for cluster update
+```
+
+```release-note:enhancement
+resource/aws_rds_cluster: Add `enable_global_write_forwarding` attribute
+```

.changelog/17151.txt

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

.changelog/17295.txt

@@ -1,3 +1,3 @@
-```release-notes:enhancement
+```release-note:enhancement
 data-source/aws_route: Add `destination_prefix_list_id` attribute
 ```

.changelog/17298.txt

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

.changelog/17319.txt

@@ -1,8 +1,8 @@
-```release-notes:enhancement
+```release-note:enhancement
 resource/aws_default_route_table: Add `destination_prefix_list_id` attribute
 ```
 
-```release-notes:enhancement
+```release-note:enhancement
 resource/aws_route_table: Add `destination_prefix_list_id` attribute
 ```
 
@@ -16,4 +16,4 @@ resource/aws_route_table: Improve eventual consistency handling and handling of
 
 ```release-note:bug
 resource/aws_route_table_association: Improve eventual consistency handling and handling of out-of-band resource removal
-```
+```

.changelog/17347.txt

@@ -1,3 +1,3 @@
-```release-notes:enhancement
+```release-note:enhancement
 data-source/aws_route_table: Add `destination_prefix_list_id` attribute
 ```

.changelog/17498.txt

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

.changelog/17539.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_transfer_server: Add `security_group_ids` argument to `endpoint_details` configuration block.
+```

.changelog/17591.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_dms_endpoint: Add `s3_settings.data_format`, `s3_settings.parquet_timestamp_in_millisecond`, `s3_settings.parquet_version`, `s3_settings.encryption_mode` and `s3_settings.server_side_encryption_kms_key_id` arguments.
+```

.changelog/17655.txt

@@ -1,3 +1,3 @@
-```release-notes:note
+```release-note:note
 provider: The default development, testing and building of the Terraform AWS Provider is now done with Go 1.16. This version of Go adds support for `darwin/arm64` (Apple Silicon) but deprecates support for macOS 10.12 (Sierra).
 ```

.changelog/17706.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_emr_cluster: Add `log_encryption_kms_key_id` argument
+```

.changelog/17726.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_msk_cluster: Configurable Create, Update and Delete timeouts
+```

.changelog/17754.txt

@@ -1,3 +1,3 @@
-``release-note:bug
+```release-note:bug
 resource/aws_cloudwatch_event_archive: Fix retention_days type conversion on creation
 ```

.changelog/17852.txt

@@ -0,0 +1,19 @@
+```release-note:new-data-source
+aws_dx_connection
+```
+
+```release-note:enhancement
+resource/aws_dx_connection: Add `owner_account_id` attribute
+```
+
+```release-note:enhancement
+resource/aws_dx_lag: Add `owner_account_id` attribute
+```
+
+```release-note:enhancement
+resource/aws_dx_connection: Add `provider_name` argument
+```
+
+```release-note:enhancement
+resource/aws_dx_lag: Add `provider_name` argument
+```

.changelog/17859.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+data-source/aws_instance: Add `ipv6_addresses` attribute
+```

.changelog/17864.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_db_instance: Add `customer_owned_ip_enabled` argument
+```

.changelog/17897.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_ec2_client_vpn_endpoint: Add `self_service_portal` and `authentication_options.self_service_saml_provider_arn` arguments to support self-service portal
+```

.changelog/17959.txt

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

.changelog/17987.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_autoscalingplans_scaling_plan: Fix updates to `scaling_instruction` argument
+```

.changelog/17991.txt

@@ -0,0 +1,4 @@
+
+```release-note:enhancement
+resource/aws_db_instance: Add `replica_mode` argument
+```