draft

ansible-collections · Dec 1, 2023 · f47ad74 · f47ad74
1 parent 0ffa3dd
commit f47ad74
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 57 deletions.
diff --git a/tests/integration/targets/api_gateway_domain/tasks/main.yml b/tests/integration/targets/api_gateway_domain/tasks/main.yml
@@ -39,7 +39,7 @@
     - assert:
         that:
           - create_result.changed == True
-          - create_result.response.domain.domain_name == "{{ api_gateway_domain_name }}"
+          - create_result.response.domain.domain_name == api_gateway_domain_name
           - create_result.response.domain.distribution_domain_name is defined
           - create_result.response.domain.distribution_hosted_zone_id is defined
           - create_result.response.path_mappings is defined
@@ -59,7 +59,7 @@
         that:
           - repeat_result.changed == False
           - repeat_result.failed == False
-          - repeat_result.response.domain_name == "{{ api_gateway_domain_name }}"
+          - repeat_result.response.domain_name == api_gateway_domain_name
 
     - name: Update Test - API gateway custom domain setup, change settings
       api_gateway_domain:
@@ -75,7 +75,7 @@
     - assert:
         that:
           - update_result.changed == True
-          - update_result.response.domain.domain_name == "{{ api_gateway_domain_name }}"
+          - update_result.response.domain.domain_name == api_gateway_domain_name
           - update_result.response.domain.security_policy == 'TLS_1_2'
           - update_result.response.domain.endpoint_configuration.types.0 == 'REGIONAL'
           - update_result.response.path_mappings.0.base_path = '/v1'

diff --git a/tests/integration/targets/autoscaling_instance_refresh/tasks/main.yml b/tests/integration/targets/autoscaling_instance_refresh/tasks/main.yml
@@ -107,7 +107,7 @@
 
     - assert:
         that:
-        - "'An error occurred (ActiveInstanceRefreshNotFound) when calling the CancelInstanceRefresh operation: No in progress or pending Instance Refresh found for Auto Scaling group {{ resource_prefix }}-asg' in result.msg"
+        - 'An error occurred (ActiveInstanceRefreshNotFound) when calling the CancelInstanceRefresh operation: No in progress or pending Instance Refresh found for Auto Scaling group ' ~ resource_prefix ~ '-asg' in result.msg
 
     - name: test starting a refresh with a valid ASG name - check_mode
       autoscaling_instance_refresh:
@@ -323,7 +323,7 @@
 
     - assert:
         that:
-          - "{{ output.instance_refreshes|length }} == 0"
+          - output.instance_refreshes | length == 0
 
     - name: test using a real refresh ID
       autoscaling_instance_refresh_info:
@@ -334,7 +334,7 @@
 
     - assert:
         that:
-          - "{{ output.instance_refreshes |length }} == 1"
+          - output.instance_refreshes | length == 1
 
     - name: test getting info for an ASG name which doesn't exist
       autoscaling_instance_refresh_info:
@@ -354,7 +354,7 @@
 
     - assert:
         that:
-          - "{{ output.instance_refreshes|length }} == 7"
+          - output.instance_refreshes | length == 7
 
     - name: assert that valid message with fake-token is returned
       autoscaling_instance_refresh_info:
@@ -376,7 +376,7 @@
 
     - assert:
         that:
-          - "{{ output.instance_refreshes|length }} < 2"
+          - output.instance_refreshes | length < 2
 
     - name: assert that valid message with real-token is returned
       autoscaling_instance_refresh_info:
@@ -387,7 +387,7 @@
 
     - assert:
         that:
-          - "{{ output.instance_refreshes|length }} == 7"
+          - output.instance_refreshes | length == 7
 
     - name: test using both real nextToken and max_records=1
       autoscaling_instance_refresh_info:
@@ -399,7 +399,7 @@
 
     - assert:
         that:
-          - "{{ output.instance_refreshes|length }} == 1"
+          - output.instance_refreshes | length == 1
 
   always:
 

