Fix option names

.github/workflows/unit_and_sanity.yml

@@ -81,7 +81,7 @@ jobs:
             {
               "ansible-version": "milestone",
               "python-version": "3.9"
-            }
+            },
             {
               "ansible-version": "devel",
               "python-version": "3.7"

README.md

@@ -6,7 +6,7 @@ This work is being made available for research purposes on the Cloud Control API
 <!--start requires_ansible-->
 ## Ansible version compatibility
 
-This collection has been tested against following Ansible versions: **>=2.12.0**.
+This collection has been tested against following Ansible versions: **>=2.13.0**.
 
 Plugins and modules within a collection may be tested with only specific Ansible versions.
 A collection may contain metadata that identifies these versions.

changelogs/fragments/20230809-collection_regeneration.yml

@@ -0,0 +1,19 @@
+bugfixes:
+  - "plugins/module_utils/utils.py - Fix how dictionaries are merged."
+
+minor_changes:
+  - "amazon.cloud - Add the original option name as an alias to avoid issues when snake cased option names are not correctly reversed to CamelCase."
+  - "Update README.md and meta/runtime.yml to reflect our ansible core testing versions."
+
+breaking_changes:
+  - backup_framework - This module was removed in version 0.5.0 of this collection because the ``framework_arn`` option, which is the main identifier of the resource, is a read-only property, so it cannot be set by the user and breaks the use of the module.
+  - backup_report_plan - This module was removed in version 0.5.0 of this collection because the ``report_plan_arn`` option, which is the main identifier of the resource, is a read-only property, so it cannot be set by the user and breaks the use of the module.
+  - cloudtrail_event_data_store - This module was removed in version 0.5.0 of this collection because the ``event_data_store_arn`` option, which is the main identifier of the resource, is a read-only property, so it cannot be set by the user and breaks the use of the module.
+  - ec2_placement_group - This module was removed in version 0.5.0 of this collection because the ``group_name`` option, which is the main identifier of the resource, is a read-only property, so it cannot be set by the user and breaks the use of the module.
+  - kms_replica_key - This module was removed in version 0.5.0 of this collection because the ``key_id`` option, which is the main identifier of the resource, is a read-only property, so it cannot be set by the user and breaks the use of the module.
+  - lambda_code_signing_config - This module was removed in version 0.5.0 of this collection because the ``code_signing_config_arn`` option, which is the main identifier of the resource, is a read-only property, so it cannot be set by the user and breaks the use of the module.
+  - lambda_event_source_mapping - This module was removed in version 0.5.0 of this collection because the ``id`` option, which is the main identifier of the resource, is a read-only property, so it cannot be set by the user and breaks the use of the module.
+  - logs_query_definition - This module was removed in version 0.5.0 of this collection because the ``query_definition_id`` option, which is the main identifier of the resource, is a read-only property, so it cannot be set by the user and breaks the use of the module.
+  - ssm_resource_data_sync - This module was removed in version 0.5.0 of this collection because the ``sync_name`` option, which is the main identifier of the resource, is a read-only property, so it cannot be set by the user and breaks the use of the module.
+  - wafv2_ip_set - This module was removed in version 0.5.0 of this collection because the ``id`` option, which is one of the main identifiers of the resource, is a read-only property, so it cannot be set by the user and breaks the use of the module.
+  - wafv2_regex_pattern_set - This module was removed in version 0.5.0 of this collection because the ``id`` option, which is one of the main identifiers of the resource, is a read-only property, so it cannot be set by the user and breaks the use of the module.

config/modules.yaml

@@ -5,18 +5,6 @@
       description:
       - Creates and manages logical containers where backups are stored.
     resource: AWS::Backup::BackupVault
-- backup_framework:
-    documentation:
-      short_description: Create and manage frameworks with one or more controls
-      description:
-      - Creates and manages frameworks with one or more controls.
-    resource: AWS::Backup::Framework
-- backup_report_plan:
-    documentation:
-      short_description: Create and manage report plans
-      description:
-      - Creates and manages report plans.
-    resource: AWS::Backup::ReportPlan
 - eks_cluster:
     documentation:
       short_description: Create and manages Amazon EKS control planes
@@ -29,19 +17,6 @@
       description:
       - Creates and manages new roles for your AWS account.
     resource: AWS::IAM::Role
-- lambda_code_signing_config:
-    documentation:
-      short_description: Code signing for AWS Lambda
-      description:
-      - Creates and manage code signing for AWS Lambda.
-    resource: AWS::Lambda::CodeSigningConfig
-- lambda_event_source_mapping:
-    documentation:
-      short_description: Create a mapping between an event source and an AWS Lambda
-        function
-      description:
-      - Create a mapping between an event source and an AWS Lambda function.
-    resource: AWS::Lambda::EventSourceMapping
 - lambda_function:
     documentation:
       short_description: Create and manage Lambda functions
@@ -54,12 +29,6 @@
       description:
       - Create and manage log groups.
     resource: AWS::Logs::LogGroup
-- logs_query_definition:
-    documentation:
-      short_description: Create and manage query definitions
-      description:
-      - Creates and manage query definitions for CloudWatch Logs Insights.
-    resource: AWS::Logs::QueryDefinition
 - logs_resource_policy:
     documentation:
       short_description: Create and manage resource policies
@@ -165,14 +134,6 @@
       description:
       - Specifies a display name for a KMS key.
     resource: AWS::KMS::Alias
-- kms_replica_key:
-    documentation:
-      short_description: Creates and manages a multi-Region replica key that is based
-        on a multi-Region primary key
-      description:
-      - Creates andn manages a multi-Region replica key that is based on a multi-Region
-        primary key.
-    resource: AWS::KMS::ReplicaKey
 - rds_db_proxy_endpoint:
     documentation:
       short_description: Creates and manages a DB proxy endpoint
@@ -224,12 +185,6 @@
       - Creates and manages a trail that specifies the settings for delivery of log
         data to an Amazon S3 bucket.
     resource: AWS::CloudTrail::Trail
-- cloudtrail_event_data_store:
-    documentation:
-      short_description: Creates and manages a new event data store
-      description:
-      - Creates and manages a new event data store.
-    resource: AWS::CloudTrail::EventDataStore
 - cloudwatch_composite_alarm:
     documentation:
       short_description: Creates and manages a composite alarm
@@ -296,25 +251,6 @@
       - This document defines the actions that Systems Manager performs on your AWS
         resources.
     resource: AWS::SSM::Document
-- ssm_resource_data_sync:
-    documentation:
-      short_description: Creates and manages a resource data sync
-      description:
-      - Creates and manages a resource data sync for AWS Systems Manager.
-      - A resource data sync helps you view data from multiple sources in a single
-        location.
-    resource: AWS::SSM::ResourceDataSync
-- wafv2_ip_set:
-    documentation:
-      short_description: Creates and manages and IP set
-      description:
-      - Creates and manages and IP set to identify web requests that originate from
-        specific IP addresses or ranges of IP addresses.
-      - For example, if you're receiving a lot of requests from a ranges of IP addresses,
-        you can configure AWS WAF to block them using an IP set that lists those IP
-        addresses.
-      - For more information see U(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-ipset.html).
-    resource: AWS::WAFv2::IPSet
 - wafv2_logging_configuration:
     documentation:
       short_description: Creates and manages an association between logging destinations
@@ -324,14 +260,6 @@
         ACL resource, for logging from AWS WAF.
       - For more information see U(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-loggingconfiguration.html).
     resource: AWS::WAFv2::LoggingConfiguration
-- wafv2_regex_pattern_set:
-    documentation:
-      short_description: Creates and manages an AWS WAFv2 Regex Pattern Set
-      description:
-      - Creates and manages an AWS WAFv2 Regex Pattern Set.
-      - Use an AWS WAFv2 Regex Pattern Set to have AWS WAF inspect a web request component
-        for a specific set of regular expression patterns.
-    resource: AWS::WAFv2::RegexPatternSet
 - wafv2_web_acl_association:
     documentation:
       short_description: Creates and manages a web ACL association
@@ -402,15 +330,6 @@
       - The maximum number of metric filters that can be associated with a log group
         is 100.
     resource: AWS::Logs::MetricFilter
-- ec2_placement_group:
-    documentation:
-      short_description: Creates and manages a placement group
-      description:
-      - Specifies a placement group in which to launch instances.
-      - The strategy of the placement group determines how the instances are organized
-        within the group.
-      - For more information see U(https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-placementgroup.html).
-    resource: AWS::EC2::PlacementGroup
 - autoscaling_launch_configuration:
     documentation:
       short_description: Creates and manages a web ACL association.
@@ -443,6 +362,7 @@
       - Whenever your application needs to scale out, the Auto Scaling group can draw
         on the warm pool to meet its new desired capacity.
     resource: AWS::AutoScaling::WarmPool
+# 0.4.0
 - memorydb_acl:
     documentation:
       short_description: Creates and manages a MemoryDB ACL

meta/runtime.yml

@@ -1,16 +1,11 @@
-requires_ansible: '>=2.12.0'
+requires_ansible: '>=2.13.0'
 action_groups:
   aws:
   - backup_backup_vault
-  - backup_framework
-  - backup_report_plan
   - eks_cluster
   - iam_role
-  - lambda_code_signing_config
-  - lambda_event_source_mapping
   - lambda_function
   - logs_log_group
-  - logs_query_definition
   - logs_resource_policy
   - rds_db_proxy
   - redshift_cluster
@@ -26,15 +21,13 @@ action_groups:
   - eks_addon
   - iam_server_certificate
   - kms_alias
-  - kms_replica_key
   - rds_db_proxy_endpoint
   - redshift_endpoint_access
   - redshift_endpoint_authorization
   - redshift_scheduled_action
   - route53_dnssec
   - route53_key_signing_key
   - cloudtrail_trail
-  - cloudtrail_event_data_store
   - cloudwatch_composite_alarm
   - cloudwatch_metric_stream
   - rds_db_instance
@@ -43,10 +36,7 @@ action_groups:
   - rds_global_cluster
   - rds_option_group
   - ssm_document
-  - ssm_resource_data_sync
-  - wafv2_ip_set
   - wafv2_logging_configuration
-  - wafv2_regex_pattern_set
   - wafv2_web_acl_association
   - ecr_repository
   - ecs_capacity_provider
@@ -55,18 +45,17 @@ action_groups:
   - ecs_primary_task_set
   - iam_instance_profile
   - logs_metric_filter
-  - ec2_placement_group
   - autoscaling_launch_configuration
   - autoscaling_lifecycle_hook
   - autoscaling_warm_pool
-  - rdsdb_proxy
-  - s3_object_lambda_access_point
-  - s3_object_lambda_access_point_policy
   - memorydb_acl
   - memorydb_cluster
   - memorydb_parameter_group
   - memorydb_subnet_group
   - memorydb_user
+  - rdsdb_proxy
+  - s3_object_lambda_access_point
+  - s3_object_lambda_access_point_policy
 plugin_routing:
   modules:
     rdsdb_proxy: