Merge remote master, fix conflicts, adjust dependencies

.actrc

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

.changelog/10213.txt

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

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

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

.changelog/11967.txt

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

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

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

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

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

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

@@ -0,0 +1,3 @@
+```release-note:enhancement
+data-source/aws_vpc_peering_connection: Add `cidr_block_set` and `peer_cidr_block_set` attributes
+```

.changelog/13476.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_dms_replication_task: Handle read-only attributes in `replication_task_settings` to avoid unnecessary diffs.
+```

.changelog/13554.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+data-source/aws_subnet: Add `available_ip_address_count` attributes
+```

.changelog/13850.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_ssm_patch_baseline: Add `approval_rule` block `approve_until_date` argument
+```

.changelog/13883.txt

@@ -0,0 +1,7 @@
+```release-note:new-data-source
+aws_apigatewayv2_api
+```
+
+```release-note:new-data-source
+aws_apigatewayv2_apis
+```

.changelog/13944.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+data-source/aws_security_groups: Adds `arns` attribute
+```

.changelog/13948.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_ec2_traffic_mirror_filter: Add `arn` attribute.
+```

.changelog/13949.txt

@@ -0,0 +1,8 @@
+```release-note:enhancement
+resource/aws_ec2_traffic_mirror_filter_rule: Add arn attribute.
+```
+
+```release-note:enhancement
+resource/aws_ec2_traffic_mirror_filter_rule: Add plan time validation to `destination_port_range.from_port`, 
+`destination_port_range.to_port`, `source_port_range.from_port`, and `source_port_range.to_port`.
+```

.changelog/13960.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_ses_receipt_rule: Add `arn` attribute
+```
+
+```release-note:enhancement
+resource/aws_ses_receipt_rule: Add plan time validations for `name`, `tls_policy`, `add_header_action.header_name`, `add_header_action.header_value`, `bounce_action.topic_arn`, `lambda_action.function_arn`, `lambda_action.topic_arn`, `lambda_action.invocation_type`, `s3_action,topic_arn`, `sns_action.topic_arn`, `stop_action.scope`, `stop_action.topic_arn`, `workmail_action.topic_arn`, and `workmail_action.organization_arn` attributes
+```

.changelog/13962.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_ses_active_receipt_rule_set: Add `arn` attribute
+```
+
+```release-note:enhancement
+resource/aws_ses_active_receipt_rule_set: Add plan time validation for `rule_set_name` argument
+```

.changelog/13963.txt

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

.changelog/13964.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_ses_event_destination: Add `arn` attribute
+```
+
+```release-note:enhancement
+resource/aws_ses_event_destination: Add plan time validation for `name`, `cloudwatch_destination.default_value`, `cloudwatch_destination.default_name`, `kinesis_destination.role_arn`, `kinesis_destination.stream_arn`, and `sns_destination.topic_arn` attributes
+```

.changelog/13971.txt

@@ -0,0 +1,14 @@
+```release-note:enhancement
+resource/aws_ami: Add `usage_operation`, `platform_details`, `image_owner_alias`, `image_type`, `hypervisor`, `owner_id`, `platform`, `public` attributes
+```
+```release-note:enhancement
+resource/aws_ami_copy: Add `usage_operation`, `platform_details`, `image_owner_alias`, `image_type`, `hypervisor`, `owner_id`, `platform`, `public` attributes
+```
+
+```release-note:enhancement
+resource/aws_ami_from_instance: Add `usage_operation`, `platform_details`, `image_owner_alias`, `image_type`, `hypervisor`, `owner_id`, `platform`, `public` attributes
+```
+
+```release-note:enhancement
+data-source/aws_ami: Add `usage_operation`, `platform_details`, `ena_support` attributes
+```

.changelog/13972.txt

@@ -0,0 +1,8 @@
+```release-note:enhancement
+resource/aws_ses_configuration_set: Add `arn` attribute.
+```
+
+```release-note:enhancement
+resource/aws_ses_configuration_set: Add plan time validation to `name`.
+```
+

.changelog/13973.txt

@@ -0,0 +1,5 @@
+```release-note:enhancement
+resource/aws_elastictranscoder_pipeline: Add plan time validations to `content_config.storage_class`, `content_config_permissions.access`, `content_config_permissions.grantee_type`,
+`notifications.completed`, `notifications.error`, `notifications.progressing`, `notifications.warning`,
+`thumbnail_config.storage_class`, `thumbnail_config_permissions.access`, `thumbnail_config_permissions.grantee_type`
+```

