majic-ansible-roles Changeset

Changeset - 70ed9e45e116

Parent rev.

Child rev.

[Not reviewed]

6 5 2

Branko Majic (branko) - 4 years ago 2020-09-15 13:55:31
branko@majic.rs

MAR-150: Use fixtures for X.509 artefacts in the web_server role:

- Removed the statically generated artefacts.
- Generate X.509 artefacts for tests using Gimmecert.
- Updated paths to point to generated artefacts.
- Introduced cleanup playbook for removing generated artefacts.

13 files changed with 60 insertions and 535 deletions:

roles/web_server/molecule/default/cleanup.yml

roles/web_server/molecule/default/group_vars/parameters-mandatory.yml

roles/web_server/molecule/default/group_vars/parameters-optional.yml

roles/web_server/molecule/default/molecule.yml

roles/web_server/molecule/default/prepare.yml

roles/web_server/molecule/default/tests/data/.keep

new file

roles/web_server/molecule/default/tests/data/x509/ca.cert.pem

roles/web_server/molecule/default/tests/data/x509/ca.key.pem

182

roles/web_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_https.cert.pem

roles/web_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_https.key.pem

134

roles/web_server/molecule/default/tests/data/x509/parameters-optional-stretch64_https.cert.pem

roles/web_server/molecule/default/tests/data/x509/parameters-optional-stretch64_https.key.pem

134

roles/web_server/molecule/default/tests/test_default.py

0 comments (0 inline, 0 general)

roles/web_server/molecule/default/cleanup.yml

➞

Show inline comments

@@ new file 100644 @@
 ---
 - name: Clean-up fixtures
   hosts: localhost
   connection: local
   gather_facts: false
   tasks:
     - name: Remove X.509 material
       file:
         path: "{{ item }}"
         state: absent
       with_items:
         - "tests/data/x509"
         - "tests/data/.gimmecert"

roles/web_server/molecule/default/group_vars/parameters-mandatory.yml

➞

Show inline comments

 ---
 default_https_tls_certificate: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_https.cert.pem') }}"
 default_https_tls_key: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_https.key.pem') }}"
 default_https_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_https.cert.pem') }}"
 default_https_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_https.key.pem') }}"
 # common
 ca_certificates:
   testca: "{{ lookup('file', 'tests/data/x509/ca.cert.pem') }}"
+  testca: "{{ lookup('file', 'tests/data/x509/ca/level1.cert.pem') }}"

roles/web_server/molecule/default/group_vars/parameters-optional.yml

➞

Show inline comments

 ---
 default_enforce_https: false
 default_https_tls_certificate: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_https.cert.pem') }}"
 default_https_tls_key: "{{ lookup('file', 'tests/data/x509/{{ inventory_hostname }}_https.key.pem') }}"
 default_https_tls_certificate: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_https.cert.pem') }}"
 default_https_tls_key: "{{ lookup('file', 'tests/data/x509/server/{{ inventory_hostname }}_https.key.pem') }}"
 web_default_title: "Optional Welcome"
 web_default_message: "Welcome to parameters-optional, default virtual host."
 web_server_tls_protocols:
 # common
 ca_certificates:
   testca: "{{ lookup('file', 'tests/data/x509/ca.cert.pem') }}"
+  testca: "{{ lookup('file', 'tests/data/x509/ca/level1.cert.pem') }}"

roles/web_server/molecule/default/molecule.yml

➞

Show inline comments

@@ @@ -55,6 +55,8 @@ platforms: @@
 provisioner:
   name: ansible
   playbooks:
     cleanup: cleanup.yml
   config_options:
     defaults:
       force_valid_group_names: "ignore"

roles/web_server/molecule/default/prepare.yml

➞

Show inline comments

 ---
 - name: Set-up fixtures
   hosts: localhost
   connection: local
   gather_facts: false
   tasks:
     - name: Initialise CA hierarchy
       command: "gimmecert init"
       args:
         creates: ".gimmecert/ca/level1.cert.pem"
         chdir: "tests/data/"
     - name: Generate server private keys and certificates
       command:
       args:
         chdir: "tests/data/"
         creates: ".gimmecert/server/{{ item.name }}.cert.pem"
         argv:
           - "gimmecert"
           - "server"
           - "{{ item.name }}"
           - "{{ item.fqdn }}"
       with_items:
         - name: parameters-mandatory-stretch64_https
           fqdn: parameters-mandatory
         - name: parameters-optional-stretch64_https
           fqdn: parameters-optional
     - name: Set-up link to generated X.509 material
       file:
         src: ".gimmecert"
         dest: "tests/data/x509"
         state: link
 - name: Prepare
   hosts: all
   gather_facts: false
@@ @@ -62,7 +96,7 @@ @@
     - name: Deploy CA certificate
       copy:
         src: tests/data/x509/ca.cert.pem
+        src: tests/data/x509/ca/level1.cert.pem
         dest: /usr/local/share/ca-certificates/testca.crt
         owner: root
         group: root

roles/web_server/molecule/default/tests/data/.keep

➞

Show inline comments

new file 100644

roles/web_server/molecule/default/tests/data/x509/ca.cert.pem

➞

Show inline comments

deleted file

roles/web_server/molecule/default/tests/data/x509/ca.key.pem

➞

Show inline comments

deleted file

roles/web_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_https.cert.pem

➞

Show inline comments

deleted file

roles/web_server/molecule/default/tests/data/x509/parameters-mandatory-stretch64_https.key.pem

➞

Show inline comments

deleted file

roles/web_server/molecule/default/tests/data/x509/parameters-optional-stretch64_https.cert.pem

➞

Show inline comments

deleted file

roles/web_server/molecule/default/tests/data/x509/parameters-optional-stretch64_https.key.pem

➞

Show inline comments

deleted file

roles/web_server/molecule/default/tests/test_default.py

➞

Show inline comments

@@ @@ -292,11 +292,11 @@ def test_nginx_tls_files(host): @@
         assert tls_file.user == 'root'
         assert tls_file.group == 'root'
         assert tls_file.mode == 0o640
         assert tls_file.content_string == open("tests/data/x509/%s_https.key.pem" % hostname, "r").read().rstrip()
+        assert tls_file.content_string == open("tests/data/x509/server/%s_https.key.pem" % hostname, "r").read().rstrip()
         tls_file = host.file('/etc/ssl/certs/%s_https.pem' % hostname)
         assert tls_file.is_file
         assert tls_file.user == 'root'
         assert tls_file.group == 'root'
         assert tls_file.mode == 0o644
         assert tls_file.content_string == open("tests/data/x509/%s_https.cert.pem" % hostname, "r").read().rstrip()
+        assert tls_file.content_string == open("tests/data/x509/server/%s_https.cert.pem" % hostname, "r").read().rstrip()

0 comments (0 inline, 0 general)