tests drop use of ec2_region (ansible-collections#1721)

Integration tests - Drop use of ec2_region SUMMARY Follow up to ansible-collections#1714 missed "ec2_region" ISSUE TYPE Docs Pull Request COMPONENT NAME tests/ ADDITIONAL INFORMATION Reviewed-by: Alina Buzachis
tremble · Sep 4, 2023 · e168881 · e168881
1 parent 47b0125
commit e168881
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/changelogs/fragments/ec2_region.yml b/changelogs/fragments/ec2_region.yml
@@ -0,0 +1,2 @@
+trivial:
+- tweak integration tests to use aws_region rather than ec2_region.
diff --git a/tests/integration/targets/ec2_instance_instance_multiple/tasks/main.yml b/tests/integration/targets/ec2_instance_instance_multiple/tasks/main.yml
@@ -369,7 +369,7 @@
 
   - name: Gather information about any running instance with Name ending with "-test-enf_cnt"
     ec2_instance_info:
-      region: "{{ ec2_region }}"
+      region: "{{ aws_region }}"
       filters:
         "tag:Name": "*-test-enf_cnt"
         instance-state-name: [ "running"]

diff --git a/tests/integration/targets/ec2_instance_uptime/tasks/main.yml b/tests/integration/targets/ec2_instance_uptime/tasks/main.yml
@@ -10,7 +10,7 @@
     ec2_instance:
       state: 'running'
       name: "{{ resource_prefix }}-test-uptime"
-      region: "{{ ec2_region }}"
+      region: "{{ aws_region }}"
       image_id: "{{ ec2_ami_id }}"
       tags:
         TestId: "{{ ec2_instance_tag_TestId }}"
@@ -32,7 +32,7 @@
 
   - name: "check using uptime 100 hours - should find nothing"
     ec2_instance_info:
-      region: "{{ ec2_region }}"
+      region: "{{ aws_region }}"
       uptime: 6000
       filters:
         instance-state-name: [ "running"]
@@ -51,7 +51,7 @@
 
   - name: "check using uptime 1 minute"
     ec2_instance_info:
-      region: "{{ ec2_region }}"
+      region: "{{ aws_region }}"
       uptime: 1
       filters:
         instance-state-name: [ "running"]

diff --git a/tests/integration/targets/rds_param_group/tasks/main.yml b/tests/integration/targets/rds_param_group/tasks/main.yml
@@ -14,10 +14,10 @@
 - name: rds_option_group tests
   module_defaults:
     group/aws:
-      ec2_access_key: '{{ aws_access_key }}'
-      ec2_secret_key: '{{ aws_secret_key }}'
-      security_token: '{{ security_token | default(omit) }}'
-      region: '{{ ec2_region }}'
+      access_key: '{{ aws_access_key }}'
+      secret_key: '{{ aws_secret_key }}'
+      session_token: '{{ security_token | default(omit) }}'
+      region: '{{ aws_region }}'
   block:
 
     # ============================================================
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		trivial:
		- tweak integration tests to use aws_region rather than ec2_region.