From 8a50b6e310414648e51117406904313abc7f34a8 Mon Sep 17 00:00:00 2001 From: Aiden Keating Date: Thu, 4 Jun 2020 21:29:33 +0100 Subject: [PATCH] ocp4_workload_integreatly: fix unicode string handling in list append (#1854) fix unicode string handling discussed in [1] in the 3scale workshop sso client updates. this ensures the sso client custom resource does not contain any 'u' characters. components: - role: roles_ocp_workloads/ocp4_workload_integreatly [1] https://stackoverflow.com/questions/41521138/ansible-template-adds-u-to-array-in-template --- .../files/threescale/create-tenant.yml | 2 +- .../templates/keycloakclient-3scale-workshop.yml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles_ocp_workloads/ocp4_workload_integreatly/files/threescale/create-tenant.yml b/ansible/roles_ocp_workloads/ocp4_workload_integreatly/files/threescale/create-tenant.yml index d9871deddb7..47be0d7c2da 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_integreatly/files/threescale/create-tenant.yml +++ b/ansible/roles_ocp_workloads/ocp4_workload_integreatly/files/threescale/create-tenant.yml @@ -116,7 +116,7 @@ until: _create_tenantdetails_secret is succeeded - set_fact: - _sso_redirect_uris: "{{ _action_get_client.resources[0].spec.client.redirectUris + [_tenant_host + '/*'] }}" + _sso_redirect_uris: "{{ (_action_get_client.resources[0].spec.client.redirectUris | default([])) + [(_tenant_host + '/*' | string)] }}" - name: Get managed 3scale SSO client k8s_facts: diff --git a/ansible/roles_ocp_workloads/ocp4_workload_integreatly/templates/keycloakclient-3scale-workshop.yml.j2 b/ansible/roles_ocp_workloads/ocp4_workload_integreatly/templates/keycloakclient-3scale-workshop.yml.j2 index 01e2304e4b2..4cfeb439db2 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_integreatly/templates/keycloakclient-3scale-workshop.yml.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_integreatly/templates/keycloakclient-3scale-workshop.yml.j2 @@ -7,7 +7,7 @@ spec: enabled: true clientAuthenticatorType: client-secret fullScopeAllowed: true - redirectUris: {{ ocp4_workload_integreatly_threescale_sso_client_redirect_uris }} + redirectUris: {{ ocp4_workload_integreatly_threescale_sso_client_redirect_uris | to_json }} access: configure: true manage: true