From 307eee771f74dbcbc8188f83e704925438c603a4 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Mon, 16 Oct 2023 12:37:16 +0200 Subject: [PATCH 1/2] Do not require hosts edit for running quarkus molecule suite --- molecule/quarkus/prepare.yml | 15 --------------- molecule/quarkus/verify.yml | 8 ++++---- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/molecule/quarkus/prepare.yml b/molecule/quarkus/prepare.yml index c6ccb76..b83211d 100644 --- a/molecule/quarkus/prepare.yml +++ b/molecule/quarkus/prepare.yml @@ -7,26 +7,11 @@ name: sudo state: present - - name: "Display hera_home if defined." - ansible.builtin.set_fact: - hera_home: "{{ lookup('env', 'HERA_HOME') }}" - - name: Create certificate request ansible.builtin.command: openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -sha256 -days 365 -nodes -subj '/CN=instance' delegate_to: localhost changed_when: False - - name: Set /etc/hosts - ansible.builtin.lineinfile: - dest: /etc/hosts - line: "127.0.0.1 instance" - state: present - delegate_to: localhost - become: yes - when: - - hera_home is defined - - hera_home | length == 0 - - name: Create conf directory # risky-file-permissions in test user account does not exist yet ansible.builtin.file: state: directory diff --git a/molecule/quarkus/verify.yml b/molecule/quarkus/verify.yml index 553c4d6..e956ca6 100644 --- a/molecule/quarkus/verify.yml +++ b/molecule/quarkus/verify.yml @@ -16,11 +16,14 @@ hera_home: "{{ lookup('env', 'HERA_HOME') }}" - name: Verify openid config + when: + - hera_home is defined + - hera_home | length == 0 block: - name: Fetch openID config # noqa blocked_modules command-instead-of-module ansible.builtin.shell: | set -o pipefail - curl https://instance:8443/realms/master/.well-known/openid-configuration -k | jq . + curl -H 'Host: instance' https://localhost:8443/realms/master/.well-known/openid-configuration -k | jq . args: executable: /bin/bash delegate_to: localhost @@ -34,6 +37,3 @@ - (openid_config.stdout | from_json)['authorization_endpoint'] == 'https://instance/realms/master/protocol/openid-connect/auth' - (openid_config.stdout | from_json)['token_endpoint'] == 'https://instance/realms/master/protocol/openid-connect/token' delegate_to: localhost - when: - - hera_home is defined - - hera_home | length == 0 From d945c511729371eb5343887492ca1a636966ae59 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo <71768+gionn@users.noreply.github.com> Date: Mon, 16 Oct 2023 15:52:04 +0200 Subject: [PATCH 2/2] apply review suggestions --- molecule/quarkus/prepare.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/molecule/quarkus/prepare.yml b/molecule/quarkus/prepare.yml index b83211d..13dfff3 100644 --- a/molecule/quarkus/prepare.yml +++ b/molecule/quarkus/prepare.yml @@ -7,6 +7,10 @@ name: sudo state: present + - name: "Display hera_home if defined." + ansible.builtin.set_fact: + hera_home: "{{ lookup('env', 'HERA_HOME') }}" + - name: Create certificate request ansible.builtin.command: openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -sha256 -days 365 -nodes -subj '/CN=instance' delegate_to: localhost