diff --git a/tests/integration/targets/autoscaling_scheduled_action/tasks/main.yml b/tests/integration/targets/autoscaling_scheduled_action/tasks/main.yml
@@ -101,7 +101,7 @@
         that:
           - scheduled_action is successful
           - scheduled_action is changed
-          - scheduled_action.scheduled_action_name == "{{ resource_prefix }}-test"
+          - scheduled_action.scheduled_action_name == resource_prefix ~ '-test'
           - scheduled_action.desired_capacity == 2
 
     - name: Create basic scheduled_action - idempotent
@@ -155,7 +155,7 @@
         that:
           - scheduled_action is successful
           - scheduled_action is changed
-          - scheduled_action.scheduled_action_name == "{{ resource_prefix }}-test"
+          - scheduled_action.scheduled_action_name == resource_prefix ~ '-test'
           - scheduled_action.desired_capacity == 3
           - scheduled_action.min_size == 3
 
@@ -217,7 +217,7 @@
         that:
           - advanced_scheduled_action is successful
           - advanced_scheduled_action is changed
-          - advanced_scheduled_action.scheduled_action_name == "{{ resource_prefix }}-test1"
+          - advanced_scheduled_action.scheduled_action_name == resource_prefix ~ '-test1'
           - advanced_scheduled_action.desired_capacity == 2
           - advanced_scheduled_action.min_size == 2
           - advanced_scheduled_action.max_size == 5

diff --git a/tests/integration/targets/connection/test_assume.yml b/tests/integration/targets/connection/test_assume.yml
@@ -13,4 +13,4 @@
 
 - assert:
     that:
-      - id_cmd.stdout == '{{ user_name }}'
+      - id_cmd.stdout == user_name
diff --git a/tests/integration/targets/ec2_placement_group/tasks/main.yml b/tests/integration/targets/ec2_placement_group/tasks/main.yml
@@ -25,7 +25,7 @@
     - assert:
         that:
           - pg_1_create_check_mode is changed
-          - pg_1_create_check_mode.placement_group.name == '{{ resource_prefix }}-pg1'
+          - pg_1_create_check_mode.placement_group.name == resource_prefix ~ '-pg1'
           - pg_1_create_check_mode.placement_group.state == "DryRun"
           - '"ec2:CreatePlacementGroup" in pg_1_create_check_mode.resource_actions'
 
@@ -41,7 +41,7 @@
     - assert:
         that:
           - pg_1_create is changed
-          - pg_1_create.placement_group.name == '{{ resource_prefix }}-pg1'
+          - pg_1_create.placement_group.name == resource_prefix ~ '-pg1'
           - pg_1_create.placement_group.state == "available"
           - '"ec2:CreatePlacementGroup" in pg_1_create.resource_actions'
 
@@ -54,7 +54,7 @@
     - assert:
         that:
           - pg_1_info_result is not changed
-          - pg_1_info_result.placement_groups[0].name == '{{ resource_prefix }}-pg1'
+          - pg_1_info_result.placement_groups[0].name == resource_prefix ~ '-pg1'
           - pg_1_info_result.placement_groups[0].state == "available"
           - pg_1_info_result.placement_groups[0].strategy == "cluster"
           - '"ec2:DescribePlacementGroups" in pg_1_info_result.resource_actions'
@@ -68,7 +68,7 @@
     - assert:
         that:
           - pg_1_create is not changed
-          - pg_1_create.placement_group.name == '{{ resource_prefix }}-pg1'
+          - pg_1_create.placement_group.name == resource_prefix ~ '-pg1'
           - pg_1_create.placement_group.state == "available"
           - '"ec2:CreatePlacementGroup" not in pg_1_create.resource_actions'
 
@@ -82,7 +82,7 @@
     - assert:
         that:
           - pg_1_create_check_mode_idem is not changed
-          - pg_1_create_check_mode_idem.placement_group.name == '{{ resource_prefix }}-pg1'
+          - pg_1_create_check_mode_idem.placement_group.name == resource_prefix ~ '-pg1'
           - pg_1_create_check_mode_idem.placement_group.state == "available"
           - '"ec2:CreatePlacementGroup" not in pg_1_create_check_mode_idem.resource_actions'
 
