Merge branch 'main' into HEAD

.actrc

@@ -0,0 +1,2 @@
+# Needed for testing our workflows
+-P ubuntu-latest=nektos/act-environments-ubuntu:18.04

.changelog/10036.txt

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

.changelog/10213.txt

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

.changelog/10498.txt

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

.changelog/10539.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_cloudformation_stack: Avoid conflicts with `on_failure` and `disable_rollback`
+```

.changelog/10693.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_lb: Update `name` and `name_prefix` plan-time validation to exclude `"internal-"`
+```

.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/11229.txt

@@ -0,0 +1,11 @@
+```release-note:enhancement
+resource/aws_kinesis_firehose_delivery_stream: Add `error_output_prefix` argument to `s3_configuration` configuration block
+```
+
+```release-note:enhancement
+resource/aws_kinesis_firehose_delivery_stream: Add `error_output_prefix` argument to `redshift_configuration` `s3_backup_configuration` configuration block
+```
+
+```release-note:enhancement
+resource/aws_kinesis_firehose_delivery_stream: Add `error_output_prefix` argument to `extended_s3_configuration` `s3_backup_configuration` configuration block
+```

.changelog/11487.txt

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

.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/11560.txt

@@ -0,0 +1,11 @@
+```release-note:new-resource
+aws_gamelift_script
+```
+
+```release-note:enhancement
+resource/aws_gamelift_fleet: Adds `script_id` argument.
+```
+
+```release-note:enhancement
+resource/aws_gamelift_fleet: Adds `script_arn` attribute.
+```

.changelog/11600.txt

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

.changelog/11687.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_cloudwatch_log_destination: Add plan time validation to `role_arn`, `name` and `target_arn`.
+```

.changelog/11770.txt

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

.changelog/11772.txt

@@ -0,0 +1,12 @@
+```release-note:enhancement
+resource/aws_ssm_patch_baseline: Adds plan time validation for `name`, `description`, `global_filter.key`, `global_filter.values`,
+`approved_patches`, `rejected_patches`, `approval_rule.approve_after_days`, `approval_rule.patch_filter.key`, and `approval_rule.patch_filter.values`.
+```
+
+```release-note:enhancement
+resource/aws_ssm_patch_baseline: Add `approved_patches_enable_non_security` and `rejected_patches_action` arguments
+```
+
+```release-note:enhancement
+resource/aws_ssm_patch_baseline: Adds `arn` attribute.
+```

.changelog/11774.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_ssm_maintenance_window_task: Add `task_invocation_parameters` `run_command_parameters` block `cloudwatch_config` and `document_version` arguments
+```
+
+```release-note:enhancement
+resource/aws_ssm_maintenance_window_task: Add plan time validation to `max_concurrency`, `max_errors`, `priority`, `service_role_arn`, `targets`, `targets.notification_arn`, `targets.service_role_arn`, `task_type`, `task_invocation_parameters.run_command_parameters.comment`, `task_invocation_parameters.run_command_parameters.document_hash`, `task_invocation_parameters.run_command_parameters.timeout_seconds`, and `task_invocation_parameters.run_command_parameters.notification_config.notification_events` arguments
+```

.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/11857.txt

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

.changelog/11879.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_ssm_patch_baseline: Add `source` configuration block
+```

.changelog/11936.txt

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

.changelog/11937.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+aws_amplify_branch
+```
+
+```release-note:bug
+resource/aws_amplify_app: Mark the `enable_performance_mode` argument in the `auto_branch_creation_config` configuration block as `ForceNew`
+```

.changelog/11938.txt

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

.changelog/11939.txt

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

.changelog/11941.txt

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

.changelog/11967.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_ssm_parameter: Add support for `Intelligent-Tiering`
+```

.changelog/11997.txt

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

.changelog/12018.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_autoscaling_group: Prevent infinite wait for capacity when increasing `min_size` and not specifying `desired_capacity`
+```

.changelog/12055.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+data-source/aws_iam_policy_document: Support merging policy documents by adding `source_policy_documents` and `override_policy_documents` arguments
+```

.changelog/12108.txt

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

.changelog/12130.txt

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

.changelog/12141.txt

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

.changelog/12200.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_ssm_maintenance_window_task: Make `service_role_arn` optional
+```

