From f539d33c5b181689fa3f7b9c01a234a709fa4b75 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 18 Jan 2021 13:36:05 +1100 Subject: [PATCH 1/8] DCD-1190: Move BB-specific variables out of the group vars to a common role. --- group_vars/aws_node_local.yml | 7 ------- roles/bitbucket_common/defaults/main.yml | 5 +++++ roles/bitbucket_config/default/main.yaml | 1 - roles/bitbucket_config/defaults/main.yaml | 3 +++ roles/bitbucket_config/meta/main.yml | 4 ++++ roles/bitbucket_dataset_restore/defaults/main.yml | 3 +++ roles/bitbucket_dataset_restore/meta/main.yml | 4 ++++ 7 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 roles/bitbucket_common/defaults/main.yml delete mode 100644 roles/bitbucket_config/default/main.yaml create mode 100644 roles/bitbucket_config/defaults/main.yaml create mode 100644 roles/bitbucket_config/meta/main.yml create mode 100644 roles/bitbucket_dataset_restore/defaults/main.yml create mode 100644 roles/bitbucket_dataset_restore/meta/main.yml diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml index 9db7661..b331964 100644 --- a/group_vars/aws_node_local.yml +++ b/group_vars/aws_node_local.yml @@ -153,10 +153,3 @@ atl_rds_security_group: "{{ lookup('env', 'ATL_RDS_SECURITY_GROUP') }}" atl_backup_manifest_url: "{{ lookup('env', 'ATL_BACKUP_MANIFEST_URL') }}" atl_restore_required: "{{ atl_backup_manifest_url is defined and atl_backup_manifest_url != '' }}" - - -atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" -atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}" - -atl_bitbucket_dataset_url: "{{ lookup('env', 'ATL_DATASET_URL') }}" -atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_BB_BASEURL') }}" diff --git a/roles/bitbucket_common/defaults/main.yml b/roles/bitbucket_common/defaults/main.yml new file mode 100644 index 0000000..2dbd25b --- /dev/null +++ b/roles/bitbucket_common/defaults/main.yml @@ -0,0 +1,5 @@ +--- + +atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_BB_BASEURL') }}" +atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}" + diff --git a/roles/bitbucket_config/default/main.yaml b/roles/bitbucket_config/default/main.yaml deleted file mode 100644 index ed97d53..0000000 --- a/roles/bitbucket_config/default/main.yaml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/roles/bitbucket_config/defaults/main.yaml b/roles/bitbucket_config/defaults/main.yaml new file mode 100644 index 0000000..9790c09 --- /dev/null +++ b/roles/bitbucket_config/defaults/main.yaml @@ -0,0 +1,3 @@ +--- + +atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" diff --git a/roles/bitbucket_config/meta/main.yml b/roles/bitbucket_config/meta/main.yml new file mode 100644 index 0000000..ca5ee97 --- /dev/null +++ b/roles/bitbucket_config/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - bitbucket_common diff --git a/roles/bitbucket_dataset_restore/defaults/main.yml b/roles/bitbucket_dataset_restore/defaults/main.yml new file mode 100644 index 0000000..90d88ea --- /dev/null +++ b/roles/bitbucket_dataset_restore/defaults/main.yml @@ -0,0 +1,3 @@ +--- + +atl_bitbucket_dataset_url: "{{ lookup('env', 'ATL_DATASET_URL') }}" diff --git a/roles/bitbucket_dataset_restore/meta/main.yml b/roles/bitbucket_dataset_restore/meta/main.yml new file mode 100644 index 0000000..ca5ee97 --- /dev/null +++ b/roles/bitbucket_dataset_restore/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - bitbucket_common From 08b38ec7fb0cd54751217d8aead10920450439c6 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 18 Jan 2021 14:18:21 +1100 Subject: [PATCH 2/8] DCD-1190: Add supplied properties to the template. --- roles/bitbucket_config/defaults/main.yaml | 1 + roles/bitbucket_config/templates/bitbucket.properties.j2 | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/bitbucket_config/defaults/main.yaml b/roles/bitbucket_config/defaults/main.yaml index 9790c09..9eccfb1 100644 --- a/roles/bitbucket_config/defaults/main.yaml +++ b/roles/bitbucket_config/defaults/main.yaml @@ -1,3 +1,4 @@ --- atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" +atl_bitbucket_properties: "{{ lookup('env', 'ATL_BITBUCKET_PROPERTIES') }}" diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2 index 444855f..13306e2 100644 --- a/roles/bitbucket_config/templates/bitbucket.properties.j2 +++ b/roles/bitbucket_config/templates/bitbucket.properties.j2 @@ -1,4 +1,4 @@ -# Created by Ansible +# Created by Ansible role `bitbucket_config` jdbc.driver={{ atl_db_driver }} jdbc.url={{ atl_jdbc_url }} jdbc.user={{ atl_jdbc_user }} @@ -34,3 +34,6 @@ server.scheme=http server.proxy-port=80 {% endif %} +{% if atl_bitbucket_properties is defined $} +{{ atl_bitbucket_properties }} +{% endif %} From b97ef5e08c619bd11b69fa2f609a938084d2512a Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 18 Jan 2021 15:20:49 +1100 Subject: [PATCH 3/8] DCD-1190: Fix typo. --- roles/bitbucket_config/templates/bitbucket.properties.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2 index 13306e2..5b8beca 100644 --- a/roles/bitbucket_config/templates/bitbucket.properties.j2 +++ b/roles/bitbucket_config/templates/bitbucket.properties.j2 @@ -34,6 +34,6 @@ server.scheme=http server.proxy-port=80 {% endif %} -{% if atl_bitbucket_properties is defined $} +{% if atl_bitbucket_properties is defined %} {{ atl_bitbucket_properties }} {% endif %} From c59d3525abcdba364530dbba8ab46c3cb81030d0 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 19 Jan 2021 10:47:36 +1100 Subject: [PATCH 4/8] DCD-1190: Expect a space-delimited list of properties from the quickstart. --- roles/bitbucket_config/defaults/main.yaml | 3 ++- roles/bitbucket_config/molecule/default/playbook.yml | 2 ++ .../bitbucket_config/molecule/default/tests/test_default.py | 5 +++++ roles/bitbucket_config/templates/bitbucket.properties.j2 | 6 +++--- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/roles/bitbucket_config/defaults/main.yaml b/roles/bitbucket_config/defaults/main.yaml index 9eccfb1..1ae8340 100644 --- a/roles/bitbucket_config/defaults/main.yaml +++ b/roles/bitbucket_config/defaults/main.yaml @@ -1,4 +1,5 @@ --- atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" -atl_bitbucket_properties: "{{ lookup('env', 'ATL_BITBUCKET_PROPERTIES') }}" +atl_bitbucket_properties_raw: "{{ lookup('env', 'ATL_BITBUCKET_PROPERTIES') }}" +atl_bitbucket_properties: "{{ atl_bitbucket_properties_raw.split(' ') | reject('equalto', '') | list }}" diff --git a/roles/bitbucket_config/molecule/default/playbook.yml b/roles/bitbucket_config/molecule/default/playbook.yml index f9c424b..8a37408 100644 --- a/roles/bitbucket_config/molecule/default/playbook.yml +++ b/roles/bitbucket_config/molecule/default/playbook.yml @@ -12,6 +12,8 @@ atl_jdbc_user: 'bb_db_user' atl_jdbc_password: 'molecule_password' + atl_bitbucket_properties_raw: "key1=va1 key2=val2 key3=val3" + roles: - role: linux_common - role: product_common diff --git a/roles/bitbucket_config/molecule/default/tests/test_default.py b/roles/bitbucket_config/molecule/default/tests/test_default.py index 00593ec..e1d0905 100644 --- a/roles/bitbucket_config/molecule/default/tests/test_default.py +++ b/roles/bitbucket_config/molecule/default/tests/test_default.py @@ -14,3 +14,8 @@ def test_config_file(host): assert f.contains("jdbc.driver=org.postgresql.Driver") assert f.contains("jdbc.user=bb_db_user") assert f.contains("jdbc.password=molecule_password") + + assert f.contains("key1=val1") + assert f.contains("key2=val2") + assert f.contains("key3=val3") + diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2 index 5b8beca..3551c5b 100644 --- a/roles/bitbucket_config/templates/bitbucket.properties.j2 +++ b/roles/bitbucket_config/templates/bitbucket.properties.j2 @@ -34,6 +34,6 @@ server.scheme=http server.proxy-port=80 {% endif %} -{% if atl_bitbucket_properties is defined %} -{{ atl_bitbucket_properties }} -{% endif %} +{% for prop in atl_bitbucket_properties %} +{{ prop }} +{% endfor %} From 11f0e4ea36991272af1c9bc2fe3da4fdb53085a8 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 19 Jan 2021 11:17:21 +1100 Subject: [PATCH 5/8] DCD-1190: Remove spurious yaml file. --- roles/bitbucket_config/molecule/default/main.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 roles/bitbucket_config/molecule/default/main.yml diff --git a/roles/bitbucket_config/molecule/default/main.yml b/roles/bitbucket_config/molecule/default/main.yml deleted file mode 100644 index 77afc1c..0000000 --- a/roles/bitbucket_config/molecule/default/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" -atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}" From d30ecd208029d0560fd249b97461e3dd7702aeea Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 19 Jan 2021 11:18:20 +1100 Subject: [PATCH 6/8] DCD-1190: Disable line-length lint as it doesn't help clarity. --- roles/bitbucket_config/molecule/default/molecule.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/bitbucket_config/molecule/default/molecule.yml b/roles/bitbucket_config/molecule/default/molecule.yml index 7f082f6..8829d75 100644 --- a/roles/bitbucket_config/molecule/default/molecule.yml +++ b/roles/bitbucket_config/molecule/default/molecule.yml @@ -5,6 +5,9 @@ driver: name: docker lint: name: yamllint + options: + config-data: + line-length: disable platforms: - name: amazon_linux2 image: amazonlinux:2 From 5de5149612bb66d0e48d6d27454416099c533753 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 19 Jan 2021 12:51:27 +1100 Subject: [PATCH 7/8] DCD-1190: Typo in test. --- roles/bitbucket_config/molecule/default/playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_config/molecule/default/playbook.yml b/roles/bitbucket_config/molecule/default/playbook.yml index 8a37408..2a1addf 100644 --- a/roles/bitbucket_config/molecule/default/playbook.yml +++ b/roles/bitbucket_config/molecule/default/playbook.yml @@ -12,7 +12,7 @@ atl_jdbc_user: 'bb_db_user' atl_jdbc_password: 'molecule_password' - atl_bitbucket_properties_raw: "key1=va1 key2=val2 key3=val3" + atl_bitbucket_properties_raw: "key1=val1 key2=val2 key3=val3" roles: - role: linux_common From 6b7c164d718b7004458a067b1f8130361f374db5 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 19 Jan 2021 14:30:00 +1100 Subject: [PATCH 8/8] DCD-1190: Narrow checks to ensure properties are on separate lines. --- .../molecule/default/tests/test_default.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/roles/bitbucket_config/molecule/default/tests/test_default.py b/roles/bitbucket_config/molecule/default/tests/test_default.py index e1d0905..770c3bb 100644 --- a/roles/bitbucket_config/molecule/default/tests/test_default.py +++ b/roles/bitbucket_config/molecule/default/tests/test_default.py @@ -15,7 +15,6 @@ def test_config_file(host): assert f.contains("jdbc.user=bb_db_user") assert f.contains("jdbc.password=molecule_password") - assert f.contains("key1=val1") - assert f.contains("key2=val2") - assert f.contains("key3=val3") - + assert f.contains("^key1=val1$") + assert f.contains("^key2=val2$") + assert f.contains("^key3=val3$")