diff --git a/tests/integration/targets/aws_api_gateway/meta/main.yml b/tests/integration/targets/aws_api_gateway/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/aws_api_gateway/meta/main.yml +++ b/tests/integration/targets/aws_api_gateway/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/aws_eks_cluster/meta/main.yml b/tests/integration/targets/aws_eks_cluster/meta/main.yml index 1810d4bec98..32cf5dda7ed 100644 --- a/tests/integration/targets/aws_eks_cluster/meta/main.yml +++ b/tests/integration/targets/aws_eks_cluster/meta/main.yml @@ -1,2 +1 @@ -dependencies: - - setup_remote_tmp_dir +dependencies: [] diff --git a/tests/integration/targets/aws_elasticbeanstalk_app/meta/main.yml b/tests/integration/targets/aws_elasticbeanstalk_app/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/aws_elasticbeanstalk_app/meta/main.yml +++ b/tests/integration/targets/aws_elasticbeanstalk_app/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/aws_kms/meta/main.yml b/tests/integration/targets/aws_kms/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/aws_kms/meta/main.yml +++ b/tests/integration/targets/aws_kms/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/aws_msk_cluster/meta/main.yml b/tests/integration/targets/aws_msk_cluster/meta/main.yml index bc4ebde80b9..32cf5dda7ed 100644 --- a/tests/integration/targets/aws_msk_cluster/meta/main.yml +++ b/tests/integration/targets/aws_msk_cluster/meta/main.yml @@ -1,2 +1 @@ -dependencies: - - setup_remote_tmp_dir \ No newline at end of file +dependencies: [] diff --git a/tests/integration/targets/aws_msk_config/meta/main.yml b/tests/integration/targets/aws_msk_config/meta/main.yml index bc4ebde80b9..32cf5dda7ed 100644 --- a/tests/integration/targets/aws_msk_config/meta/main.yml +++ b/tests/integration/targets/aws_msk_config/meta/main.yml @@ -1,2 +1 @@ -dependencies: - - setup_remote_tmp_dir \ No newline at end of file +dependencies: [] diff --git a/tests/integration/targets/aws_region_info/meta/main.yml b/tests/integration/targets/aws_region_info/meta/main.yml index 1810d4bec98..32cf5dda7ed 100644 --- a/tests/integration/targets/aws_region_info/meta/main.yml +++ b/tests/integration/targets/aws_region_info/meta/main.yml @@ -1,2 +1 @@ -dependencies: - - setup_remote_tmp_dir +dependencies: [] diff --git a/tests/integration/targets/ec2_eip/meta/main.yml b/tests/integration/targets/ec2_eip/meta/main.yml index 930e8622824..1471b11f658 100644 --- a/tests/integration/targets/ec2_eip/meta/main.yml +++ b/tests/integration/targets/ec2_eip/meta/main.yml @@ -1,3 +1,2 @@ dependencies: - - prepare_tests - setup_ec2_facts diff --git a/tests/integration/targets/ec2_launch_template/meta/main.yml b/tests/integration/targets/ec2_launch_template/meta/main.yml index ff334733333..e7d828b1255 100644 --- a/tests/integration/targets/ec2_launch_template/meta/main.yml +++ b/tests/integration/targets/ec2_launch_template/meta/main.yml @@ -1,8 +1,5 @@ dependencies: - - prepare_tests - - setup_ec2 - setup_ec2_facts - - setup_remote_tmp_dir - role: setup_botocore_pip vars: boto3_version: "1.20.30" diff --git a/tests/integration/targets/ec2_lc/meta/main.yml b/tests/integration/targets/ec2_lc/meta/main.yml index e3fef1b994a..282ee92f72d 100644 --- a/tests/integration/targets/ec2_lc/meta/main.yml +++ b/tests/integration/targets/ec2_lc/meta/main.yml @@ -1,6 +1,4 @@ dependencies: - - prepare_tests - - setup_ec2 - setup_ec2_facts - role: setup_botocore_pip vars: diff --git a/tests/integration/targets/ec2_metric_alarm/meta/main.yml b/tests/integration/targets/ec2_metric_alarm/meta/main.yml index a0c556a5cb1..1471b11f658 100644 --- a/tests/integration/targets/ec2_metric_alarm/meta/main.yml +++ b/tests/integration/targets/ec2_metric_alarm/meta/main.yml @@ -1,4 +1,2 @@ dependencies: - - prepare_tests - - setup_ec2 - setup_ec2_facts diff --git a/tests/integration/targets/ec2_scaling_policy/meta/main.yml b/tests/integration/targets/ec2_scaling_policy/meta/main.yml index a0c556a5cb1..1471b11f658 100644 --- a/tests/integration/targets/ec2_scaling_policy/meta/main.yml +++ b/tests/integration/targets/ec2_scaling_policy/meta/main.yml @@ -1,4 +1,2 @@ dependencies: - - prepare_tests - - setup_ec2 - setup_ec2_facts diff --git a/tests/integration/targets/ec2_vpc_nacl/meta/main.yml b/tests/integration/targets/ec2_vpc_nacl/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/ec2_vpc_nacl/meta/main.yml +++ b/tests/integration/targets/ec2_vpc_nacl/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/ecs_cluster/meta/main.yml b/tests/integration/targets/ecs_cluster/meta/main.yml index 1810d4bec98..32cf5dda7ed 100644 --- a/tests/integration/targets/ecs_cluster/meta/main.yml +++ b/tests/integration/targets/ecs_cluster/meta/main.yml @@ -1,2 +1 @@ -dependencies: - - setup_remote_tmp_dir +dependencies: [] diff --git a/tests/integration/targets/ecs_ecr/meta/main.yml b/tests/integration/targets/ecs_ecr/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/ecs_ecr/meta/main.yml +++ b/tests/integration/targets/ecs_ecr/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/elasticache_subnet_group/meta/main.yml b/tests/integration/targets/elasticache_subnet_group/meta/main.yml index 930e8622824..1471b11f658 100644 --- a/tests/integration/targets/elasticache_subnet_group/meta/main.yml +++ b/tests/integration/targets/elasticache_subnet_group/meta/main.yml @@ -1,3 +1,2 @@ dependencies: - - prepare_tests - setup_ec2_facts diff --git a/tests/integration/targets/elb_application_lb/meta/main.yml b/tests/integration/targets/elb_application_lb/meta/main.yml index 1810d4bec98..32cf5dda7ed 100644 --- a/tests/integration/targets/elb_application_lb/meta/main.yml +++ b/tests/integration/targets/elb_application_lb/meta/main.yml @@ -1,2 +1 @@ -dependencies: - - setup_remote_tmp_dir +dependencies: [] diff --git a/tests/integration/targets/elb_classic_lb_info/meta/main.yml b/tests/integration/targets/elb_classic_lb_info/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/elb_classic_lb_info/meta/main.yml +++ b/tests/integration/targets/elb_classic_lb_info/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/elb_instance/meta/main.yml b/tests/integration/targets/elb_instance/meta/main.yml index a0c556a5cb1..1471b11f658 100644 --- a/tests/integration/targets/elb_instance/meta/main.yml +++ b/tests/integration/targets/elb_instance/meta/main.yml @@ -1,4 +1,2 @@ dependencies: - - prepare_tests - - setup_ec2 - setup_ec2_facts diff --git a/tests/integration/targets/elb_network_lb/meta/main.yml b/tests/integration/targets/elb_network_lb/meta/main.yml index a0c556a5cb1..1471b11f658 100644 --- a/tests/integration/targets/elb_network_lb/meta/main.yml +++ b/tests/integration/targets/elb_network_lb/meta/main.yml @@ -1,4 +1,2 @@ dependencies: - - prepare_tests - - setup_ec2 - setup_ec2_facts diff --git a/tests/integration/targets/elb_target/meta/main.yml b/tests/integration/targets/elb_target/meta/main.yml index a0c556a5cb1..1471b11f658 100644 --- a/tests/integration/targets/elb_target/meta/main.yml +++ b/tests/integration/targets/elb_target/meta/main.yml @@ -1,4 +1,2 @@ dependencies: - - prepare_tests - - setup_ec2 - setup_ec2_facts diff --git a/tests/integration/targets/iam_access_key/meta/main.yml b/tests/integration/targets/iam_access_key/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/iam_access_key/meta/main.yml +++ b/tests/integration/targets/iam_access_key/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/iam_group/meta/main.yml b/tests/integration/targets/iam_group/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/iam_group/meta/main.yml +++ b/tests/integration/targets/iam_group/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/iam_role/meta/main.yml b/tests/integration/targets/iam_role/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/iam_role/meta/main.yml +++ b/tests/integration/targets/iam_role/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/iam_saml_federation/meta/main.yml b/tests/integration/targets/iam_saml_federation/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/iam_saml_federation/meta/main.yml +++ b/tests/integration/targets/iam_saml_federation/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/iam_server_certificate/meta/main.yml b/tests/integration/targets/iam_server_certificate/meta/main.yml index cb6005d042c..1810d4bec98 100644 --- a/tests/integration/targets/iam_server_certificate/meta/main.yml +++ b/tests/integration/targets/iam_server_certificate/meta/main.yml @@ -1,3 +1,2 @@ dependencies: - - prepare_tests - setup_remote_tmp_dir diff --git a/tests/integration/targets/iam_user/meta/main.yml b/tests/integration/targets/iam_user/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/iam_user/meta/main.yml +++ b/tests/integration/targets/iam_user/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/kinesis_stream/meta/main.yml b/tests/integration/targets/kinesis_stream/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/kinesis_stream/meta/main.yml +++ b/tests/integration/targets/kinesis_stream/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/lambda/meta/main.yml b/tests/integration/targets/lambda/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/lambda/meta/main.yml +++ b/tests/integration/targets/lambda/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/lambda_alias/meta/main.yml b/tests/integration/targets/lambda_alias/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/lambda_alias/meta/main.yml +++ b/tests/integration/targets/lambda_alias/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/lambda_policy/meta/main.yml b/tests/integration/targets/lambda_policy/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/lambda_policy/meta/main.yml +++ b/tests/integration/targets/lambda_policy/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/prepare_tests/tasks/main.yml b/tests/integration/targets/prepare_tests/tasks/main.yml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/integration/targets/rds_param_group/meta/main.yml b/tests/integration/targets/rds_param_group/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/rds_param_group/meta/main.yml +++ b/tests/integration/targets/rds_param_group/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/rds_param_group/tasks/main.yml b/tests/integration/targets/rds_param_group/tasks/main.yml index 677260d5ee1..cf2d2f9ac40 100644 --- a/tests/integration/targets/rds_param_group/tasks/main.yml +++ b/tests/integration/targets/rds_param_group/tasks/main.yml @@ -11,7 +11,6 @@ # TODO - name: test 'validate_certs' parameter # ============================================================ -# - include: ../../setup_ec2/tasks/common.yml module_name=rds_param_group - name: rds_option_group tests collections: diff --git a/tests/integration/targets/rds_subnet_group/meta/main.yml b/tests/integration/targets/rds_subnet_group/meta/main.yml index 9d91be1705b..32cf5dda7ed 100644 --- a/tests/integration/targets/rds_subnet_group/meta/main.yml +++ b/tests/integration/targets/rds_subnet_group/meta/main.yml @@ -1,3 +1 @@ -dependencies: -- prepare_tests -- setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/redshift/meta/main.yml b/tests/integration/targets/redshift/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/redshift/meta/main.yml +++ b/tests/integration/targets/redshift/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/redshift_subnet_group/meta/main.yml b/tests/integration/targets/redshift_subnet_group/meta/main.yml index 930e8622824..1471b11f658 100644 --- a/tests/integration/targets/redshift_subnet_group/meta/main.yml +++ b/tests/integration/targets/redshift_subnet_group/meta/main.yml @@ -1,3 +1,2 @@ dependencies: - - prepare_tests - setup_ec2_facts diff --git a/tests/integration/targets/route53_health_check/meta/main.yml b/tests/integration/targets/route53_health_check/meta/main.yml index 930e8622824..1471b11f658 100644 --- a/tests/integration/targets/route53_health_check/meta/main.yml +++ b/tests/integration/targets/route53_health_check/meta/main.yml @@ -1,3 +1,2 @@ dependencies: - - prepare_tests - setup_ec2_facts diff --git a/tests/integration/targets/s3_bucket_notification/meta/main.yml b/tests/integration/targets/s3_bucket_notification/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/s3_bucket_notification/meta/main.yml +++ b/tests/integration/targets/s3_bucket_notification/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/s3_sync/meta/main.yml b/tests/integration/targets/s3_sync/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/s3_sync/meta/main.yml +++ b/tests/integration/targets/s3_sync/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/setup_ec2/defaults/main.yml b/tests/integration/targets/setup_ec2/defaults/main.yml deleted file mode 100644 index fb1f88b1ecb..00000000000 --- a/tests/integration/targets/setup_ec2/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -resource_prefix: 'ansible-testing-' diff --git a/tests/integration/targets/setup_ec2/tasks/common.yml b/tests/integration/targets/setup_ec2/tasks/common.yml deleted file mode 100644 index bf23f539a9e..00000000000 --- a/tests/integration/targets/setup_ec2/tasks/common.yml +++ /dev/null @@ -1,119 +0,0 @@ ---- - -# ============================================================ -- name: test with no parameters - action: "{{module_name}}" - register: result - ignore_errors: true - -- name: assert failure when called with no parameters - assert: - that: - - 'result.failed' - - 'result.msg == "missing required arguments: name"' - -# ============================================================ -- name: test with only name - action: "{{module_name}} name={{ec2_key_name}}" - register: result - ignore_errors: true - -- name: assert failure when called with only 'name' - assert: - that: - - 'result.failed' - - 'result.msg == "Either region or ec2_url must be specified"' - -# ============================================================ -- name: test invalid region parameter - action: "{{module_name}} name='{{ec2_key_name}}' region='asdf querty 1234'" - register: result - ignore_errors: true - -- name: assert invalid region parameter - assert: - that: - - 'result.failed' - - 'result.msg.startswith("value of region must be one of:")' - -# ============================================================ -- name: test valid region parameter - action: "{{module_name}} name='{{ec2_key_name}}' region='{{ec2_region}}'" - register: result - ignore_errors: true - -- name: assert valid region parameter - assert: - that: - - 'result.failed' - - 'result.msg.startswith("No handler was ready to authenticate.")' - -# ============================================================ -- name: test environment variable EC2_REGION - action: "{{module_name}} name='{{ec2_key_name}}'" - environment: - EC2_REGION: '{{ec2_region}}' - register: result - ignore_errors: true - -- name: assert environment variable EC2_REGION - assert: - that: - - 'result.failed' - - 'result.msg.startswith("No handler was ready to authenticate.")' - -# ============================================================ -- name: test invalid ec2_url parameter - action: "{{module_name}} name='{{ec2_key_name}}'" - environment: - EC2_URL: bogus.example.com - register: result - ignore_errors: true - -- name: assert invalid ec2_url parameter - assert: - that: - - 'result.failed' - - 'result.msg.startswith("No handler was ready to authenticate.")' - -# ============================================================ -- name: test valid ec2_url parameter - action: "{{module_name}} name='{{ec2_key_name}}'" - environment: - EC2_URL: '{{ec2_url}}' - register: result - ignore_errors: true - -- name: assert valid ec2_url parameter - assert: - that: - - 'result.failed' - - 'result.msg.startswith("No handler was ready to authenticate.")' - -# ============================================================ -- name: test credentials from environment - action: "{{module_name}} name='{{ec2_key_name}}'" - environment: - EC2_REGION: '{{ec2_region}}' - EC2_ACCESS_KEY: bogus_access_key - EC2_SECRET_KEY: bogus_secret_key - register: result - ignore_errors: true - -- name: assert ec2_key with valid ec2_url - assert: - that: - - 'result.failed' - - '"EC2ResponseError: 401 Unauthorized" in result.msg' - -# ============================================================ -- name: test credential parameters - action: "{{module_name}} name='{{ec2_key_name}}' ec2_region='{{ec2_region}}' ec2_access_key=bogus_access_key ec2_secret_key=bogus_secret_key" - register: result - ignore_errors: true - -- name: assert credential parameters - assert: - that: - - 'result.failed' - - '"EC2ResponseError: 401 Unauthorized" in result.msg' diff --git a/tests/integration/targets/setup_ec2/vars/main.yml b/tests/integration/targets/setup_ec2/vars/main.yml deleted file mode 100644 index 3d7209ef1b0..00000000000 --- a/tests/integration/targets/setup_ec2/vars/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -ec2_url: ec2.amazonaws.com -ec2_region: us-east-1 diff --git a/tests/integration/targets/setup_remote_tmp_dir/tasks/default.yml b/tests/integration/targets/setup_remote_tmp_dir/tasks/default.yml index 1e0f51b8904..00877dca033 100644 --- a/tests/integration/targets/setup_remote_tmp_dir/tasks/default.yml +++ b/tests/integration/targets/setup_remote_tmp_dir/tasks/default.yml @@ -1,5 +1,6 @@ - name: create temporary directory tempfile: + path: /var/tmp state: directory suffix: .test register: remote_tmp_dir diff --git a/tests/integration/targets/sts_assume_role/meta/main.yml b/tests/integration/targets/sts_assume_role/meta/main.yml index 1f64f1169a9..32cf5dda7ed 100644 --- a/tests/integration/targets/sts_assume_role/meta/main.yml +++ b/tests/integration/targets/sts_assume_role/meta/main.yml @@ -1,3 +1 @@ -dependencies: - - prepare_tests - - setup_ec2 +dependencies: [] diff --git a/tests/integration/targets/wafv2/meta/main.yml b/tests/integration/targets/wafv2/meta/main.yml index 4afae0b9340..48afe005075 100644 --- a/tests/integration/targets/wafv2/meta/main.yml +++ b/tests/integration/targets/wafv2/meta/main.yml @@ -1,5 +1,4 @@ dependencies: - - setup_remote_tmp_dir - role: setup_botocore_pip vars: boto3_version: "1.18.0"