.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/12384.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_iam_user_login_profile: Make `pgp_key` optional
+```

.changelog/12409.txt

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

.changelog/12423.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_cloudformation_stack_set: Add `auto_deployment` configuration block and `permissions_model` arguments (support service managed permissions)
+```

.changelog/12433.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_opsworks_custom_layer: Add support for `cloudwatch_configuration`
+```
+
+```release-note:enhancement
+resource/aws_opsworks_custom_layer: Add plan time validation for `ebs_volume.type` and `custom_json`.
+```

.changelog/12436.txt

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

.changelog/12482.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_dx_gateway_association: Changes to `proposal_id` do not force resource recreation
+```

.changelog/12495.txt

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

.changelog/12509.txt

@@ -0,0 +1,15 @@
+```release-note:new-resource
+aws_cloudfront_field_level_encryption_profile
+```
+
+```release-note:bug
+resource/aws_cloudfront_cache_policy: The `parameters_in_cache_key_and_forwarded_to_origin` argument is required
+```
+
+```release-note:bug
+resource/aws_cloudfront_cache_policy: Fix assorted crashes
+```
+
+```release-note:bug
+resource/aws_cloudfront_origin_request_policy: Fix assorted crashes
+```

.changelog/12548.txt

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

.changelog/12578.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_emr_cluster: Wait for the cluster to reach a terminated state on deletion
+```

.changelog/12642.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+provider: Add validation for `role_arn`, `policy_arns`, and `policy`
+```

.changelog/12645.txt

@@ -0,0 +1,11 @@
+```release-note:bug
+resource/aws_glacier_vault: Prevent crash with `GetVaultAccessPolicy` API errors
+```
+
+```release-note:bug
+resource/aws_glacier_vault: Properly remove from state when resource does not exist
+```
+
+```release-note:enhancement
+resource/aws_glacier_vault: Add plan-time validation for `notification` configuration block `events` and `sns_topic_arn` arguments
+```

.changelog/12684.txt

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

.changelog/12711.txt

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

.changelog/12758.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_mq_broker: Support updating broker engine version without recreating broker
+```

.changelog/12787.txt

@@ -0,0 +1,6 @@
+```release-note:enhancement
+resource/aws_spot_instance_request: Add import support
+```
+```release-note:enhancement
+resource/aws_spot_instance_request: Add plan time validation for `spot_type` and `block_duration_minutes`
+```

.changelog/12817.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_cloudwatch_metric_alarm: Add plan time validation to `alarm_name`, `comparison_operator`, `metric_name`, `metric_query.id`, `metric_query.expression`, `metric_query.metric.metric_name`, `metric_query.metric.namespace`, `metric_query.metric.unit`, `namespace`, `period`, `statistic`, `alarm_description`, `insufficient_data_actions`, `ok_actions`, `unit`, and `extended_statistic`
+```

.changelog/12868.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_dlm_lifecycle_policy: Add `cross_region_copy_rule` argument in the `schedule` configuration block
+```

.changelog/12949.txt

@@ -0,0 +1,11 @@
+```release-note:bug
+resource/aws_s3_bucket: Prevent `OperationAborted` conflict errors when simultaneously applying `aws_s3_bucket_policy`, `aws_s3_bucket_public_access_block` changes
+```
+
+```release-note:bug
+resource/aws_s3_bucket_policy: Prevent `OperationAborted` conflict errors when simultaneously applying `aws_s3_bucket`, `aws_s3_bucket_public_access_block` changes
+```
+
+```release-note:bug
+resource/aws_s3_bucket_public_access_block: Prevent `OperationAborted` conflict errors when simultaneously applying `aws_s3_bucket_policy`, `aws_s3_bucket` changes
+```

.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/13139.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_budgets_budget: Add `arn` attribute
+```
+
+```release-note:enhancement
+resource/aws_budgets_budget: Add plan time validation for `budget_type`, `time_unit`, and `subscriber_sns_topic_arns` arguments
+```

.changelog/13140.txt

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

.changelog/13203.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_redshift_cluster: Correctly use `number_of_nodes` argument value when restoring from snapshot
+```