.changelog/14101.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_sns_topic_subscription: Add plan time validation for `subscription_role_arn` and `topic_arn`
+```
+
+```release-note:bug
+resource/aws_sns_topic_subscription: recreate subscription if topic is deleted
+```

.changelog/14128.txt

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

.changelog/14193.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_ecr_repository_policy: Add plan time validation for `policy`
+```

.changelog/14247.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_config_configuration_aggregator: Allow name to have uppercase characters
+```

.changelog/14255.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_sns_topic_subscription: Fix to avoid `delivery_policy` always showing diff.
+```

.changelog/14319.txt

@@ -0,0 +1,7 @@
+```release-note:bug
+resource/aws_wafv2_web_acl_logging_configuration: Ensure `redacted_fields` are applied to the resource
+```
+
+```release-note:note
+resource/aws_wafv2_web_acl_logging_configuration: The `redacted_fields` configuration block `all_query_arguments`, `body`, and `single_query_argument` arguments have been deprecated to match the WAF API documentation
+```

.changelog/14462.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_lb_listener: Add `alpn_policy` argument
+```
+
+```release-note:enhancement
+data-source/aws_lb_listener: Add `alpn_policy` argument
+```

.changelog/14578.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_lambda_function: Handle eventual consistency issues after publishing a version
+```

.changelog/14673.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_cloudwatch_log_group: Add plan time validation for `retention_in_days` argument
+```

.changelog/14746.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_lambda_event_source_mapping: Add `topics` attribute to support Amazon MSK as an event source
+```

.changelog/14765.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_lambda_event_source_mapping: Wait for create and update operations to complete
+```

.changelog/14786.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+data-source/aws_customer_gateway: Add `device_name` attribute
+```
+
+```release-note:enhancement
+resource/aws_customer_gateway: Add `device_name` argument
+```

.changelog/14905.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_light_instance_public_ports: Add `cidrs` argument to `port_info`
+```

.changelog/14923.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_sns_topic_subscription: Add `email`, `email-json`, and `firehose` to protocol values. Add `subscription_role_arn` argument for Firehose support. Add `confirmation_was_authenticated`, `owner_id`, and `pending_confirmation` attributes.
+```

.changelog/14935.txt

@@ -0,0 +1,11 @@
+```release-note:enhancement
+resource/aws_cognito_user_pool_client: Add plan time validation for `name`, `default_redirect_uri`, `supported_identity_providers`
+```
+
+```release-note:enhancement
+resource/aws_cognito_user_pool_client: Add support for `access_token_validity` and `id_token_validity`, `token_validity_units`
+```
+
+```release-note:enhancement
+resource/aws_cognito_user_pool: Add support for `configuration_set` in `email_configuration`
+```

.changelog/14974.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+aws_cloudfront_realtime_log_config
+```
+
+```release-note:enhancement
+resource/aws_cloudfront_distribution: Add `realtime_log_config_arn` attribute to `default_cache_behavior` and `ordered_cache_behavior` configuration blocks
+```

.changelog/15038.txt

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

.changelog/15112.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_lb_listener: Fix `default_action.forward.target_group` to have minimum of 1.
+```

.changelog/15213.txt

@@ -0,0 +1,7 @@
+```release-note:bug
+resource/aws_ssm_patch_group: Allow for a single patch group to be registered with multiple patch baselines
+```
+
+```release-note:bug
+resource/aws_ssm_patch_group: Replace `Provider produced inconsistent result after apply` with actual error message
+```

.changelog/15348.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+data-source/aws_elasticache_replication_group: Adds `arn` attribute
+```
+
+```release-note:enhancement
+resource/aws_elasticache_replication_group: Adds `arn` attribute
+```

.changelog/15461.txt

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

.changelog/15828.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_sns_topic: Add `fifo_topic` and `content_based_deduplication` attributes
+```

.changelog/15885.txt

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

.changelog/16108.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_mq_broker: Add RabbitMQ as option for `engine_type`, and new arguments `authentication_strategy`, `ldap_server_metadata`, and `storage_type`. Improve handling of eventual consistency.
+```

.changelog/16120.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_batch_job_definition: Treat empty `container_properties.logConfiguration.secretOptions` array as `null` to prevent continual diffs
+```

.changelog/16188.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_iam_instance_profile: Detach role when role doesn't exist + remove when deleted from state.
+```

.changelog/16192.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_elasticsearch_domain: Add `domain_endpoint_options` configuration block `custom_endpoint`, `custom_endpoint_certificate_arn`, and `custom_endpoint_enabled` arguments
+```

.changelog/16325.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_autoscaling_group: Added support Auto Scaling groups with multiple launch templates using a mixed instances policy
+```

.changelog/16474.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_lb_listener_certificate: Add import support
+```