@@ -97,7 +97,7 @@
     - assert:
         that:
           - pg_2_create_check_mode is changed
-          - pg_2_create_check_mode.placement_group.name == '{{ resource_prefix }}-pg2'
+          - pg_2_create_check_mode.placement_group.name == resource_prefix ~ '-pg2'
           - pg_2_create_check_mode.placement_group.state == "DryRun"
           - '"ec2:CreatePlacementGroup" in pg_2_create_check_mode.resource_actions'
 
@@ -111,7 +111,7 @@
     - assert:
         that:
           - pg_2_create is changed
-          - pg_2_create.placement_group.name == '{{ resource_prefix }}-pg2'
+          - pg_2_create.placement_group.name == resource_prefix ~ '-pg2'
           - pg_2_create.placement_group.state == "available"
           - '"ec2:CreatePlacementGroup" in pg_2_create.resource_actions'
 
@@ -127,7 +127,7 @@
     - assert:
         that:
           - pg_2_info_result is not changed
-          - pg_2_info_result.placement_groups[0].name == '{{ resource_prefix }}-pg2'
+          - pg_2_info_result.placement_groups[0].name == resource_prefix ~ '-pg2'
           - pg_2_info_result.placement_groups[0].state == "available"
           - pg_2_info_result.placement_groups[0].strategy == "spread"
           - '"ec2:DescribePlacementGroups" in pg_2_info_result.resource_actions'
@@ -142,7 +142,7 @@
     - assert:
         that:
           - pg_2_create is not changed
-          - pg_2_create.placement_group.name == '{{ resource_prefix }}-pg2'
+          - pg_2_create.placement_group.name == resource_prefix ~ '-pg2'
           - pg_2_create.placement_group.state == "available"
           - '"ec2:CreatePlacementGroup" not in pg_2_create.resource_actions'
 
@@ -157,7 +157,7 @@
     - assert:
         that:
           - pg_2_create_check_mode_idem is not changed
-          - pg_2_create_check_mode_idem.placement_group.name == '{{ resource_prefix }}-pg2'
+          - pg_2_create_check_mode_idem.placement_group.name == resource_prefix ~ '-pg2'
           - pg_2_create_check_mode_idem.placement_group.state == "available"
           - '"ec2:CreatePlacementGroup" not in pg_2_create_check_mode_idem.resource_actions'
 
@@ -173,7 +173,7 @@
     - assert:
         that:
           - pg_3_create_check_mode is changed
-          - pg_3_create_check_mode.placement_group.name == '{{ resource_prefix }}-pg3'
+          - pg_3_create_check_mode.placement_group.name == resource_prefix ~ '-pg3'
           - pg_3_create_check_mode.placement_group.state == "DryRun"
           - '"ec2:CreatePlacementGroup" in pg_3_create_check_mode.resource_actions'
 
@@ -188,7 +188,7 @@
     - assert:
         that:
           - pg_3_create is changed
-          - pg_3_create.placement_group.name == '{{ resource_prefix }}-pg3'
+          - pg_3_create.placement_group.name == resource_prefix ~ '-pg3'
           - pg_3_create.placement_group.state == "available"
           - '"ec2:CreatePlacementGroup" in pg_3_create.resource_actions'
 
@@ -205,7 +205,7 @@
     - assert:
         that:
           - pg_3_info_result is not changed
-          - pg_3_info_result.placement_groups[0].name == '{{ resource_prefix }}-pg3'
+          - pg_3_info_result.placement_groups[0].name == resource_prefix ~ '-pg3'
           - pg_3_info_result.placement_groups[0].state == "available"
           - pg_3_info_result.placement_groups[0].strategy == "partition"
           - '"ec2:DescribePlacementGroups" in pg_3_info_result.resource_actions'
@@ -221,7 +221,7 @@
     - assert:
         that:
           - pg_3_create is not changed
