From 3e0da8dfffccd6428c885ae70cccb2186648d992 Mon Sep 17 00:00:00 2001 From: Mark Chappell Date: Thu, 31 Aug 2023 01:00:53 +0200 Subject: [PATCH] Mass update of docs and tests (credentials/session tokens) (#1714) Mass update of docs and tests (credentials/session tokens) SUMMARY We had a cleanup of credentials/session parameters which included a batch of deprecations and renames. Ensure that all of our tests and docs are using the 'canonical' names ISSUE TYPE Docs Pull Request COMPONENT NAME plugins/inventory/aws_ec2.py plugins/lookup/secretsmanager_secret.py plugins/lookup/ssm_parameter.py plugins/modules/ec2_security_group.py tests/integration/targets ADDITIONAL INFORMATION See Also: #1172 Reviewed-by: Alina Buzachis Reviewed-by: Mark Chappell --- changelogs/fragments/1714-parameters.yml | 2 ++ plugins/inventory/aws_ec2.py | 6 +++--- plugins/lookup/secretsmanager_secret.py | 4 ++-- plugins/lookup/ssm_parameter.py | 6 +++--- plugins/modules/ec2_security_group.py | 11 ++--------- tests/integration/targets/autoscaling_group/main.yml | 6 +++--- .../roles/ec2_asg/tasks/create_update_delete.yml | 6 +++--- .../autoscaling_group/roles/ec2_asg/tasks/main.yml | 6 +++--- tests/integration/targets/aws_az_info/tasks/main.yml | 8 ++++---- .../targets/aws_caller_info/tasks/main.yaml | 6 +++--- tests/integration/targets/backup_plan/tasks/main.yml | 6 +++--- .../targets/backup_selection/tasks/main.yml | 6 +++--- tests/integration/targets/backup_tag/tasks/main.yml | 6 +++--- .../integration/targets/backup_vault/tasks/main.yml | 6 +++--- .../targets/callback_aws_resource_actions/main.yml | 6 +++--- .../targets/cloudformation/tasks/main.yml | 8 ++++---- tests/integration/targets/cloudtrail/tasks/main.yml | 6 +++--- .../targets/cloudwatch_metric_alarm/tasks/main.yml | 6 +++--- .../targets/cloudwatchevent_rule/tasks/main.yml | 6 +++--- .../targets/cloudwatchlogs/tasks/main.yml | 6 +++--- tests/integration/targets/ec2_ami/tasks/main.yml | 6 +++--- .../targets/ec2_ami_instance/tasks/main.yml | 6 +++--- .../targets/ec2_ami_snapshot/tasks/main.yml | 6 +++--- tests/integration/targets/ec2_ami_tpm/tasks/main.yml | 6 +++--- tests/integration/targets/ec2_eip/tasks/main.yml | 6 +++--- tests/integration/targets/ec2_eni/tasks/main.yaml | 6 +++--- .../ec2_instance_block_devices/tasks/main.yml | 6 +++--- .../ec2_instance_checkmode_tests/tasks/main.yml | 6 +++--- .../targets/ec2_instance_cpu_options/tasks/main.yml | 6 +++--- .../ec2_instance_default_vpc_tests/tasks/main.yml | 6 +++--- .../ec2_instance_ebs_optimized/tasks/main.yml | 6 +++--- .../tasks/main.yml | 6 +++--- .../ec2_instance_hibernation_options/tasks/main.yml | 6 +++--- .../ec2_instance_iam_instance_role/tasks/main.yml | 6 +++--- .../ec2_instance_instance_minimal/tasks/main.yml | 6 +++--- .../ec2_instance_instance_multiple/tasks/main.yml | 6 +++--- .../ec2_instance_instance_no_wait/tasks/main.yml | 6 +++--- .../ec2_instance_metadata_options/tasks/main.yml | 6 +++--- .../ec2_instance_security_group/tasks/main.yml | 6 +++--- .../ec2_instance_state_config_updates/tasks/main.yml | 6 +++--- .../tasks/main.yml | 6 +++--- .../tasks/main.yml | 6 +++--- .../targets/ec2_instance_uptime/tasks/main.yml | 6 +++--- tests/integration/targets/ec2_key/tasks/main.yml | 6 +++--- .../targets/ec2_metadata_facts/playbooks/setup.yml | 12 ++++++------ .../ec2_metadata_facts/playbooks/teardown.yml | 6 +++--- .../targets/ec2_security_group/tasks/main.yml | 12 ++++++------ .../integration/targets/ec2_snapshot/tasks/main.yml | 6 +++--- .../targets/ec2_spot_instance/tasks/main.yaml | 6 +++--- tests/integration/targets/ec2_tag/tasks/main.yml | 6 +++--- tests/integration/targets/ec2_vol/tasks/main.yml | 8 ++++---- .../targets/ec2_vpc_dhcp_option/tasks/main.yml | 6 +++--- .../targets/ec2_vpc_endpoint/tasks/main.yml | 6 +++--- .../ec2_vpc_endpoint_service_info/tasks/main.yml | 6 +++--- tests/integration/targets/ec2_vpc_igw/tasks/main.yml | 6 +++--- .../targets/ec2_vpc_nat_gateway/tasks/main.yml | 6 +++--- tests/integration/targets/ec2_vpc_net/tasks/main.yml | 6 +++--- .../targets/ec2_vpc_route_table/tasks/main.yml | 6 +++--- .../targets/ec2_vpc_subnet/tasks/main.yml | 6 +++--- .../targets/elb_application_lb/tasks/main.yml | 6 +++--- .../targets/elb_classic_lb/tasks/main.yml | 6 +++--- .../targets/iam_instance_profile/tasks/main.yml | 6 +++--- tests/integration/targets/iam_policy/tasks/main.yml | 6 +++--- tests/integration/targets/iam_user/tasks/main.yml | 6 +++--- .../playbooks/manage_ec2_instances.yml | 6 +++--- .../inventory_aws_ec2/playbooks/populate_cache.yml | 6 +++--- .../playbooks/test_inventory_ssm.yml | 6 +++--- .../test_populating_inventory_with_concatenation.yml | 6 +++--- .../test_populating_inventory_with_constructed.yml | 6 +++--- ...opulating_inventory_with_hostnames_using_tags.yml | 6 +++--- ...g_inventory_with_hostnames_using_tags_classic.yml | 6 +++--- ...ulating_inventory_with_hostvars_prefix_suffix.yml | 6 +++--- ...ing_inventory_with_include_or_exclude_filters.yml | 6 +++--- ...test_populating_inventory_with_literal_string.yml | 6 +++--- ...lating_inventory_with_use_contrib_script_keys.yml | 6 +++--- .../inventory_aws_ec2/templates/inventory.yml.j2 | 6 +++--- .../templates/inventory_with_cache.yml.j2 | 6 +++--- .../templates/inventory_with_concatenation.yml.j2 | 6 +++--- .../templates/inventory_with_constructed.yml.j2 | 6 +++--- .../inventory_with_hostnames_using_tags.yml.j2 | 6 +++--- ...nventory_with_hostnames_using_tags_classic.yml.j2 | 6 +++--- .../inventory_with_hostvars_prefix_suffix.yml.j2 | 6 +++--- .../inventory_with_include_or_exclude_filters.yml.j2 | 6 +++--- .../templates/inventory_with_literal_string.yml.j2 | 6 +++--- .../templates/inventory_with_ssm.yml.j2 | 6 +++--- .../templates/inventory_with_template.yml.j2 | 6 +++--- .../inventory_with_use_contrib_script_keys.yml.j2 | 6 +++--- .../inventory_aws_rds/playbooks/populate_cache.yml | 6 +++--- .../inventory_aws_rds/playbooks/setup_instance.yml | 6 +++--- .../test_inventory_with_hostvars_prefix_suffix.yml | 6 +++--- .../test_populating_inventory_with_constructed.yml | 6 +++--- .../targets/inventory_aws_rds/templates/inventory.j2 | 6 +++--- .../templates/inventory_with_cache.j2 | 6 +++--- .../templates/inventory_with_constructed.j2 | 6 +++--- .../inventory_with_hostvars_prefix_suffix.j2 | 6 +++--- .../targets/kms_key/roles/aws_kms/tasks/main.yml | 6 +++--- tests/integration/targets/lambda/tasks/main.yml | 6 +++--- .../integration/targets/lambda_alias/tasks/main.yml | 6 +++--- .../integration/targets/lambda_event/tasks/main.yml | 6 +++--- .../integration/targets/lambda_layer/tasks/main.yml | 8 ++++---- .../integration/targets/lambda_policy/tasks/main.yml | 6 +++--- .../lookup_aws_account_attribute/tasks/main.yaml | 12 ++++++------ .../lookup_secretsmanager_secret/tasks/main.yaml | 12 ++++++------ .../targets/lookup_ssm_parameter/tasks/main.yml | 12 ++++++------ .../roles/get_waiter/tasks/main.yml | 2 +- .../targets/rds_cluster_create/tasks/main.yaml | 6 +++--- .../targets/rds_cluster_create_sgs/tasks/main.yaml | 6 +++--- .../targets/rds_cluster_modify/tasks/main.yaml | 6 +++--- .../targets/rds_cluster_multi_az/tasks/main.yml | 6 +++--- .../targets/rds_cluster_promote/tasks/main.yaml | 6 +++--- .../targets/rds_cluster_restore/tasks/main.yaml | 6 +++--- .../targets/rds_cluster_snapshot/tasks/main.yml | 6 +++--- .../targets/rds_cluster_states/tasks/main.yml | 6 +++--- .../targets/rds_cluster_tag/tasks/main.yaml | 6 +++--- .../targets/rds_instance_aurora/tasks/main.yml | 6 +++--- .../targets/rds_instance_complex/tasks/main.yml | 6 +++--- .../targets/rds_instance_modify/tasks/main.yml | 6 +++--- .../targets/rds_instance_processor/tasks/main.yml | 6 +++--- .../targets/rds_instance_replica/tasks/main.yml | 6 +++--- .../targets/rds_instance_restore/tasks/main.yml | 6 +++--- .../targets/rds_instance_sgroups/tasks/main.yml | 6 +++--- .../targets/rds_instance_snapshot/tasks/main.yml | 6 +++--- .../rds_instance_snapshot_mgmt/tasks/main.yml | 6 +++--- .../targets/rds_instance_states/tasks/main.yml | 6 +++--- .../targets/rds_instance_tagging/tasks/main.yml | 6 +++--- .../targets/rds_instance_upgrade/tasks/main.yml | 6 +++--- .../targets/rds_option_group/tasks/main.yml | 6 +++--- .../targets/rds_subnet_group/tasks/main.yml | 6 +++--- tests/integration/targets/route53/tasks/main.yml | 6 +++--- .../targets/route53_health_check/tasks/main.yml | 6 +++--- .../integration/targets/route53_zone/tasks/main.yml | 6 +++--- .../targets/s3_bucket/roles/s3_bucket/tasks/acl.yml | 6 +++--- .../roles/s3_bucket/tasks/encryption_bucket_key.yml | 6 +++--- .../roles/s3_bucket/tasks/encryption_kms.yml | 6 +++--- .../roles/s3_bucket/tasks/encryption_sse.yml | 6 +++--- .../targets/s3_bucket/roles/s3_bucket/tasks/main.yml | 6 +++--- .../s3_bucket/roles/s3_bucket/tasks/object_lock.yml | 6 +++--- .../roles/s3_bucket/tasks/ownership_controls.yml | 6 +++--- .../roles/s3_bucket/tasks/public_access.yml | 6 +++--- tests/integration/targets/s3_object/tasks/main.yml | 6 +++--- .../targets/setup_ec2_facts/tasks/main.yml | 6 +++--- .../targets/setup_ec2_instance_env/tasks/cleanup.yml | 6 +++--- .../targets/setup_ec2_instance_env/tasks/main.yml | 6 +++--- .../targets/setup_ec2_vpc/tasks/cleanup.yml | 6 +++--- 144 files changed, 446 insertions(+), 451 deletions(-) create mode 100644 changelogs/fragments/1714-parameters.yml diff --git a/changelogs/fragments/1714-parameters.yml b/changelogs/fragments/1714-parameters.yml new file mode 100644 index 00000000000..f2d41058466 --- /dev/null +++ b/changelogs/fragments/1714-parameters.yml @@ -0,0 +1,2 @@ +trivial: +- update docs and integration tests to use the canonical parameter names for the credentials parameters. diff --git a/plugins/inventory/aws_ec2.py b/plugins/inventory/aws_ec2.py index 6de182bd59e..d146aad987c 100644 --- a/plugins/inventory/aws_ec2.py +++ b/plugins/inventory/aws_ec2.py @@ -157,9 +157,9 @@ # Example using filters, ignoring permission errors, and specifying the hostname precedence plugin: amazon.aws.aws_ec2 # The values for profile, access key, secret key and token can be hardcoded like: -boto_profile: aws_profile +profile: aws_profile # or you could use Jinja as: -# boto_profile: "{{ lookup('env', 'AWS_PROFILE') | default('aws_profile', true) }}" +# profile: "{{ lookup('env', 'AWS_PROFILE') | default('aws_profile', true) }}" # Populate inventory with instances in these regions regions: - us-east-1 @@ -243,7 +243,7 @@ # Example using groups to assign the running hosts to a group based on vpc_id plugin: amazon.aws.aws_ec2 -boto_profile: aws_profile +profile: aws_profile # Populate inventory with instances in these regions regions: - us-east-2 diff --git a/plugins/lookup/secretsmanager_secret.py b/plugins/lookup/secretsmanager_secret.py index ade69945343..5029eadf508 100644 --- a/plugins/lookup/secretsmanager_secret.py +++ b/plugins/lookup/secretsmanager_secret.py @@ -105,8 +105,8 @@ # If an object is of the form `{"key1":{"key2":{"key3":1}}}` the query would return the value `1`. - name: lookup secretsmanager secret in a specific region using specified region and aws profile using nested feature debug: > - msg="{{ lookup('amazon.aws.aws_secret', 'secrets.environments.production.password', region=region, aws_profile=aws_profile, - aws_access_key=aws_access_key, aws_secret_key=aws_secret_key, nested=true) }}" + msg="{{ lookup('amazon.aws.aws_secret', 'secrets.environments.production.password', region=region, profile=aws_profile, + access_key=aws_access_key, secret_key=aws_secret_key, nested=true) }}" # The secret can be queried using the following syntax: `aws_secret_object_name.key1.key2.key3`. # If an object is of the form `{"key1":{"key2":{"key3":1}}}` the query would return the value `1`. # Region is the AWS region where the AWS secret is stored. diff --git a/plugins/lookup/ssm_parameter.py b/plugins/lookup/ssm_parameter.py index 167375c53cf..dad4357a0f8 100644 --- a/plugins/lookup/ssm_parameter.py +++ b/plugins/lookup/ssm_parameter.py @@ -85,13 +85,13 @@ debug: msg="{{ lookup('amazon.aws.aws_ssm', 'Hello', decrypt=False ) }}" - name: lookup ssm parameter store using a specified aws profile - debug: msg="{{ lookup('amazon.aws.aws_ssm', 'Hello', aws_profile='myprofile' ) }}" + debug: msg="{{ lookup('amazon.aws.aws_ssm', 'Hello', profile='myprofile' ) }}" - name: lookup ssm parameter store using explicit aws credentials - debug: msg="{{ lookup('amazon.aws.aws_ssm', 'Hello', aws_access_key=my_aws_access_key, aws_secret_key=my_aws_secret_key, aws_security_token=my_security_token ) }}" # noqa: E501 + debug: msg="{{ lookup('amazon.aws.aws_ssm', 'Hello', access_key=my_aws_access_key, secret_key=my_aws_secret_key, session_token=my_session_token ) }}" # noqa: E501 - name: lookup ssm parameter store with all options - debug: msg="{{ lookup('amazon.aws.aws_ssm', 'Hello', decrypt=false, region='us-east-2', aws_profile='myprofile') }}" + debug: msg="{{ lookup('amazon.aws.aws_ssm', 'Hello', decrypt=false, region='us-east-2', profile='myprofile') }}" - name: lookup ssm parameter and fail if missing debug: msg="{{ lookup('amazon.aws.aws_ssm', 'missing-parameter') }}" diff --git a/plugins/modules/ec2_security_group.py b/plugins/modules/ec2_security_group.py index f3d8bdc8f42..a5dc7f66ed1 100644 --- a/plugins/modules/ec2_security_group.py +++ b/plugins/modules/ec2_security_group.py @@ -285,13 +285,13 @@ """ EXAMPLES = r""" +# Note: These examples do not set authentication details, see the AWS Guide for details. + - name: example using security group rule descriptions amazon.aws.ec2_security_group: name: "{{ name }}" description: sg with rule descriptions vpc_id: vpc-xxxxxxxx - profile: "{{ aws_profile }}" - region: us-east-1 rules: - proto: tcp ports: @@ -304,8 +304,6 @@ name: "{{ name }}" description: sg for ICMP vpc_id: vpc-xxxxxxxx - profile: "{{ aws_profile }}" - region: us-east-1 rules: - proto: icmp icmp_type: 3 @@ -317,9 +315,6 @@ name: example description: an example EC2 group vpc_id: 12345 - region: eu-west-1 - aws_secret_key: SECRET - aws_access_key: ACCESS rules: - proto: tcp from_port: 80 @@ -377,7 +372,6 @@ name: example2 description: an example2 EC2 group vpc_id: 12345 - region: eu-west-1 rules: # 'ports' rule keyword was introduced in version 2.4. It accepts a single # port value or a list of values including ranges (from_port-to_port). @@ -414,7 +408,6 @@ - name: "Delete group by its id" amazon.aws.ec2_security_group: - region: eu-west-1 group_id: sg-33b4ee5b state: absent """ diff --git a/tests/integration/targets/autoscaling_group/main.yml b/tests/integration/targets/autoscaling_group/main.yml index d2479e44f45..671fd3aef09 100644 --- a/tests/integration/targets/autoscaling_group/main.yml +++ b/tests/integration/targets/autoscaling_group/main.yml @@ -9,9 +9,9 @@ tasks: - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: - include_role: diff --git a/tests/integration/targets/autoscaling_group/roles/ec2_asg/tasks/create_update_delete.yml b/tests/integration/targets/autoscaling_group/roles/ec2_asg/tasks/create_update_delete.yml index 456973ce417..21366d4af65 100644 --- a/tests/integration/targets/autoscaling_group/roles/ec2_asg/tasks/create_update_delete.yml +++ b/tests/integration/targets/autoscaling_group/roles/ec2_asg/tasks/create_update_delete.yml @@ -7,9 +7,9 @@ - name: test without specifying required module options autoscaling_group: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' ignore_errors: true register: result - name: assert name is a required module option diff --git a/tests/integration/targets/autoscaling_group/roles/ec2_asg/tasks/main.yml b/tests/integration/targets/autoscaling_group/roles/ec2_asg/tasks/main.yml index ed381fcf30a..68e71c2ced4 100644 --- a/tests/integration/targets/autoscaling_group/roles/ec2_asg/tasks/main.yml +++ b/tests/integration/targets/autoscaling_group/roles/ec2_asg/tasks/main.yml @@ -5,9 +5,9 @@ - name: Wrap up all tests and setup AWS credentials module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' aws_config: retries: diff --git a/tests/integration/targets/aws_az_info/tasks/main.yml b/tests/integration/targets/aws_az_info/tasks/main.yml index 0787ea1210e..1ae90be1b54 100644 --- a/tests/integration/targets/aws_az_info/tasks/main.yml +++ b/tests/integration/targets/aws_az_info/tasks/main.yml @@ -1,10 +1,10 @@ --- - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key | default(omit) }}' - aws_secret_key: '{{ aws_secret_key | default(omit) }}' - security_token: '{{ security_token | default(omit) }}' - region: '{{ aws_region | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' + region: '{{ aws_region }}' block: - name: 'List available AZs in current Region' diff --git a/tests/integration/targets/aws_caller_info/tasks/main.yaml b/tests/integration/targets/aws_caller_info/tasks/main.yaml index c40d0f11b88..9006e107d95 100644 --- a/tests/integration/targets/aws_caller_info/tasks/main.yaml +++ b/tests/integration/targets/aws_caller_info/tasks/main.yaml @@ -1,9 +1,9 @@ - module_defaults: group/aws: region: "{{ aws_region }}" - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" block: - name: retrieve caller facts aws_caller_info: diff --git a/tests/integration/targets/backup_plan/tasks/main.yml b/tests/integration/targets/backup_plan/tasks/main.yml index 86e35019031..f5e2bcb34f3 100644 --- a/tests/integration/targets/backup_plan/tasks/main.yml +++ b/tests/integration/targets/backup_plan/tasks/main.yml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: Create a backup vault for the plan to target diff --git a/tests/integration/targets/backup_selection/tasks/main.yml b/tests/integration/targets/backup_selection/tasks/main.yml index 239eb4b5b0f..da8d3ecbe44 100644 --- a/tests/integration/targets/backup_selection/tasks/main.yml +++ b/tests/integration/targets/backup_selection/tasks/main.yml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: diff --git a/tests/integration/targets/backup_tag/tasks/main.yml b/tests/integration/targets/backup_tag/tasks/main.yml index 248e0cdb3c6..81140414bdd 100644 --- a/tests/integration/targets/backup_tag/tasks/main.yml +++ b/tests/integration/targets/backup_tag/tasks/main.yml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: diff --git a/tests/integration/targets/backup_vault/tasks/main.yml b/tests/integration/targets/backup_vault/tasks/main.yml index 24f27b7d597..f15588e8d12 100644 --- a/tests/integration/targets/backup_vault/tasks/main.yml +++ b/tests/integration/targets/backup_vault/tasks/main.yml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: create a key diff --git a/tests/integration/targets/callback_aws_resource_actions/main.yml b/tests/integration/targets/callback_aws_resource_actions/main.yml index b3c3fa155c4..62fc554d3d0 100644 --- a/tests/integration/targets/callback_aws_resource_actions/main.yml +++ b/tests/integration/targets/callback_aws_resource_actions/main.yml @@ -4,9 +4,9 @@ - amazon.aws module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" tasks: - ec2_instance_info: diff --git a/tests/integration/targets/cloudformation/tasks/main.yml b/tests/integration/targets/cloudformation/tasks/main.yml index b6e5932798a..3794c3e6383 100644 --- a/tests/integration/targets/cloudformation/tasks/main.yml +++ b/tests/integration/targets/cloudformation/tasks/main.yml @@ -1,10 +1,10 @@ --- - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key | default(omit) }}' - aws_secret_key: '{{ aws_secret_key | default(omit) }}' - security_token: '{{ security_token | default(omit) }}' - region: '{{ aws_region | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' + region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/cloudtrail/tasks/main.yml b/tests/integration/targets/cloudtrail/tasks/main.yml index ec9b22879de..60d1dad95c0 100644 --- a/tests/integration/targets/cloudtrail/tasks/main.yml +++ b/tests/integration/targets/cloudtrail/tasks/main.yml @@ -1347,9 +1347,9 @@ state: present name: '{{ cloudtrail_name }}' kms_key_id: 'alias/{{ kms_alias }}' - aws_access_key: "{{ noKms_assumed_role.sts_creds.access_key }}" - aws_secret_key: "{{ noKms_assumed_role.sts_creds.secret_key }}" - security_token: "{{ noKms_assumed_role.sts_creds.session_token }}" + access_key: "{{ noKms_assumed_role.sts_creds.access_key }}" + secret_key: "{{ noKms_assumed_role.sts_creds.secret_key }}" + session_token: "{{ noKms_assumed_role.sts_creds.session_token }}" check_mode: yes register: output - assert: diff --git a/tests/integration/targets/cloudwatch_metric_alarm/tasks/main.yml b/tests/integration/targets/cloudwatch_metric_alarm/tasks/main.yml index 61c387c4422..7a3ca289177 100644 --- a/tests/integration/targets/cloudwatch_metric_alarm/tasks/main.yml +++ b/tests/integration/targets/cloudwatch_metric_alarm/tasks/main.yml @@ -1,9 +1,9 @@ - name: run cloudwatch_metric_alarm tests module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: - set_fact: diff --git a/tests/integration/targets/cloudwatchevent_rule/tasks/main.yml b/tests/integration/targets/cloudwatchevent_rule/tasks/main.yml index 9243742d786..c92723e29b8 100644 --- a/tests/integration/targets/cloudwatchevent_rule/tasks/main.yml +++ b/tests/integration/targets/cloudwatchevent_rule/tasks/main.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: diff --git a/tests/integration/targets/cloudwatchlogs/tasks/main.yml b/tests/integration/targets/cloudwatchlogs/tasks/main.yml index e5e0f072b28..6c06ba990c2 100644 --- a/tests/integration/targets/cloudwatchlogs/tasks/main.yml +++ b/tests/integration/targets/cloudwatchlogs/tasks/main.yml @@ -2,9 +2,9 @@ - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/ec2_ami/tasks/main.yml b/tests/integration/targets/ec2_ami/tasks/main.yml index 79f9302b74d..6d61e0b1f94 100644 --- a/tests/integration/targets/ec2_ami/tasks/main.yml +++ b/tests/integration/targets/ec2_ami/tasks/main.yml @@ -3,9 +3,9 @@ - module_defaults: group/aws: aws_region: '{{ aws_region }}' - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' collections: - amazon.aws block: diff --git a/tests/integration/targets/ec2_ami_instance/tasks/main.yml b/tests/integration/targets/ec2_ami_instance/tasks/main.yml index 24aace168aa..1a45d353266 100644 --- a/tests/integration/targets/ec2_ami_instance/tasks/main.yml +++ b/tests/integration/targets/ec2_ami_instance/tasks/main.yml @@ -3,9 +3,9 @@ - module_defaults: group/aws: aws_region: '{{ aws_region }}' - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' collections: - amazon.aws block: diff --git a/tests/integration/targets/ec2_ami_snapshot/tasks/main.yml b/tests/integration/targets/ec2_ami_snapshot/tasks/main.yml index fb8531686a7..b405a838ea7 100644 --- a/tests/integration/targets/ec2_ami_snapshot/tasks/main.yml +++ b/tests/integration/targets/ec2_ami_snapshot/tasks/main.yml @@ -3,9 +3,9 @@ - module_defaults: group/aws: aws_region: '{{ aws_region }}' - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' collections: - amazon.aws block: diff --git a/tests/integration/targets/ec2_ami_tpm/tasks/main.yml b/tests/integration/targets/ec2_ami_tpm/tasks/main.yml index c1521fc8e35..092f72a5574 100644 --- a/tests/integration/targets/ec2_ami_tpm/tasks/main.yml +++ b/tests/integration/targets/ec2_ami_tpm/tasks/main.yml @@ -3,9 +3,9 @@ - module_defaults: group/aws: aws_region: '{{ aws_region }}' - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' collections: - amazon.aws block: diff --git a/tests/integration/targets/ec2_eip/tasks/main.yml b/tests/integration/targets/ec2_eip/tasks/main.yml index 10d69f59ad9..72ef028e664 100644 --- a/tests/integration/targets/ec2_eip/tasks/main.yml +++ b/tests/integration/targets/ec2_eip/tasks/main.yml @@ -1,9 +1,9 @@ - name: Integration testing for ec2_eip module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' amazon.aws.ec2_eip: in_vpc: true diff --git a/tests/integration/targets/ec2_eni/tasks/main.yaml b/tests/integration/targets/ec2_eni/tasks/main.yaml index 3702a9f0c2c..b11bda01e64 100644 --- a/tests/integration/targets/ec2_eni/tasks/main.yaml +++ b/tests/integration/targets/ec2_eni/tasks/main.yaml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: diff --git a/tests/integration/targets/ec2_instance_block_devices/tasks/main.yml b/tests/integration/targets/ec2_instance_block_devices/tasks/main.yml index 5e27d5ab0b2..2a4f1cabac1 100644 --- a/tests/integration/targets/ec2_instance_block_devices/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_block_devices/tasks/main.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: "New instance with an extra block device" diff --git a/tests/integration/targets/ec2_instance_checkmode_tests/tasks/main.yml b/tests/integration/targets/ec2_instance_checkmode_tests/tasks/main.yml index 2ffa2f9df5c..72ec2ed0c58 100644 --- a/tests/integration/targets/ec2_instance_checkmode_tests/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_checkmode_tests/tasks/main.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: "Make basic instance" diff --git a/tests/integration/targets/ec2_instance_cpu_options/tasks/main.yml b/tests/integration/targets/ec2_instance_cpu_options/tasks/main.yml index a0bdd410696..4aea79c047a 100644 --- a/tests/integration/targets/ec2_instance_cpu_options/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_cpu_options/tasks/main.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: "create t3.nano instance with cpu_options" diff --git a/tests/integration/targets/ec2_instance_default_vpc_tests/tasks/main.yml b/tests/integration/targets/ec2_instance_default_vpc_tests/tasks/main.yml index 3abcf0f8a28..de9735fc0f9 100644 --- a/tests/integration/targets/ec2_instance_default_vpc_tests/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_default_vpc_tests/tasks/main.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: "Make instance in a default subnet of the VPC" diff --git a/tests/integration/targets/ec2_instance_ebs_optimized/tasks/main.yml b/tests/integration/targets/ec2_instance_ebs_optimized/tasks/main.yml index d01ee77ee5c..e469a3a66e9 100644 --- a/tests/integration/targets/ec2_instance_ebs_optimized/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_ebs_optimized/tasks/main.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: "Make EBS optimized instance in the testing subnet of the test VPC" diff --git a/tests/integration/targets/ec2_instance_external_resource_attach/tasks/main.yml b/tests/integration/targets/ec2_instance_external_resource_attach/tasks/main.yml index 7aa2c196067..259c14712c2 100644 --- a/tests/integration/targets/ec2_instance_external_resource_attach/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_external_resource_attach/tasks/main.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: # Make custom ENIs and attach via the `network` parameter diff --git a/tests/integration/targets/ec2_instance_hibernation_options/tasks/main.yml b/tests/integration/targets/ec2_instance_hibernation_options/tasks/main.yml index e6aace728ec..5bd8e5ce14c 100644 --- a/tests/integration/targets/ec2_instance_hibernation_options/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_hibernation_options/tasks/main.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: Create instance with hibernation option (check mode) diff --git a/tests/integration/targets/ec2_instance_iam_instance_role/tasks/main.yml b/tests/integration/targets/ec2_instance_iam_instance_role/tasks/main.yml index 2f28ae3b8ec..d5d203eae49 100644 --- a/tests/integration/targets/ec2_instance_iam_instance_role/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_iam_instance_role/tasks/main.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: "Create IAM role for test" diff --git a/tests/integration/targets/ec2_instance_instance_minimal/tasks/main.yml b/tests/integration/targets/ec2_instance_instance_minimal/tasks/main.yml index 8dcfca43787..5f76630ea2c 100644 --- a/tests/integration/targets/ec2_instance_instance_minimal/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_instance_minimal/tasks/main.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: "Create a new instance (check_mode)" diff --git a/tests/integration/targets/ec2_instance_instance_multiple/tasks/main.yml b/tests/integration/targets/ec2_instance_instance_multiple/tasks/main.yml index dcbb008f8ec..cc2d8f18abe 100644 --- a/tests/integration/targets/ec2_instance_instance_multiple/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_instance_multiple/tasks/main.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: ################################################################ diff --git a/tests/integration/targets/ec2_instance_instance_no_wait/tasks/main.yml b/tests/integration/targets/ec2_instance_instance_no_wait/tasks/main.yml index f279e46c381..dba54be912c 100644 --- a/tests/integration/targets/ec2_instance_instance_no_wait/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_instance_no_wait/tasks/main.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: "New instance and don't wait for it to complete" diff --git a/tests/integration/targets/ec2_instance_metadata_options/tasks/main.yml b/tests/integration/targets/ec2_instance_metadata_options/tasks/main.yml index 729cef9eec8..f51c067b61b 100644 --- a/tests/integration/targets/ec2_instance_metadata_options/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_metadata_options/tasks/main.yml @@ -1,9 +1,9 @@ - name: test with boto3 version that supports instance_metadata_tags module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: "create t3.nano instance with metadata_options" diff --git a/tests/integration/targets/ec2_instance_security_group/tasks/main.yml b/tests/integration/targets/ec2_instance_security_group/tasks/main.yml index 51545086a40..848f328c583 100644 --- a/tests/integration/targets/ec2_instance_security_group/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_security_group/tasks/main.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: "New instance with 2 security groups" diff --git a/tests/integration/targets/ec2_instance_state_config_updates/tasks/main.yml b/tests/integration/targets/ec2_instance_state_config_updates/tasks/main.yml index 0d5d5a5c2e2..c0c42904c1e 100644 --- a/tests/integration/targets/ec2_instance_state_config_updates/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_state_config_updates/tasks/main.yml @@ -4,9 +4,9 @@ # https://github.com/ansible-collections/community.aws/issues/16 - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: "Make instance with sg and termination protection enabled" diff --git a/tests/integration/targets/ec2_instance_tags_and_vpc_settings/tasks/main.yml b/tests/integration/targets/ec2_instance_tags_and_vpc_settings/tasks/main.yml index 71551ef2935..fda07227299 100644 --- a/tests/integration/targets/ec2_instance_tags_and_vpc_settings/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_tags_and_vpc_settings/tasks/main.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: "Make instance in the testing subnet created in the test VPC" diff --git a/tests/integration/targets/ec2_instance_termination_protection/tasks/main.yml b/tests/integration/targets/ec2_instance_termination_protection/tasks/main.yml index 4c888592b2f..5d3c20f3873 100644 --- a/tests/integration/targets/ec2_instance_termination_protection/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_termination_protection/tasks/main.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: Create instance with termination protection (check mode) diff --git a/tests/integration/targets/ec2_instance_uptime/tasks/main.yml b/tests/integration/targets/ec2_instance_uptime/tasks/main.yml index 10c2d85c021..7dbc19bd88d 100644 --- a/tests/integration/targets/ec2_instance_uptime/tasks/main.yml +++ b/tests/integration/targets/ec2_instance_uptime/tasks/main.yml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: "create t3.nano instance" diff --git a/tests/integration/targets/ec2_key/tasks/main.yml b/tests/integration/targets/ec2_key/tasks/main.yml index a7d5a7ab487..dc192517bd7 100644 --- a/tests/integration/targets/ec2_key/tasks/main.yml +++ b/tests/integration/targets/ec2_key/tasks/main.yml @@ -5,9 +5,9 @@ - module_defaults: group/aws: region: '{{ aws_region }}' - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' block: - name: Create temporary directory tempfile: diff --git a/tests/integration/targets/ec2_metadata_facts/playbooks/setup.yml b/tests/integration/targets/ec2_metadata_facts/playbooks/setup.yml index 4c9741ac677..2140fb71963 100644 --- a/tests/integration/targets/ec2_metadata_facts/playbooks/setup.yml +++ b/tests/integration/targets/ec2_metadata_facts/playbooks/setup.yml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" hosts: localhost @@ -23,9 +23,9 @@ # As lookup plugins don't have access to module_defaults connection_args: region: "{{ aws_region }}" - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - aws_session_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" - include_role: name: '../setup_sshkey' diff --git a/tests/integration/targets/ec2_metadata_facts/playbooks/teardown.yml b/tests/integration/targets/ec2_metadata_facts/playbooks/teardown.yml index 4a579b70fc6..2ed6c52b0b4 100644 --- a/tests/integration/targets/ec2_metadata_facts/playbooks/teardown.yml +++ b/tests/integration/targets/ec2_metadata_facts/playbooks/teardown.yml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" hosts: localhost diff --git a/tests/integration/targets/ec2_security_group/tasks/main.yml b/tests/integration/targets/ec2_security_group/tasks/main.yml index 0f1b5fe433f..d6921050bf0 100644 --- a/tests/integration/targets/ec2_security_group/tasks/main.yml +++ b/tests/integration/targets/ec2_security_group/tasks/main.yml @@ -3,18 +3,18 @@ # lookup plugins don't have access to module_defaults connection_args: region: "{{ aws_region }}" - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - aws_security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" no_log: True # ============================================================ - name: Run all tests module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit)}}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit)}}" region: "{{ aws_region }}" block: - name: determine if there is a default VPC diff --git a/tests/integration/targets/ec2_snapshot/tasks/main.yml b/tests/integration/targets/ec2_snapshot/tasks/main.yml index 8967d772dca..cc2019df558 100644 --- a/tests/integration/targets/ec2_snapshot/tasks/main.yml +++ b/tests/integration/targets/ec2_snapshot/tasks/main.yml @@ -12,9 +12,9 @@ - name: Integration testing for ec2_snapshot module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: diff --git a/tests/integration/targets/ec2_spot_instance/tasks/main.yaml b/tests/integration/targets/ec2_spot_instance/tasks/main.yaml index 77ca9b9020c..2d422a8c13f 100644 --- a/tests/integration/targets/ec2_spot_instance/tasks/main.yaml +++ b/tests/integration/targets/ec2_spot_instance/tasks/main.yaml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: diff --git a/tests/integration/targets/ec2_tag/tasks/main.yml b/tests/integration/targets/ec2_tag/tasks/main.yml index 1f2ea62cdd3..1a5590c61b7 100644 --- a/tests/integration/targets/ec2_tag/tasks/main.yml +++ b/tests/integration/targets/ec2_tag/tasks/main.yml @@ -2,9 +2,9 @@ # tasks file for test_ec2_tag - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: Create an EC2 volume so we have something to tag diff --git a/tests/integration/targets/ec2_vol/tasks/main.yml b/tests/integration/targets/ec2_vol/tasks/main.yml index 0b77b1571cc..07992a9bbce 100644 --- a/tests/integration/targets/ec2_vol/tasks/main.yml +++ b/tests/integration/targets/ec2_vol/tasks/main.yml @@ -1,10 +1,10 @@ --- - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key | default(omit) }}' - aws_secret_key: '{{ aws_secret_key | default(omit) }}' - security_token: '{{ security_token | default(omit) }}' - region: '{{ aws_region | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' + region: '{{ aws_region }}' collections: - amazon.aws diff --git a/tests/integration/targets/ec2_vpc_dhcp_option/tasks/main.yml b/tests/integration/targets/ec2_vpc_dhcp_option/tasks/main.yml index c1ae00155f8..65c124f3c73 100644 --- a/tests/integration/targets/ec2_vpc_dhcp_option/tasks/main.yml +++ b/tests/integration/targets/ec2_vpc_dhcp_option/tasks/main.yml @@ -8,9 +8,9 @@ # ============================================================ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default('') }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default('') }}" region: "{{ aws_region }}" block: diff --git a/tests/integration/targets/ec2_vpc_endpoint/tasks/main.yml b/tests/integration/targets/ec2_vpc_endpoint/tasks/main.yml index 28a32714546..772189eef2e 100644 --- a/tests/integration/targets/ec2_vpc_endpoint/tasks/main.yml +++ b/tests/integration/targets/ec2_vpc_endpoint/tasks/main.yml @@ -1,9 +1,9 @@ - name: ec2_vpc_endpoint tests module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: # ============================================================ diff --git a/tests/integration/targets/ec2_vpc_endpoint_service_info/tasks/main.yml b/tests/integration/targets/ec2_vpc_endpoint_service_info/tasks/main.yml index 59b2398c2c2..f63c0fbeb3a 100644 --- a/tests/integration/targets/ec2_vpc_endpoint_service_info/tasks/main.yml +++ b/tests/integration/targets/ec2_vpc_endpoint_service_info/tasks/main.yml @@ -2,9 +2,9 @@ - name: Verify ec2_vpc_endpoint_service_info module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: - amazon.aws diff --git a/tests/integration/targets/ec2_vpc_igw/tasks/main.yml b/tests/integration/targets/ec2_vpc_igw/tasks/main.yml index 05b15d0b728..f0e4124b637 100644 --- a/tests/integration/targets/ec2_vpc_igw/tasks/main.yml +++ b/tests/integration/targets/ec2_vpc_igw/tasks/main.yml @@ -1,9 +1,9 @@ - name: ec2_vpc_igw tests module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: # ============================================================ diff --git a/tests/integration/targets/ec2_vpc_nat_gateway/tasks/main.yml b/tests/integration/targets/ec2_vpc_nat_gateway/tasks/main.yml index d0b519d3d1e..ac85fa04ed3 100644 --- a/tests/integration/targets/ec2_vpc_nat_gateway/tasks/main.yml +++ b/tests/integration/targets/ec2_vpc_nat_gateway/tasks/main.yml @@ -1,9 +1,9 @@ - name: ec2_vpc_nat_gateway tests module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: # ============================================================ diff --git a/tests/integration/targets/ec2_vpc_net/tasks/main.yml b/tests/integration/targets/ec2_vpc_net/tasks/main.yml index 87940dc1b38..9f3ef6928cc 100644 --- a/tests/integration/targets/ec2_vpc_net/tasks/main.yml +++ b/tests/integration/targets/ec2_vpc_net/tasks/main.yml @@ -2,9 +2,9 @@ - name: Setup AWS Environment module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" vars: first_tags: diff --git a/tests/integration/targets/ec2_vpc_route_table/tasks/main.yml b/tests/integration/targets/ec2_vpc_route_table/tasks/main.yml index f85755cd535..886f53dfd30 100644 --- a/tests/integration/targets/ec2_vpc_route_table/tasks/main.yml +++ b/tests/integration/targets/ec2_vpc_route_table/tasks/main.yml @@ -1,9 +1,9 @@ - name: ec2_vpc_route_table integration tests module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/ec2_vpc_subnet/tasks/main.yml b/tests/integration/targets/ec2_vpc_subnet/tasks/main.yml index fd367f0c33a..1837eec9c71 100644 --- a/tests/integration/targets/ec2_vpc_subnet/tasks/main.yml +++ b/tests/integration/targets/ec2_vpc_subnet/tasks/main.yml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: # ============================================================ diff --git a/tests/integration/targets/elb_application_lb/tasks/main.yml b/tests/integration/targets/elb_application_lb/tasks/main.yml index 96b7b3b2e5e..f9ca9ce1490 100644 --- a/tests/integration/targets/elb_application_lb/tasks/main.yml +++ b/tests/integration/targets/elb_application_lb/tasks/main.yml @@ -1,9 +1,9 @@ - name: elb_application_lb integration tests module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: - name: Create a test VPC diff --git a/tests/integration/targets/elb_classic_lb/tasks/main.yml b/tests/integration/targets/elb_classic_lb/tasks/main.yml index e8acba10e1e..5bd0baf12f9 100644 --- a/tests/integration/targets/elb_classic_lb/tasks/main.yml +++ b/tests/integration/targets/elb_classic_lb/tasks/main.yml @@ -16,9 +16,9 @@ - module_defaults: group/aws: region: "{{ aws_region }}" - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" collections: - amazon.aws - community.aws diff --git a/tests/integration/targets/iam_instance_profile/tasks/main.yml b/tests/integration/targets/iam_instance_profile/tasks/main.yml index f628e617117..5fc6eb109ba 100644 --- a/tests/integration/targets/iam_instance_profile/tasks/main.yml +++ b/tests/integration/targets/iam_instance_profile/tasks/main.yml @@ -5,9 +5,9 @@ - name: "Setup AWS connection info" module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" collections: - amazon.aws diff --git a/tests/integration/targets/iam_policy/tasks/main.yml b/tests/integration/targets/iam_policy/tasks/main.yml index 0894490af16..80f24d42422 100644 --- a/tests/integration/targets/iam_policy/tasks/main.yml +++ b/tests/integration/targets/iam_policy/tasks/main.yml @@ -1,9 +1,9 @@ - name: Run integration tests for IAM (inline) Policy management module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: # ============================================================ diff --git a/tests/integration/targets/iam_user/tasks/main.yml b/tests/integration/targets/iam_user/tasks/main.yml index 06279024fb8..e55cead1f9a 100644 --- a/tests/integration/targets/iam_user/tasks/main.yml +++ b/tests/integration/targets/iam_user/tasks/main.yml @@ -1,9 +1,9 @@ - name: set up aws connection info module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: - name: ensure improper usage of parameters fails gracefully diff --git a/tests/integration/targets/inventory_aws_ec2/playbooks/manage_ec2_instances.yml b/tests/integration/targets/inventory_aws_ec2/playbooks/manage_ec2_instances.yml index acef915cbb0..997b9c7f6f2 100644 --- a/tests/integration/targets/inventory_aws_ec2/playbooks/manage_ec2_instances.yml +++ b/tests/integration/targets/inventory_aws_ec2/playbooks/manage_ec2_instances.yml @@ -12,9 +12,9 @@ module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' tasks: diff --git a/tests/integration/targets/inventory_aws_ec2/playbooks/populate_cache.yml b/tests/integration/targets/inventory_aws_ec2/playbooks/populate_cache.yml index 13c3ad14712..71fa031be15 100644 --- a/tests/integration/targets/inventory_aws_ec2/playbooks/populate_cache.yml +++ b/tests/integration/targets/inventory_aws_ec2/playbooks/populate_cache.yml @@ -7,9 +7,9 @@ - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/inventory_aws_ec2/playbooks/test_inventory_ssm.yml b/tests/integration/targets/inventory_aws_ec2/playbooks/test_inventory_ssm.yml index ba8eac7a033..883d1824779 100644 --- a/tests/integration/targets/inventory_aws_ec2/playbooks/test_inventory_ssm.yml +++ b/tests/integration/targets/inventory_aws_ec2/playbooks/test_inventory_ssm.yml @@ -10,9 +10,9 @@ module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' vars: diff --git a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_concatenation.yml b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_concatenation.yml index 9678ba4ff49..ed62edbf671 100644 --- a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_concatenation.yml +++ b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_concatenation.yml @@ -7,9 +7,9 @@ - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_constructed.yml b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_constructed.yml index e7d4c654d16..077b3c9f48d 100644 --- a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_constructed.yml +++ b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_constructed.yml @@ -7,9 +7,9 @@ - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostnames_using_tags.yml b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostnames_using_tags.yml index b71beb4ba6f..fd063e3387b 100644 --- a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostnames_using_tags.yml +++ b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostnames_using_tags.yml @@ -7,9 +7,9 @@ - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostnames_using_tags_classic.yml b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostnames_using_tags_classic.yml index df29ebf14d5..f34b3b46907 100644 --- a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostnames_using_tags_classic.yml +++ b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostnames_using_tags_classic.yml @@ -7,9 +7,9 @@ - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostvars_prefix_suffix.yml b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostvars_prefix_suffix.yml index f91b820b48a..c8e2242fdd7 100644 --- a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostvars_prefix_suffix.yml +++ b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_hostvars_prefix_suffix.yml @@ -7,9 +7,9 @@ - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_include_or_exclude_filters.yml b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_include_or_exclude_filters.yml index 2f063837c5c..c4de839fa66 100644 --- a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_include_or_exclude_filters.yml +++ b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_include_or_exclude_filters.yml @@ -7,9 +7,9 @@ - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_literal_string.yml b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_literal_string.yml index a897de8cb4d..646fca9da52 100644 --- a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_literal_string.yml +++ b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_literal_string.yml @@ -7,9 +7,9 @@ - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_use_contrib_script_keys.yml b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_use_contrib_script_keys.yml index 9d71994c114..f6ed5efe475 100644 --- a/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_use_contrib_script_keys.yml +++ b/tests/integration/targets/inventory_aws_ec2/playbooks/test_populating_inventory_with_use_contrib_script_keys.yml @@ -7,9 +7,9 @@ - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/inventory_aws_ec2/templates/inventory.yml.j2 b/tests/integration/targets/inventory_aws_ec2/templates/inventory.yml.j2 index baac15be008..cdc64bf8b6f 100644 --- a/tests/integration/targets/inventory_aws_ec2/templates/inventory.yml.j2 +++ b/tests/integration/targets/inventory_aws_ec2/templates/inventory.yml.j2 @@ -1,8 +1,8 @@ plugin: amazon.aws.aws_ec2 -aws_access_key_id: '{{ aws_access_key }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ aws_access_key }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_cache.yml.j2 b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_cache.yml.j2 index 8fe4e33f44a..c2532caf69f 100644 --- a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_cache.yml.j2 +++ b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_cache.yml.j2 @@ -2,10 +2,10 @@ plugin: amazon.aws.aws_ec2 cache: True cache_plugin: jsonfile cache_connection: aws_ec2_cache_dir -aws_access_key_id: '{{ aws_access_key }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ aws_access_key }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_concatenation.yml.j2 b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_concatenation.yml.j2 index 035b1d7cad2..62baa9fcc25 100644 --- a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_concatenation.yml.j2 +++ b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_concatenation.yml.j2 @@ -1,8 +1,8 @@ plugin: amazon.aws.aws_ec2 -aws_access_key_id: '{{ aws_access_key }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ aws_access_key }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_constructed.yml.j2 b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_constructed.yml.j2 index a33f03e21c7..ee154d75f84 100644 --- a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_constructed.yml.j2 +++ b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_constructed.yml.j2 @@ -1,8 +1,8 @@ plugin: amazon.aws.aws_ec2 -aws_access_key_id: '{{ aws_access_key }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ aws_access_key }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_hostnames_using_tags.yml.j2 b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_hostnames_using_tags.yml.j2 index 2f7882a2289..01bd81727ff 100644 --- a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_hostnames_using_tags.yml.j2 +++ b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_hostnames_using_tags.yml.j2 @@ -1,8 +1,8 @@ plugin: amazon.aws.aws_ec2 -aws_access_key_id: '{{ aws_access_key }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ aws_access_key }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_hostnames_using_tags_classic.yml.j2 b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_hostnames_using_tags_classic.yml.j2 index 3138a4a2af1..fb6b6640176 100644 --- a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_hostnames_using_tags_classic.yml.j2 +++ b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_hostnames_using_tags_classic.yml.j2 @@ -1,8 +1,8 @@ plugin: amazon.aws.aws_ec2 -aws_access_key_id: '{{ aws_access_key }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ aws_access_key }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_hostvars_prefix_suffix.yml.j2 b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_hostvars_prefix_suffix.yml.j2 index f4f12c6326d..de0af8c06cb 100644 --- a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_hostvars_prefix_suffix.yml.j2 +++ b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_hostvars_prefix_suffix.yml.j2 @@ -1,8 +1,8 @@ plugin: amazon.aws.aws_ec2 -aws_access_key_id: '{{ aws_access_key }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ aws_access_key }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_include_or_exclude_filters.yml.j2 b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_include_or_exclude_filters.yml.j2 index a6d48ce8ce6..3d12d787a58 100644 --- a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_include_or_exclude_filters.yml.j2 +++ b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_include_or_exclude_filters.yml.j2 @@ -1,8 +1,8 @@ plugin: amazon.aws.aws_ec2 -aws_access_key_id: '{{ aws_access_key }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ aws_access_key }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_literal_string.yml.j2 b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_literal_string.yml.j2 index 0dbddcb82bf..2b3f2ee317b 100644 --- a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_literal_string.yml.j2 +++ b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_literal_string.yml.j2 @@ -1,8 +1,8 @@ plugin: amazon.aws.aws_ec2 -aws_access_key_id: '{{ aws_access_key }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ aws_access_key }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_ssm.yml.j2 b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_ssm.yml.j2 index 56710a2dc9d..90c6fedc9ec 100644 --- a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_ssm.yml.j2 +++ b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_ssm.yml.j2 @@ -1,8 +1,8 @@ plugin: amazon.aws.aws_ec2 -aws_access_key_id: '{{ aws_access_key }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ aws_access_key }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_template.yml.j2 b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_template.yml.j2 index 6b27544f9bd..44a132c1c53 100644 --- a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_template.yml.j2 +++ b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_template.yml.j2 @@ -1,8 +1,8 @@ plugin: amazon.aws.aws_ec2 -aws_access_key_id: '{{ '{{ lookup("env", "MY_ACCESS_KEY") }}' }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ '{{ lookup("env", "MY_ACCESS_KEY") }}' }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_use_contrib_script_keys.yml.j2 b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_use_contrib_script_keys.yml.j2 index e6b4068fa48..ee2f9b45961 100644 --- a/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_use_contrib_script_keys.yml.j2 +++ b/tests/integration/targets/inventory_aws_ec2/templates/inventory_with_use_contrib_script_keys.yml.j2 @@ -1,8 +1,8 @@ plugin: amazon.aws.aws_ec2 -aws_access_key_id: '{{ aws_access_key }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ aws_access_key }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/inventory_aws_rds/playbooks/populate_cache.yml b/tests/integration/targets/inventory_aws_rds/playbooks/populate_cache.yml index a664afe0fa1..3aa9b4831f4 100644 --- a/tests/integration/targets/inventory_aws_rds/playbooks/populate_cache.yml +++ b/tests/integration/targets/inventory_aws_rds/playbooks/populate_cache.yml @@ -14,9 +14,9 @@ module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' tasks: diff --git a/tests/integration/targets/inventory_aws_rds/playbooks/setup_instance.yml b/tests/integration/targets/inventory_aws_rds/playbooks/setup_instance.yml index 298b413bf53..405dcb4f5ef 100644 --- a/tests/integration/targets/inventory_aws_rds/playbooks/setup_instance.yml +++ b/tests/integration/targets/inventory_aws_rds/playbooks/setup_instance.yml @@ -14,9 +14,9 @@ module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' tasks: diff --git a/tests/integration/targets/inventory_aws_rds/playbooks/test_inventory_with_hostvars_prefix_suffix.yml b/tests/integration/targets/inventory_aws_rds/playbooks/test_inventory_with_hostvars_prefix_suffix.yml index 84ea037b3c6..243b1d9f144 100644 --- a/tests/integration/targets/inventory_aws_rds/playbooks/test_inventory_with_hostvars_prefix_suffix.yml +++ b/tests/integration/targets/inventory_aws_rds/playbooks/test_inventory_with_hostvars_prefix_suffix.yml @@ -14,9 +14,9 @@ module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' tasks: diff --git a/tests/integration/targets/inventory_aws_rds/playbooks/test_populating_inventory_with_constructed.yml b/tests/integration/targets/inventory_aws_rds/playbooks/test_populating_inventory_with_constructed.yml index 4ec36781925..6268a026d27 100644 --- a/tests/integration/targets/inventory_aws_rds/playbooks/test_populating_inventory_with_constructed.yml +++ b/tests/integration/targets/inventory_aws_rds/playbooks/test_populating_inventory_with_constructed.yml @@ -14,9 +14,9 @@ module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' tasks: diff --git a/tests/integration/targets/inventory_aws_rds/templates/inventory.j2 b/tests/integration/targets/inventory_aws_rds/templates/inventory.j2 index 7fee3b7259e..ddc63812196 100644 --- a/tests/integration/targets/inventory_aws_rds/templates/inventory.j2 +++ b/tests/integration/targets/inventory_aws_rds/templates/inventory.j2 @@ -1,8 +1,8 @@ plugin: amazon.aws.aws_rds -aws_access_key_id: '{{ aws_access_key }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ aws_access_key }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/inventory_aws_rds/templates/inventory_with_cache.j2 b/tests/integration/targets/inventory_aws_rds/templates/inventory_with_cache.j2 index d735212f2dc..f6ccd9c51ea 100644 --- a/tests/integration/targets/inventory_aws_rds/templates/inventory_with_cache.j2 +++ b/tests/integration/targets/inventory_aws_rds/templates/inventory_with_cache.j2 @@ -2,10 +2,10 @@ plugin: amazon.aws.aws_rds cache: True cache_plugin: jsonfile cache_connection: '{{ aws_inventory_cache_dir }}' -aws_access_key_id: '{{ aws_access_key }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ aws_access_key }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/inventory_aws_rds/templates/inventory_with_constructed.j2 b/tests/integration/targets/inventory_aws_rds/templates/inventory_with_constructed.j2 index 71421d4c859..38e2eba0e47 100644 --- a/tests/integration/targets/inventory_aws_rds/templates/inventory_with_constructed.j2 +++ b/tests/integration/targets/inventory_aws_rds/templates/inventory_with_constructed.j2 @@ -1,8 +1,8 @@ plugin: amazon.aws.aws_rds -aws_access_key_id: '{{ aws_access_key }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ aws_access_key }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/inventory_aws_rds/templates/inventory_with_hostvars_prefix_suffix.j2 b/tests/integration/targets/inventory_aws_rds/templates/inventory_with_hostvars_prefix_suffix.j2 index 5f4a9e4df07..07bbadbf471 100644 --- a/tests/integration/targets/inventory_aws_rds/templates/inventory_with_hostvars_prefix_suffix.j2 +++ b/tests/integration/targets/inventory_aws_rds/templates/inventory_with_hostvars_prefix_suffix.j2 @@ -1,8 +1,8 @@ plugin: amazon.aws.aws_rds -aws_access_key_id: '{{ aws_access_key }}' -aws_secret_access_key: '{{ aws_secret_key }}' +access_key: '{{ aws_access_key }}' +secret_key: '{{ aws_secret_key }}' {% if security_token | default(false) %} -aws_security_token: '{{ security_token }}' +session_token: '{{ security_token }}' {% endif %} regions: - '{{ aws_region }}' diff --git a/tests/integration/targets/kms_key/roles/aws_kms/tasks/main.yml b/tests/integration/targets/kms_key/roles/aws_kms/tasks/main.yml index e411eac615f..bf30507f5fa 100644 --- a/tests/integration/targets/kms_key/roles/aws_kms/tasks/main.yml +++ b/tests/integration/targets/kms_key/roles/aws_kms/tasks/main.yml @@ -3,9 +3,9 @@ - community.aws module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: - include_tasks: ./test_{{ inventory_hostname }}.yml diff --git a/tests/integration/targets/lambda/tasks/main.yml b/tests/integration/targets/lambda/tasks/main.yml index 2fcadb1c42c..95e982c3f0b 100644 --- a/tests/integration/targets/lambda/tasks/main.yml +++ b/tests/integration/targets/lambda/tasks/main.yml @@ -1,9 +1,9 @@ - name: set connection information for AWS modules and run tests module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' collections: - community.general diff --git a/tests/integration/targets/lambda_alias/tasks/main.yml b/tests/integration/targets/lambda_alias/tasks/main.yml index 9b264f50c0a..b840c5e9a7b 100644 --- a/tests/integration/targets/lambda_alias/tasks/main.yml +++ b/tests/integration/targets/lambda_alias/tasks/main.yml @@ -1,9 +1,9 @@ - name: set connection information for AWS modules and run tests module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' collections: - community.general diff --git a/tests/integration/targets/lambda_event/tasks/main.yml b/tests/integration/targets/lambda_event/tasks/main.yml index 349ee41ac1c..a0100a49229 100644 --- a/tests/integration/targets/lambda_event/tasks/main.yml +++ b/tests/integration/targets/lambda_event/tasks/main.yml @@ -1,9 +1,9 @@ - name: set connection information for AWS modules and run tests module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' collections: - community.general diff --git a/tests/integration/targets/lambda_layer/tasks/main.yml b/tests/integration/targets/lambda_layer/tasks/main.yml index 227a58dc343..60a227e64ec 100644 --- a/tests/integration/targets/lambda_layer/tasks/main.yml +++ b/tests/integration/targets/lambda_layer/tasks/main.yml @@ -1,10 +1,10 @@ --- - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key | default(omit) }}' - aws_secret_key: '{{ aws_secret_key | default(omit) }}' - security_token: '{{ security_token | default(omit) }}' - region: '{{ aws_region | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' + region: '{{ aws_region }}' collections: - amazon.aws diff --git a/tests/integration/targets/lambda_policy/tasks/main.yml b/tests/integration/targets/lambda_policy/tasks/main.yml index 9a72720a57a..bba3aed3a53 100644 --- a/tests/integration/targets/lambda_policy/tasks/main.yml +++ b/tests/integration/targets/lambda_policy/tasks/main.yml @@ -1,9 +1,9 @@ - name: Integration testing for lambda_policy module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' collections: - community.general diff --git a/tests/integration/targets/lookup_aws_account_attribute/tasks/main.yaml b/tests/integration/targets/lookup_aws_account_attribute/tasks/main.yaml index 0dcc162b845..93b09e589f3 100644 --- a/tests/integration/targets/lookup_aws_account_attribute/tasks/main.yaml +++ b/tests/integration/targets/lookup_aws_account_attribute/tasks/main.yaml @@ -2,17 +2,17 @@ # As a lookup plugin we don't have access to module_defaults connection_args: region: "{{ aws_region }}" - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - aws_security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" no_log: True - module_defaults: group/aws: region: "{{ aws_region }}" - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" block: - name: 'Check for EC2 Classic support (has-ec2-classic)' set_fact: diff --git a/tests/integration/targets/lookup_secretsmanager_secret/tasks/main.yaml b/tests/integration/targets/lookup_secretsmanager_secret/tasks/main.yaml index daf1e5a134d..130339799e7 100644 --- a/tests/integration/targets/lookup_secretsmanager_secret/tasks/main.yaml +++ b/tests/integration/targets/lookup_secretsmanager_secret/tasks/main.yaml @@ -2,17 +2,17 @@ # As a lookup plugin we don't have access to module_defaults connection_args: region: "{{ aws_region }}" - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - aws_security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" no_log: True - module_defaults: group/aws: region: "{{ aws_region }}" - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" collections: - amazon.aws - community.aws diff --git a/tests/integration/targets/lookup_ssm_parameter/tasks/main.yml b/tests/integration/targets/lookup_ssm_parameter/tasks/main.yml index d2c77bf3d91..0afbb3ab253 100644 --- a/tests/integration/targets/lookup_ssm_parameter/tasks/main.yml +++ b/tests/integration/targets/lookup_ssm_parameter/tasks/main.yml @@ -3,9 +3,9 @@ # As a lookup plugin we don't have access to module_defaults connection_args: region: "{{ aws_region }}" - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - aws_security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" no_log: True - name: 'aws_ssm lookup plugin integration tests' @@ -14,9 +14,9 @@ - community.aws module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' vars: skip: 'skip' diff --git a/tests/integration/targets/module_utils_waiter/roles/get_waiter/tasks/main.yml b/tests/integration/targets/module_utils_waiter/roles/get_waiter/tasks/main.yml index 466d9584e24..bcf8f269f0f 100644 --- a/tests/integration/targets/module_utils_waiter/roles/get_waiter/tasks/main.yml +++ b/tests/integration/targets/module_utils_waiter/roles/get_waiter/tasks/main.yml @@ -4,7 +4,7 @@ region: '{{ aws_region }}' access_key: '{{ aws_access_key }}' secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + session_token: '{{ security_token | default(omit) }}' block: - name: 'Attempt to get a waiter (no retry decorator)' example_module: diff --git a/tests/integration/targets/rds_cluster_create/tasks/main.yaml b/tests/integration/targets/rds_cluster_create/tasks/main.yaml index 2870669dee5..09ef74acd98 100644 --- a/tests/integration/targets/rds_cluster_create/tasks/main.yaml +++ b/tests/integration/targets/rds_cluster_create/tasks/main.yaml @@ -1,9 +1,9 @@ - module_defaults: group/aws: region: '{{ aws_region }}' - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' block: - name: Ensure the resource doesn't exist rds_cluster: diff --git a/tests/integration/targets/rds_cluster_create_sgs/tasks/main.yaml b/tests/integration/targets/rds_cluster_create_sgs/tasks/main.yaml index eead5f42daf..040444d4964 100644 --- a/tests/integration/targets/rds_cluster_create_sgs/tasks/main.yaml +++ b/tests/integration/targets/rds_cluster_create_sgs/tasks/main.yaml @@ -1,9 +1,9 @@ - module_defaults: group/aws: region: '{{ aws_region }}' - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' block: - name: Ensure the resource doesn't exist rds_cluster: diff --git a/tests/integration/targets/rds_cluster_modify/tasks/main.yaml b/tests/integration/targets/rds_cluster_modify/tasks/main.yaml index ca6ade45e83..0c20087b840 100644 --- a/tests/integration/targets/rds_cluster_modify/tasks/main.yaml +++ b/tests/integration/targets/rds_cluster_modify/tasks/main.yaml @@ -1,9 +1,9 @@ - module_defaults: group/aws: region: '{{ aws_region }}' - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' block: - name: Ensure the resource doesn't exist rds_cluster: diff --git a/tests/integration/targets/rds_cluster_multi_az/tasks/main.yml b/tests/integration/targets/rds_cluster_multi_az/tasks/main.yml index 911eb60dea9..1d33be4ee3c 100644 --- a/tests/integration/targets/rds_cluster_multi_az/tasks/main.yml +++ b/tests/integration/targets/rds_cluster_multi_az/tasks/main.yml @@ -2,9 +2,9 @@ - module_defaults: group/aws: region: "{{ aws_region }}" - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" collections: - amazon.aws diff --git a/tests/integration/targets/rds_cluster_promote/tasks/main.yaml b/tests/integration/targets/rds_cluster_promote/tasks/main.yaml index 1d57aac5e63..bec0bb9ccd9 100644 --- a/tests/integration/targets/rds_cluster_promote/tasks/main.yaml +++ b/tests/integration/targets/rds_cluster_promote/tasks/main.yaml @@ -1,9 +1,9 @@ - module_defaults: group/aws: region: '{{ aws_region }}' - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' block: - name: Ensure the resource doesn't exist rds_cluster: diff --git a/tests/integration/targets/rds_cluster_restore/tasks/main.yaml b/tests/integration/targets/rds_cluster_restore/tasks/main.yaml index 8af3035210b..d2ddab2918e 100644 --- a/tests/integration/targets/rds_cluster_restore/tasks/main.yaml +++ b/tests/integration/targets/rds_cluster_restore/tasks/main.yaml @@ -1,9 +1,9 @@ - module_defaults: group/aws: region: '{{ aws_region }}' - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' block: - name: Ensure the resource doesn't exist rds_cluster: diff --git a/tests/integration/targets/rds_cluster_snapshot/tasks/main.yml b/tests/integration/targets/rds_cluster_snapshot/tasks/main.yml index 55aff0a6eb0..01030b7d831 100644 --- a/tests/integration/targets/rds_cluster_snapshot/tasks/main.yml +++ b/tests/integration/targets/rds_cluster_snapshot/tasks/main.yml @@ -2,9 +2,9 @@ - module_defaults: group/aws: region: "{{ aws_region }}" - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" collections: - amazon.aws block: diff --git a/tests/integration/targets/rds_cluster_states/tasks/main.yml b/tests/integration/targets/rds_cluster_states/tasks/main.yml index 945fa1abde0..7ec91a3d5de 100644 --- a/tests/integration/targets/rds_cluster_states/tasks/main.yml +++ b/tests/integration/targets/rds_cluster_states/tasks/main.yml @@ -1,9 +1,9 @@ - module_defaults: group/aws: region: '{{ aws_region }}' - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' block: # ------------------------------------------------------------------------------------------ # Create DB cluster diff --git a/tests/integration/targets/rds_cluster_tag/tasks/main.yaml b/tests/integration/targets/rds_cluster_tag/tasks/main.yaml index d03b7032bd4..e1fecb5b6d7 100644 --- a/tests/integration/targets/rds_cluster_tag/tasks/main.yaml +++ b/tests/integration/targets/rds_cluster_tag/tasks/main.yaml @@ -1,9 +1,9 @@ - module_defaults: group/aws: region: '{{ aws_region }}' - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' block: - name: Ensure the resource doesn't exist rds_cluster: diff --git a/tests/integration/targets/rds_instance_aurora/tasks/main.yml b/tests/integration/targets/rds_instance_aurora/tasks/main.yml index 522894afce5..3ee5d41ccc9 100644 --- a/tests/integration/targets/rds_instance_aurora/tasks/main.yml +++ b/tests/integration/targets/rds_instance_aurora/tasks/main.yml @@ -3,9 +3,9 @@ - community.aws module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/rds_instance_complex/tasks/main.yml b/tests/integration/targets/rds_instance_complex/tasks/main.yml index 024e0978a2c..9100e1815af 100644 --- a/tests/integration/targets/rds_instance_complex/tasks/main.yml +++ b/tests/integration/targets/rds_instance_complex/tasks/main.yml @@ -3,9 +3,9 @@ - community.aws module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: #TODO: test availability_zone and multi_az diff --git a/tests/integration/targets/rds_instance_modify/tasks/main.yml b/tests/integration/targets/rds_instance_modify/tasks/main.yml index 1d5795f253f..eda3a89ff65 100644 --- a/tests/integration/targets/rds_instance_modify/tasks/main.yml +++ b/tests/integration/targets/rds_instance_modify/tasks/main.yml @@ -3,9 +3,9 @@ - community.aws module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: - name: Ensure the resource doesn't exist diff --git a/tests/integration/targets/rds_instance_processor/tasks/main.yml b/tests/integration/targets/rds_instance_processor/tasks/main.yml index 260a37951d7..415a75725d5 100644 --- a/tests/integration/targets/rds_instance_processor/tasks/main.yml +++ b/tests/integration/targets/rds_instance_processor/tasks/main.yml @@ -3,9 +3,9 @@ - community.aws module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/rds_instance_replica/tasks/main.yml b/tests/integration/targets/rds_instance_replica/tasks/main.yml index c282f1f23bc..8029d9fe658 100644 --- a/tests/integration/targets/rds_instance_replica/tasks/main.yml +++ b/tests/integration/targets/rds_instance_replica/tasks/main.yml @@ -3,9 +3,9 @@ - community.aws module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/rds_instance_restore/tasks/main.yml b/tests/integration/targets/rds_instance_restore/tasks/main.yml index c872db8804b..dd1153549a0 100644 --- a/tests/integration/targets/rds_instance_restore/tasks/main.yml +++ b/tests/integration/targets/rds_instance_restore/tasks/main.yml @@ -3,9 +3,9 @@ - community.aws module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: # TODO: snapshot, s3 diff --git a/tests/integration/targets/rds_instance_sgroups/tasks/main.yml b/tests/integration/targets/rds_instance_sgroups/tasks/main.yml index 45c8f3b4e62..669e704c528 100644 --- a/tests/integration/targets/rds_instance_sgroups/tasks/main.yml +++ b/tests/integration/targets/rds_instance_sgroups/tasks/main.yml @@ -3,9 +3,9 @@ - community.aws module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/rds_instance_snapshot/tasks/main.yml b/tests/integration/targets/rds_instance_snapshot/tasks/main.yml index c639291a54d..5b8b6b08efb 100644 --- a/tests/integration/targets/rds_instance_snapshot/tasks/main.yml +++ b/tests/integration/targets/rds_instance_snapshot/tasks/main.yml @@ -2,9 +2,9 @@ - module_defaults: group/aws: region: "{{ aws_region }}" - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" collections: - community.aws - amazon.aws diff --git a/tests/integration/targets/rds_instance_snapshot_mgmt/tasks/main.yml b/tests/integration/targets/rds_instance_snapshot_mgmt/tasks/main.yml index f8ac5d5f965..9b5670d116e 100644 --- a/tests/integration/targets/rds_instance_snapshot_mgmt/tasks/main.yml +++ b/tests/integration/targets/rds_instance_snapshot_mgmt/tasks/main.yml @@ -3,9 +3,9 @@ - community.aws module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: - name: Ensure the resource doesn't exist diff --git a/tests/integration/targets/rds_instance_states/tasks/main.yml b/tests/integration/targets/rds_instance_states/tasks/main.yml index fdcfcbf8a73..ae3b1514c6d 100644 --- a/tests/integration/targets/rds_instance_states/tasks/main.yml +++ b/tests/integration/targets/rds_instance_states/tasks/main.yml @@ -3,9 +3,9 @@ - community.aws module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: - name: Ensure the resource doesn't exist diff --git a/tests/integration/targets/rds_instance_tagging/tasks/main.yml b/tests/integration/targets/rds_instance_tagging/tasks/main.yml index 14c1872d6e0..410e59fe274 100644 --- a/tests/integration/targets/rds_instance_tagging/tasks/main.yml +++ b/tests/integration/targets/rds_instance_tagging/tasks/main.yml @@ -3,9 +3,9 @@ - community.aws module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: - name: Test tagging db with storage type gp3 diff --git a/tests/integration/targets/rds_instance_upgrade/tasks/main.yml b/tests/integration/targets/rds_instance_upgrade/tasks/main.yml index 5a21125435a..ac9363cbd01 100644 --- a/tests/integration/targets/rds_instance_upgrade/tasks/main.yml +++ b/tests/integration/targets/rds_instance_upgrade/tasks/main.yml @@ -3,9 +3,9 @@ - community.aws module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: - name: Ensure the resource doesn't exist diff --git a/tests/integration/targets/rds_option_group/tasks/main.yml b/tests/integration/targets/rds_option_group/tasks/main.yml index 651fe307eb9..f32f155cac4 100644 --- a/tests/integration/targets/rds_option_group/tasks/main.yml +++ b/tests/integration/targets/rds_option_group/tasks/main.yml @@ -2,9 +2,9 @@ module_defaults: group/aws: region: '{{ aws_region }}' - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' block: diff --git a/tests/integration/targets/rds_subnet_group/tasks/main.yml b/tests/integration/targets/rds_subnet_group/tasks/main.yml index 207b150af16..d087bd8476b 100644 --- a/tests/integration/targets/rds_subnet_group/tasks/main.yml +++ b/tests/integration/targets/rds_subnet_group/tasks/main.yml @@ -7,9 +7,9 @@ - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/route53/tasks/main.yml b/tests/integration/targets/route53/tasks/main.yml index a31d970bf2f..b43c7e5e061 100644 --- a/tests/integration/targets/route53/tasks/main.yml +++ b/tests/integration/targets/route53/tasks/main.yml @@ -9,9 +9,9 @@ - name: Test basics (new zone, A and AAAA records) module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' amazon.aws.route53: # Route53 is explicitly a global service diff --git a/tests/integration/targets/route53_health_check/tasks/main.yml b/tests/integration/targets/route53_health_check/tasks/main.yml index 4a1752d9713..4d71e5ac6ae 100644 --- a/tests/integration/targets/route53_health_check/tasks/main.yml +++ b/tests/integration/targets/route53_health_check/tasks/main.yml @@ -17,9 +17,9 @@ # - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: # Route53 can only test against routable IPs. Request an EIP so some poor diff --git a/tests/integration/targets/route53_zone/tasks/main.yml b/tests/integration/targets/route53_zone/tasks/main.yml index 4aea981d0b8..a6d9827f8c2 100644 --- a/tests/integration/targets/route53_zone/tasks/main.yml +++ b/tests/integration/targets/route53_zone/tasks/main.yml @@ -4,9 +4,9 @@ - amazon.aws module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' block: diff --git a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/acl.yml b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/acl.yml index f924af17368..90bb2f21ea2 100644 --- a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/acl.yml +++ b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/acl.yml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - set_fact: diff --git a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/encryption_bucket_key.yml b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/encryption_bucket_key.yml index 66a54c1e0b3..e50f53a4014 100644 --- a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/encryption_bucket_key.yml +++ b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/encryption_bucket_key.yml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: Set facts for encryption_bucket_key test diff --git a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/encryption_kms.yml b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/encryption_kms.yml index 75cdb4c6f0a..48020df8f14 100644 --- a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/encryption_kms.yml +++ b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/encryption_kms.yml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - set_fact: diff --git a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/encryption_sse.yml b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/encryption_sse.yml index 60ee2600912..07c0922a48e 100644 --- a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/encryption_sse.yml +++ b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/encryption_sse.yml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - set_fact: diff --git a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/main.yml b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/main.yml index 8eba03ba1a7..f13332c15a6 100644 --- a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/main.yml +++ b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/main.yml @@ -8,9 +8,9 @@ - name: "Wrap up all tests and setup AWS credentials" module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - debug: diff --git a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/object_lock.yml b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/object_lock.yml index 9140a566b96..ca8b466ee64 100644 --- a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/object_lock.yml +++ b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/object_lock.yml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - set_fact: diff --git a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/ownership_controls.yml b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/ownership_controls.yml index 683ff06597c..095d46b449e 100644 --- a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/ownership_controls.yml +++ b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/ownership_controls.yml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - set_fact: diff --git a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/public_access.yml b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/public_access.yml index 743a2ce4de6..3b295381411 100644 --- a/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/public_access.yml +++ b/tests/integration/targets/s3_bucket/roles/s3_bucket/tasks/public_access.yml @@ -1,9 +1,9 @@ --- - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - set_fact: diff --git a/tests/integration/targets/s3_object/tasks/main.yml b/tests/integration/targets/s3_object/tasks/main.yml index 5603ddc1ec1..d00bd196d0a 100644 --- a/tests/integration/targets/s3_object/tasks/main.yml +++ b/tests/integration/targets/s3_object/tasks/main.yml @@ -2,9 +2,9 @@ # Integration tests for s3_object - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: diff --git a/tests/integration/targets/setup_ec2_facts/tasks/main.yml b/tests/integration/targets/setup_ec2_facts/tasks/main.yml index f41791073a3..56a4e1db05f 100644 --- a/tests/integration/targets/setup_ec2_facts/tasks/main.yml +++ b/tests/integration/targets/setup_ec2_facts/tasks/main.yml @@ -10,9 +10,9 @@ # - module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit) }}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit) }}' region: '{{ aws_region }}' run_once: True diff --git a/tests/integration/targets/setup_ec2_instance_env/tasks/cleanup.yml b/tests/integration/targets/setup_ec2_instance_env/tasks/cleanup.yml index 0a0aa1eed76..837bbc45588 100644 --- a/tests/integration/targets/setup_ec2_instance_env/tasks/cleanup.yml +++ b/tests/integration/targets/setup_ec2_instance_env/tasks/cleanup.yml @@ -1,8 +1,8 @@ - module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: Set termination protection to false (so we can terminate instance) (cleanup) diff --git a/tests/integration/targets/setup_ec2_instance_env/tasks/main.yml b/tests/integration/targets/setup_ec2_instance_env/tasks/main.yml index 42d53c0e571..94cff6637c0 100644 --- a/tests/integration/targets/setup_ec2_instance_env/tasks/main.yml +++ b/tests/integration/targets/setup_ec2_instance_env/tasks/main.yml @@ -1,9 +1,9 @@ - run_once: '{{ setup_run_once | default("no") | bool }}' module_defaults: group/aws: - aws_access_key: "{{ aws_access_key }}" - aws_secret_key: "{{ aws_secret_key }}" - security_token: "{{ security_token | default(omit) }}" + access_key: "{{ aws_access_key }}" + secret_key: "{{ aws_secret_key }}" + session_token: "{{ security_token | default(omit) }}" region: "{{ aws_region }}" block: - name: "Create VPC for use in testing" diff --git a/tests/integration/targets/setup_ec2_vpc/tasks/cleanup.yml b/tests/integration/targets/setup_ec2_vpc/tasks/cleanup.yml index 0d85432ed9d..517ba0879dc 100644 --- a/tests/integration/targets/setup_ec2_vpc/tasks/cleanup.yml +++ b/tests/integration/targets/setup_ec2_vpc/tasks/cleanup.yml @@ -2,9 +2,9 @@ - name: Run all tests module_defaults: group/aws: - aws_access_key: '{{ aws_access_key }}' - aws_secret_key: '{{ aws_secret_key }}' - security_token: '{{ security_token | default(omit)}}' + access_key: '{{ aws_access_key }}' + secret_key: '{{ aws_secret_key }}' + session_token: '{{ security_token | default(omit)}}' region: '{{ aws_region }}' block: