diff --git a/test/integration/targets/boto3_conn/aliases b/test/integration/targets/boto3_conn/aliases deleted file mode 100644 index 4ef4b2067d0..00000000000 --- a/test/integration/targets/boto3_conn/aliases +++ /dev/null @@ -1 +0,0 @@ -cloud/aws diff --git a/test/integration/targets/boto3_conn/tasks/main.yml b/test/integration/targets/boto3_conn/tasks/main.yml deleted file mode 100644 index d53973cedbf..00000000000 --- a/test/integration/targets/boto3_conn/tasks/main.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -# tasks file for test_ec2_asg - -- name: Test incomplete credentials with ec2_asg - - block: - - # ============================================================ - - - name: test invalid profile - ec2_asg: - name: "{{ resource_prefix }}-asg" - region: "{{ aws_region }}" - profile: notavalidprofile - ignore_errors: yes - register: result - - - name: - assert: - that: - - "'The config profile (notavalidprofile) could not be found' in result.msg" - - - name: test partial credentials - ec2_asg: - name: "{{ resource_prefix }}-asg" - region: "{{ aws_region }}" - aws_access_key: "{{ aws_access_key }}" - ignore_errors: yes - register: result - - - name: - assert: - that: - - "'Partial credentials found in explicit, missing: aws_secret_access_key' in result.msg" - - - name: test without specifying region - ec2_asg: - name: "{{ resource_prefix }}-asg" - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token }}" - ignore_errors: yes - register: result - - - name: - assert: - that: - - result.msg == 'The ec2_asg module requires a region and none was found in configuration, environment variables or module parameters' - - # ============================================================ diff --git a/test/integration/targets/ec2_asg/meta/main.yml b/test/integration/targets/ec2_asg/meta/main.yml deleted file mode 100644 index 79dc5650f4e..00000000000 --- a/test/integration/targets/ec2_asg/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: - - boto3_conn diff --git a/test/integration/targets/ec2_asg/tasks/main.yml b/test/integration/targets/ec2_asg/tasks/main.yml index c6ed7236e29..9b742a7712f 100644 --- a/test/integration/targets/ec2_asg/tasks/main.yml +++ b/test/integration/targets/ec2_asg/tasks/main.yml @@ -1,6 +1,54 @@ --- # tasks file for test_ec2_asg +- name: Test incomplete credentials with ec2_asg + + block: + + # ============================================================ + + - name: test invalid profile + ec2_asg: + name: "{{ resource_prefix }}-asg" + region: "{{ aws_region }}" + profile: notavalidprofile + ignore_errors: yes + register: result + + - name: + assert: + that: + - "'The config profile (notavalidprofile) could not be found' in result.msg" + + - name: test partial credentials + ec2_asg: + name: "{{ resource_prefix }}-asg" + region: "{{ aws_region }}" + aws_access_key: "{{ aws_access_key }}" + ignore_errors: yes + register: result + + - name: + assert: + that: + - "'Partial credentials found in explicit, missing: aws_secret_access_key' in result.msg" + + - name: test without specifying region + ec2_asg: + name: "{{ resource_prefix }}-asg" + aws_access_key: "{{ aws_access_key }}" + aws_secret_key: "{{ aws_secret_key }}" + security_token: "{{ security_token }}" + ignore_errors: yes + register: result + + - name: + assert: + that: + - result.msg == 'The ec2_asg module requires a region and none was found in configuration, environment variables or module parameters' + + # ============================================================ + - name: Test incomplete arguments with ec2_asg block: