Skip to content

Commit

Permalink
rds/tests: use aurora2 cluster by default (ansible-collections#1233)
Browse files Browse the repository at this point in the history 
rds/tests: use aurora2 cluster by default

Aurora1 (provisioned and serverless) which comes with MySQL 5.6 will be soon deprecated by AWS.
See: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/Aurora.MySQL56.EOL.html
This commit also reverses change 8e7ac73.
Closes: ansible-collections#1228

Reviewed-by: Alina Buzachis <None>
Reviewed-by: Mark Chappell <None>
  • Loading branch information
@goneri
goneri authored Nov 2, 2022
1 parent 8332a57 commit ac164b6
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 36 deletions.
3 changes: 3 additions & 0 deletions changelogs/fragments/rds_use_aurora2_during_the_integration_tests.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
minor_changes:
- "rds - AWS is phasing out aurora1. Integration tests use aurora2 (aurora-mysql) by default (https://github.com/ansible-collections/amazon.aws/pull/1233)."
2 changes: 0 additions & 2 deletions tests/integration/targets/rds_cluster_create/aliases
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
disabled # https://github.com/ansible-collections/amazon.aws/issues/1228

time=20m
cloud/aws
rds_cluster
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/targets/rds_cluster_create/defaults/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
cluster_id: ansible-test-cluster-{{ tiny_prefix }}
username: testrdsusername
password: test-rds_password
engine: aurora
engine: aurora-mysql
port: 3306
tags_create:
Name: ansible-test-cluster-{{ tiny_prefix }}
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/targets/rds_cluster_create/tasks/main.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@
- "'engine' in _result_create_db_cluster"
- _result_create_db_cluster.engine == "{{ engine }}"
- "'engine_mode' in _result_create_db_cluster"
- _result_create_db_cluster.engine_mode == "serverless"
- _result_create_db_cluster.engine_mode == "provisioned"
- "'engine_version' in _result_create_db_cluster"
- "'master_username' in _result_create_db_cluster"
- _result_create_db_cluster.master_username == "{{ username }}"
- "'port' in _result_create_db_cluster"
- _result_create_db_cluster.port == {{ port }}
- "'status' in _result_create_db_cluster"
- _result_create_db_cluster.status == 'available'
- _result_create_db_cluster.storage_encrypted == true
- _result_create_db_cluster.storage_encrypted == false
- "'tags' in _result_create_db_cluster"
- _result_create_db_cluster.tags | length == 2
- _result_create_db_cluster.tags["Created_By"] == "{{ tags_create["Created_By"]}}"
Expand Down
2 changes: 0 additions & 2 deletions tests/integration/targets/rds_cluster_create_sgs/aliases
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
disabled # https://github.com/ansible-collections/amazon.aws/issues/1228

time=20m
cloud/aws
rds_cluster
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/targets/rds_cluster_create_sgs/defaults/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
cluster_id: ansible-test-cluster-{{ tiny_prefix }}
username: testrdsusername
password: test-rds_password
engine: aurora
engine: aurora-mysql
port: 3306

# Create cluster in a VPC
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/targets/rds_cluster_create_sgs/tasks/main.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@
- "'engine' in _result_create_db_cluster"
- _result_create_db_cluster.engine == "{{ engine }}"
- "'engine_mode' in _result_create_db_cluster"
- _result_create_db_cluster.engine_mode == "serverless"
- _result_create_db_cluster.engine_mode == "provisioned"
- "'engine_version' in _result_create_db_cluster"
- "'master_username' in _result_create_db_cluster"
- _result_create_db_cluster.master_username == "{{ username }}"
- "'port' in _result_create_db_cluster"
- _result_create_db_cluster.port == {{ port }}
- "'status' in _result_create_db_cluster"
- _result_create_db_cluster.status == 'available'
- _result_create_db_cluster.storage_encrypted == true
- _result_create_db_cluster.storage_encrypted == false
- "'tags' in _result_create_db_cluster"
- "'vpc_security_groups' in _result_create_db_cluster"
- _result_create_db_cluster.vpc_security_groups | selectattr('status', 'in',
Expand Down Expand Up @@ -132,15 +132,15 @@
- "'engine' in _result_create_db_cluster"
- _result_create_db_cluster.engine == "{{ engine }}"
- "'engine_mode' in _result_create_db_cluster"
- _result_create_db_cluster.engine_mode == "serverless"
- _result_create_db_cluster.engine_mode == "provisioned"
- "'engine_version' in _result_create_db_cluster"
- "'master_username' in _result_create_db_cluster"
- _result_create_db_cluster.master_username == "{{ username }}"
- "'port' in _result_create_db_cluster"
- _result_create_db_cluster.port == {{ port }}
- "'status' in _result_create_db_cluster"
- _result_create_db_cluster.status == 'available'
- _result_create_db_cluster.storage_encrypted == true
- _result_create_db_cluster.storage_encrypted == false
- "'tags' in _result_create_db_cluster"
- "'vpc_security_groups' in _result_create_db_cluster"
- _result_create_db_cluster.vpc_security_groups | selectattr('status', 'in',
Expand Down
2 changes: 0 additions & 2 deletions tests/integration/targets/rds_cluster_restore/aliases
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
disabled # https://github.com/ansible-collections/amazon.aws/issues/1228

time=20m
cloud/aws
rds_cluster
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/targets/rds_cluster_restore/tasks/main.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
- "'engine' in _result_create_source_db_cluster"
- _result_create_source_db_cluster.engine == "{{ engine }}"
- "'engine_mode' in _result_create_source_db_cluster"
- _result_create_source_db_cluster.engine_mode == "serverless"
- _result_create_source_db_cluster.engine_mode == "provisioned"
- "'engine_version' in _result_create_source_db_cluster"
- "'master_username' in _result_create_source_db_cluster"
- _result_create_source_db_cluster.master_username == "{{ username }}"
- "'port' in _result_create_source_db_cluster"
- _result_create_source_db_cluster.port == {{ port }}
- "'status' in _result_create_source_db_cluster"
- _result_create_source_db_cluster.status == 'available'
- _result_create_source_db_cluster.storage_encrypted == true
- _result_create_source_db_cluster.storage_encrypted == false
- "'tags' in _result_create_source_db_cluster"
- "'vpc_security_groups' in _result_create_source_db_cluster"

Expand Down Expand Up @@ -89,7 +89,7 @@
- "'engine' in _result_restored_db_cluster"
- _result_restored_db_cluster.engine == "{{ engine }}"
- "'engine_mode' in _result_restored_db_cluster"
- _result_restored_db_cluster.engine_mode == "serverless"
- _result_restored_db_cluster.engine_mode == "provisioned"
- "'engine_version' in _result_restored_db_cluster"
- "'master_username' in _result_restored_db_cluster"
- _result_restored_db_cluster.master_username == "{{ username }}"
Expand Down Expand Up @@ -158,7 +158,7 @@
- "'engine' in _result_restored_db_cluster"
- _result_restored_db_cluster.engine == "{{ engine }}"
- "'engine_mode' in _result_restored_db_cluster"
- _result_restored_db_cluster.engine_mode == "serverless"
- _result_restored_db_cluster.engine_mode == "provisioned"
- "'engine_version' in _result_restored_db_cluster"
- "'master_username' in _result_restored_db_cluster"
- _result_restored_db_cluster.master_username == "{{ username }}"
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/targets/rds_cluster_snapshot/defaults/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ _resource_prefix: 'ansible-test-{{ tiny_prefix }}'
cluster_id: '{{ _resource_prefix }}-rds-cluster'
username: 'testrdsusername'
password: "{{ lookup('password', 'dev/null length=12 chars=ascii_letters,digits') }}"
engine: 'aurora'
engine: aurora-mysql
port: 3306

# Create snapshot
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/targets/rds_cluster_snapshot/tasks/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
- "'engine' in _result_create_source_db_cluster"
- _result_create_source_db_cluster.engine == "{{ engine }}"
- "'engine_mode' in _result_create_source_db_cluster"
- _result_create_source_db_cluster.engine_mode == "serverless"
- _result_create_source_db_cluster.engine_mode == "provisioned"
- "'engine_version' in _result_create_source_db_cluster"
- "'master_username' in _result_create_source_db_cluster"
- _result_create_source_db_cluster.master_username == "{{ username }}"
Expand Down Expand Up @@ -148,7 +148,7 @@
- "'engine' in _result_create_source_db_cluster"
- _result_create_source_db_cluster.engine == "{{ engine }}"
- "'engine_mode' in _result_create_source_db_cluster"
- _result_create_source_db_cluster.engine_mode == "serverless"
- _result_create_source_db_cluster.engine_mode == "provisioned"
- "'engine_version' in _result_create_source_db_cluster"
- "'master_username' in _result_create_source_db_cluster"
- _result_create_source_db_cluster.master_username == "{{ username }}"
Expand Down
2 changes: 0 additions & 2 deletions tests/integration/targets/rds_cluster_tag/aliases
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
disabled # https://github.com/ansible-collections/amazon.aws/issues/1228

time=20m
cloud/aws
rds_cluster
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/targets/rds_cluster_tag/defaults/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
cluster_id: ansible-test-cluster-{{ tiny_prefix }}
username: testrdsusername
password: test-rds_password
engine: aurora
engine: aurora-mysql
port: 3306
tags_create:
Name: ansible-test-cluster-{{ tiny_prefix }}
Expand Down
24 changes: 12 additions & 12 deletions tests/integration/targets/rds_cluster_tag/tasks/main.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@
- "'engine' in _result_create_db_cluster"
- _result_create_db_cluster.engine == "{{ engine }}"
- "'engine_mode' in _result_create_db_cluster"
- _result_create_db_cluster.engine_mode == "serverless"
- _result_create_db_cluster.engine_mode == "provisioned"
- "'engine_version' in _result_create_db_cluster"
- "'master_username' in _result_create_db_cluster"
- _result_create_db_cluster.master_username == "{{ username }}"
- "'port' in _result_create_db_cluster"
- _result_create_db_cluster.port == {{ port }}
- "'status' in _result_create_db_cluster"
- _result_create_db_cluster.status == 'available'
- _result_create_db_cluster.storage_encrypted == true
- _result_create_db_cluster.storage_encrypted == false
- "'tags' in _result_create_db_cluster"
- _result_create_db_cluster.tags | length == 2
- _result_create_db_cluster.tags["Created_By"] == "{{ tags_create["Created_By"]
Expand Down Expand Up @@ -87,15 +87,15 @@
- "'engine' in _result_tag_db_cluster"
- _result_tag_db_cluster.engine == "{{ engine }}"
- "'engine_mode' in _result_tag_db_cluster"
- _result_tag_db_cluster.engine_mode == "serverless"
- _result_tag_db_cluster.engine_mode == "provisioned"
- "'engine_version' in _result_tag_db_cluster"
- "'master_username' in _result_tag_db_cluster"
- _result_tag_db_cluster.master_username == "{{ username }}"
- "'port' in _result_tag_db_cluster"
- _result_tag_db_cluster.port == {{ port }}
- "'status' in _result_tag_db_cluster"
- _result_tag_db_cluster.status == 'available'
- _result_tag_db_cluster.storage_encrypted == true
- _result_tag_db_cluster.storage_encrypted == false
- "'tags' in _result_tag_db_cluster"
- _result_tag_db_cluster.tags | length == 2
- _result_tag_db_cluster.tags["Created_By"] == "{{ tags_create["Created_By"]
Expand Down Expand Up @@ -126,15 +126,15 @@
- "'engine' in _result_tag_db_cluster"
- _result_tag_db_cluster.engine == "{{ engine }}"
- "'engine_mode' in _result_tag_db_cluster"
- _result_tag_db_cluster.engine_mode == "serverless"
- _result_tag_db_cluster.engine_mode == "provisioned"
- "'engine_version' in _result_tag_db_cluster"
- "'master_username' in _result_tag_db_cluster"
- _result_tag_db_cluster.master_username == "{{ username }}"
- "'port' in _result_tag_db_cluster"
- _result_tag_db_cluster.port == {{ port }}
- "'status' in _result_tag_db_cluster"
- _result_tag_db_cluster.status == 'available'
- _result_tag_db_cluster.storage_encrypted == true
- _result_tag_db_cluster.storage_encrypted == false
- "'tags' in _result_tag_db_cluster"
- _result_tag_db_cluster.tags | length == 2
- _result_tag_db_cluster.tags["Name"] == "{{ tags_patch['Name'] }}"
Expand Down Expand Up @@ -181,15 +181,15 @@
- "'engine' in _result_tag_db_cluster"
- _result_tag_db_cluster.engine == "{{ engine }}"
- "'engine_mode' in _result_tag_db_cluster"
- _result_tag_db_cluster.engine_mode == "serverless"
- _result_tag_db_cluster.engine_mode == "provisioned"
- "'engine_version' in _result_tag_db_cluster"
- "'master_username' in _result_tag_db_cluster"
- _result_tag_db_cluster.master_username == "{{ username }}"
- "'port' in _result_tag_db_cluster"
- _result_tag_db_cluster.port == {{ port }}
- "'status' in _result_tag_db_cluster"
- _result_tag_db_cluster.status == 'available'
- _result_tag_db_cluster.storage_encrypted == true
- _result_tag_db_cluster.storage_encrypted == false
- "'tags' in _result_tag_db_cluster"
- _result_tag_db_cluster.tags | length == 1
- _result_tag_db_cluster.tags["Created_By"] == "Ansible_rds_cluster_integration_test"
Expand Down Expand Up @@ -236,15 +236,15 @@
- "'engine' in _result_tag_db_cluster"
- _result_tag_db_cluster.engine == "{{ engine }}"
- "'engine_mode' in _result_tag_db_cluster"
- _result_tag_db_cluster.engine_mode == "serverless"
- _result_tag_db_cluster.engine_mode == "provisioned"
- "'engine_version' in _result_tag_db_cluster"
- "'master_username' in _result_tag_db_cluster"
- _result_tag_db_cluster.master_username == "{{ username }}"
- "'port' in _result_tag_db_cluster"
- _result_tag_db_cluster.port == {{ port }}
- "'status' in _result_tag_db_cluster"
- _result_tag_db_cluster.status == 'available'
- _result_tag_db_cluster.storage_encrypted == true
- _result_tag_db_cluster.storage_encrypted == false
- "'tags' in _result_tag_db_cluster"
- _result_tag_db_cluster.tags | length == 2
- _result_tag_db_cluster.tags["Created_By"] == "{{ tags_create["Created_By"]}}"
Expand Down Expand Up @@ -275,15 +275,15 @@
- "'engine' in _result_tag_db_cluster"
- _result_tag_db_cluster.engine == "{{ engine }}"
- "'engine_mode' in _result_tag_db_cluster"
- _result_tag_db_cluster.engine_mode == "serverless"
- _result_tag_db_cluster.engine_mode == "provisioned"
- "'engine_version' in _result_tag_db_cluster"
- "'master_username' in _result_tag_db_cluster"
- _result_tag_db_cluster.master_username == "{{ username }}"
- "'port' in _result_tag_db_cluster"
- _result_tag_db_cluster.port == {{ port }}
- "'status' in _result_tag_db_cluster"
- _result_tag_db_cluster.status == 'available'
- _result_tag_db_cluster.storage_encrypted == true
- _result_tag_db_cluster.storage_encrypted == false
- "'tags' in _result_tag_db_cluster"
- _result_tag_db_cluster.tags | length == 0
- "'vpc_security_groups' in _result_tag_db_cluster"
Expand Down

0 comments on commit ac164b6

Please sign in to comment.