From 6fc4a631eb476f590e74ac79e5c6cc7e47986d9a Mon Sep 17 00:00:00 2001 From: jillr Date: Tue, 8 Jun 2021 17:26:40 +0000 Subject: [PATCH] Shorten some role names in tests --- tests/integration/targets/aws_codebuild/defaults/main.yml | 2 +- tests/integration/targets/aws_codepipeline/defaults/main.yml | 4 ++-- .../integration/targets/aws_ses_rule_set/defaults/main.yaml | 4 ++-- .../aws_step_functions_state_machine/defaults/main.yml | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/integration/targets/aws_codebuild/defaults/main.yml b/tests/integration/targets/aws_codebuild/defaults/main.yml index 8887815ff93..67c13956d0a 100644 --- a/tests/integration/targets/aws_codebuild/defaults/main.yml +++ b/tests/integration/targets/aws_codebuild/defaults/main.yml @@ -3,5 +3,5 @@ # IAM role names have to be less than 64 characters # we hash the resource_prefix to get a shorter, unique string -unique_id: "{{ resource_prefix | hash('md5') }}" +unique_id: "{{ resource_prefix | hash('md5') | truncate(8, True, '') }}" iam_role_name: "ansible-test-sts-{{ unique_id }}-codebuild-service-role" diff --git a/tests/integration/targets/aws_codepipeline/defaults/main.yml b/tests/integration/targets/aws_codepipeline/defaults/main.yml index 1b444306532..1551d8a3b64 100644 --- a/tests/integration/targets/aws_codepipeline/defaults/main.yml +++ b/tests/integration/targets/aws_codepipeline/defaults/main.yml @@ -1,9 +1,9 @@ --- # defaults file for aws_codepipeline -codepipeline_name: "{{ resource_prefix }}-test-codepipeline" +codepipeline_name: "{{ resource_prefix | hash('md5') }}-test-codepipeline" # IAM role names have to be less than 64 characters # we hash the resource_prefix to get a shorter, unique string -unique_id: "{{ resource_prefix | hash('md5') }}" +unique_id: "{{ resource_prefix | hash('md5') | truncate(6, True, '') }}" codepipeline_service_role_name: "ansible-test-sts-{{ unique_id }}-codepipeline-role" diff --git a/tests/integration/targets/aws_ses_rule_set/defaults/main.yaml b/tests/integration/targets/aws_ses_rule_set/defaults/main.yaml index f9fecf7bdf4..36351dfc9d6 100644 --- a/tests/integration/targets/aws_ses_rule_set/defaults/main.yaml +++ b/tests/integration/targets/aws_ses_rule_set/defaults/main.yaml @@ -1,6 +1,6 @@ --- -default_rule_set: "{{ resource_prefix }}-default-rule-set" -second_rule_set: "{{ resource_prefix }}-second-rule-set" +default_rule_set: "{{ resource_prefix | hash('md5') }}-default-rule-set" +second_rule_set: "{{ resource_prefix | hash('md5') }}-second-rule-set" # See comment in obtain-lock.yaml for definitions of these variables max_obtain_lock_attempts: 10 diff --git a/tests/integration/targets/aws_step_functions_state_machine/defaults/main.yml b/tests/integration/targets/aws_step_functions_state_machine/defaults/main.yml index d3dea56cd72..b8d8d85dd1a 100644 --- a/tests/integration/targets/aws_step_functions_state_machine/defaults/main.yml +++ b/tests/integration/targets/aws_step_functions_state_machine/defaults/main.yml @@ -1,4 +1,5 @@ # the random_num is generated in a set_fact task at the start of the testsuite -state_machine_name: "{{ resource_prefix }}_step_function_{{ random_num }}" -step_functions_role_name: "ansible-test-{{ resource_prefix }}-step-function" +state_machine_name: "{{ resource_prefix | hash('md5') }}_step_function_{{ random_num }}" +unique_id: "{{ resource_prefix | hash('md5') }}" +step_functions_role_name: "ansible-test-{{ unique_id }}-step-function" execution_name: "{{ resource_prefix }}_sfn_execution"