rds_instance - add valid choices for engine type (#1034) (#1040)

backport-3: rds_instance - add valid choices for engine type (#1034)

backport rds_instance - add valid choices for engine type #1034
SUMMARY
Add valid choices for engine and update integration tests with new error msg
ISSUE TYPE
Feature Pull Request
COMPONENT NAME
rds_instance
Reviewed-by: Jill R

Reviewed-by: Mark Woolley <mw@marknet15.com>
Reviewed-by: Alina Buzachis <None>

changelogs/fragments/1034-rds_instance-update-valid-engine-type.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - rds_instance - add `choices` for valid engine value (https://github.com/ansible-collections/community.aws/pull/1034).

plugins/modules/rds_instance.py

@@ -187,8 +187,8 @@
     engine:
         description:
           - The name of the database engine to be used for this DB instance. This is required to create an instance.
-            Valid choices are aurora | aurora-mysql | aurora-postgresql | mariadb | mysql | oracle-ee | oracle-se |
-            oracle-se1 | oracle-se2 | postgres | sqlserver-ee | sqlserver-ex | sqlserver-se | sqlserver-web
+        choices: ['aurora', 'aurora-mysql', 'aurora-postgresql', 'mariadb', 'mysql', 'oracle-ee', 'oracle-ee-cdb',
+                  'oracle-se2', 'oracle-se2-cdb', 'postgres', 'sqlserver-ee', 'sqlserver-se', 'sqlserver-ex', 'sqlserver-web']
         type: str
     engine_version:
         description:
@@ -787,6 +787,9 @@
 from ansible_collections.amazon.aws.plugins.module_utils.rds import get_rds_method_attribute
 from ansible_collections.amazon.aws.plugins.module_utils.rds import get_tags
 
+valid_engines = ['aurora', 'aurora-mysql', 'aurora-postgresql', 'mariadb', 'mysql', 'oracle-ee', 'oracle-ee-cdb',
+                 'oracle-se2', 'oracle-se2-cdb', 'postgres', 'sqlserver-ee', 'sqlserver-se', 'sqlserver-ex', 'sqlserver-web']
+
 
 def get_rds_method_attribute_name(instance, state, creation_source, read_replica):
     method_name = None
@@ -1147,7 +1150,7 @@ def main():
         enable_cloudwatch_logs_exports=dict(type='list', aliases=['cloudwatch_log_exports'], elements='str'),
         enable_iam_database_authentication=dict(type='bool'),
         enable_performance_insights=dict(type='bool'),
-        engine=dict(),
+        engine=dict(type='str', choices=valid_engines),
         engine_version=dict(),
         final_db_snapshot_identifier=dict(aliases=['final_snapshot_identifier']),
         force_failover=dict(type='bool'),

tests/integration/targets/rds_instance/roles/rds_instance/tasks/test_tagging.yml

@@ -28,7 +28,7 @@
     - assert:
         that:
           - result.failed
-          - '"DB engine thisisnotavalidengine should be one of" in result.msg'
+          - '"value of engine must be one of" in result.msg'
 
     # Test creation, adding tags and enabling encryption
     - name: Create a mariadb instance