From 1a73c39a9140c7e0132e0211e3726191b61075d9 Mon Sep 17 00:00:00 2001
From: Deven Phillips <deven.phillips@redhat.com>
Date: Thu, 2 May 2024 12:09:36 -0400
Subject: [PATCH 1/2] Fix logic in when clause
---
roles/keycloak_quarkus/tasks/jdbc_driver.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/roles/keycloak_quarkus/tasks/jdbc_driver.yml b/roles/keycloak_quarkus/tasks/jdbc_driver.yml
index 11fa385..10731cf 100644
--- a/roles/keycloak_quarkus/tasks/jdbc_driver.yml
+++ b/roles/keycloak_quarkus/tasks/jdbc_driver.yml
@@ -4,8 +4,7 @@
msg: >-
When JDBC driver download credentials are set, both the username and the password MUST be set
when:
- - keycloak_jdbc_download_user is undefined and keycloak_jdbc_download_pass is not undefined
- - keycloak_jdbc_download_pass is undefined and keycloak_jdbc_download_user is not undefined
+ - (keycloak_jdbc_download_user is undefined and keycloak_jdbc_download_pass is not undefined) or (keycloak_jdbc_download_pass is undefined and keycloak_jdbc_download_user is not undefined)
- name: "Retrieve JDBC Driver from {{ keycloak_jdbc_download_user | default(keycloak_quarkus_default_jdbc[keycloak_quarkus_jdbc_engine].driver_jar_url) }}"
ansible.builtin.get_url:
url: "{{ keycloak_jdbc_download_url | default(keycloak_quarkus_default_jdbc[keycloak_quarkus_jdbc_engine].driver_jar_url) }}"
From 978494524fd850f396245c4302a2f5eb5eb24f67 Mon Sep 17 00:00:00 2001
From: Deven Phillips <deven.phillips@redhat.com>
Date: Thu, 2 May 2024 12:31:16 -0400
Subject: [PATCH 2/2] Fix errors introduced
---
roles/keycloak_quarkus/tasks/jdbc_driver.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/roles/keycloak_quarkus/tasks/jdbc_driver.yml b/roles/keycloak_quarkus/tasks/jdbc_driver.yml
index 10731cf..dc84880 100644
--- a/roles/keycloak_quarkus/tasks/jdbc_driver.yml
+++ b/roles/keycloak_quarkus/tasks/jdbc_driver.yml
@@ -3,8 +3,8 @@
ansible.builtin.fail:
msg: >-
When JDBC driver download credentials are set, both the username and the password MUST be set
- when:
- - (keycloak_jdbc_download_user is undefined and keycloak_jdbc_download_pass is not undefined) or (keycloak_jdbc_download_pass is undefined and keycloak_jdbc_download_user is not undefined)
+ when:
+ - (keycloak_jdbc_download_user is undefined and keycloak_jdbc_download_pass is not undefined) or (keycloak_jdbc_download_pass is undefined and keycloak_jdbc_download_user is not undefined)
- name: "Retrieve JDBC Driver from {{ keycloak_jdbc_download_user | default(keycloak_quarkus_default_jdbc[keycloak_quarkus_jdbc_engine].driver_jar_url) }}"
ansible.builtin.get_url:
url: "{{ keycloak_jdbc_download_url | default(keycloak_quarkus_default_jdbc[keycloak_quarkus_jdbc_engine].driver_jar_url) }}"