diff options
| author | Colin Wilk <colin@wilk.cx> | 2026-06-28 21:59:10 +0200 |
|---|---|---|
| committer | Colin Wilk <colin@wilk.cx> | 2026-06-28 22:26:36 +0200 |
| commit | 785e6c88e4c0a3ccc44fd357b4f693c5aadd432c (patch) | |
| tree | b64ec2c57634edcb8a90b0a6a469fcbc8180e2b9 /molecule/default | |
| parent | 9df891b2bc48a7565103bab3f5bdc64542aec5f8 (diff) | |
| download | ansible-role-borgbackup-785e6c88e4c0a3ccc44fd357b4f693c5aadd432c.tar.gz ansible-role-borgbackup-785e6c88e4c0a3ccc44fd357b4f693c5aadd432c.zip | |
Add option to disable decryption key export
Diffstat (limited to 'molecule/default')
| -rw-r--r-- | molecule/default/converge.yml | 2 | ||||
| -rw-r--r-- | molecule/default/tests/test_decryption_keys.py | 18 |
2 files changed, 15 insertions, 5 deletions
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index be65609..d5d118d 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -69,7 +69,7 @@ vars: borg_server_host: borg-server borg_server_user_home: /opt/borg - borg_decryption_keys_yaml_path: "{{ playbook_dir }}/decryption_keys.yml" + borg_decryption_keys_yaml_path: "" borg_ssh_key_type: ed25519 borg_backup_service_successful_exit_status: - 1 diff --git a/molecule/default/tests/test_decryption_keys.py b/molecule/default/tests/test_decryption_keys.py index c772477..bd5ff6a 100644 --- a/molecule/default/tests/test_decryption_keys.py +++ b/molecule/default/tests/test_decryption_keys.py @@ -46,9 +46,6 @@ def test_decryption_keys_structure_single_repo(): assert 'borg-client_borg-client:' in content, ( "Single repo host should have key named 'hostname_repo_name'" ) - assert 'borg-client-2_borg-client-2:' in content, ( - "Second single repo host should have key named 'hostname_repo_name'" - ) def test_decryption_keys_structure_multi_repo(): @@ -113,10 +110,23 @@ def test_decryption_keys_all_hosts_present(): expected_keys = [ 'borg-client_borg-client:', - 'borg-client-2_borg-client-2:', 'borg-client-multi_configs:', 'borg-client-multi_home-data:', ] for key in expected_keys: assert key in content, f"Expected key {key} not found in decryption_keys.yml" + + +def test_no_keys_for_disabled_export(): + """Test that no decryption keys are exported when disabled""" + keys_path = _get_keys_path() + if not os.path.exists(keys_path): + pytest.skip('decryption_keys.yml not yet generated') + + with open(keys_path, 'r') as f: + content = f.read() + + assert 'borg-client-2_borg-client-2:' not in content, ( + 'Keys should not be exported for borg-client-2 (export disabled)' + ) |