-          - pg_3_create.placement_group.name == '{{ resource_prefix }}-pg3'
+          - pg_3_create.placement_group.name == resource_prefix ~ '-pg3'
           - pg_3_create.placement_group.state == "available"
           - '"ec2:CreatePlacementGroup" not in pg_3_create.resource_actions'
 
@@ -237,7 +237,7 @@
     - assert:
         that:
           - pg_3_create_check_mode_idem is not changed
-          - pg_3_create_check_mode_idem.placement_group.name == '{{ resource_prefix }}-pg3'
+          - pg_3_create_check_mode_idem.placement_group.name == resource_prefix ~ '-pg3'
           - pg_3_create_check_mode_idem.placement_group.state == "available"
           - '"ec2:CreatePlacementGroup" not in pg_3_create_check_mode_idem.resource_actions'
 

diff --git a/tests/integration/targets/efs/tasks/main.yml b/tests/integration/targets/efs/tasks/main.yml
@@ -98,7 +98,7 @@
           - efs_result.efs[0].mount_targets[1].security_groups[0] == vpc_default_sg_id
 
     - assert:
-        that: "{{efs_result_assertions}}"
+        that: efs_result_assertions
 
     # ============================================================
     - name: Get EFS by id
@@ -107,7 +107,7 @@
       register: efs_result
 
     - assert:
-        that: "{{efs_result_assertions}}"
+        that: efs_result_assertions
 
     # ============================================================
     - name: Get EFS by tag
@@ -117,7 +117,7 @@
       register: efs_result
 
     - assert:
-        that: "{{efs_result_assertions}}"
+        that: efs_result_assertions
 
     # ============================================================
     - name: Get EFS by target (subnet_id)
@@ -127,7 +127,7 @@
       register: efs_result
 
     - assert:
-        that: "{{efs_result_assertions}}"
+        that: efs_result_assertions
 
     # ============================================================
     - name: Get EFS by target (security_group_id)
@@ -137,7 +137,7 @@
       register: efs_result
 
     - assert:
-        that: "{{efs_result_assertions}}"
+        that: efs_result_assertions
 
     # ============================================================
     - name: Get EFS by tag and target
@@ -149,7 +149,7 @@
       register: efs_result
 
     - assert:
-        that: "{{efs_result_assertions}}"
+        that: efs_result_assertions
 
     # ============================================================
     #   Not checking efs_result.efs["throughput_mode"] here as
@@ -231,7 +231,7 @@
           - efs_result.efs[0].file_system_id == created_efs.efs.file_system_id
 
     - assert:
-        that: "{{efs_result_assertions}}"
+        that: efs_result_assertions
 
     # ============================================================
     - name: Efs configure IA transition
@@ -366,7 +366,7 @@
           - efs_tag_result.tags.Env is defined
           - efs_tag_result.tags.Env is search("IntegrationTests")
           - efs_tag_result.tags.Name is defined
-          - efs_tag_result.tags.Name is search("{{ efs_name }}-test-tag")
+          - efs_tag_result.tags.Name is search(efs_name ~ '-test-tag')
           - efs_tag_result.tags["CamelCase"] == 'SimpleCamelCase'
           - efs_tag_result.tags["Title Case"] == 'Hello Cruel World'
           - efs_tag_result.tags["lowercase spaced"] == 'hello cruel world'
@@ -464,7 +464,7 @@
           - efs_tag_result.tags.Env is defined
           - efs_tag_result.tags.Env is search("IntegrationTests")
           - efs_tag_result.tags.Name is defined
-          - efs_tag_result.tags.Name is search("{{ efs_name }}-test-tag")
+          - efs_tag_result.tags.Name is search(efs_name ~ '-test-tag')
           - not efs_tag_result.tags["CamelCase"] is defined
           - not efs_tag_result.tags["Title Case"] is defined
           - not efs_tag_result.tags["lowercase spaced"] is defined
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,4 +13,4 @@ @@
     - assert:
         that:
-          - id_cmd.stdout == '{{ user_name }}'
+          - id_cmd.stdout == user_name