Skip to content

Commit 1985d41

Browse files
author
Martin Jackson
committed
Fix display secrets info playbook
1 parent 19cf684 commit 1985d41

2 files changed

Lines changed: 21 additions & 13 deletions

File tree

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@ already completed (duplicate inject is skipped).
6363
bootstrap-tagged v2 entries. Does **not** read `secretLoader.disabled` or load into Vault / primary backend.
6464

6565
- **`playbooks/display_secrets_info.yml`**
66-
Loads and displays parsed secrets (using the backend from `values-global`). For v2 files with bootstrap-tagged entries,
67-
uses a merged bootstrap + primary parse for display.
66+
Loads and displays parsed secrets (using the backend from `values-global`). For v2 files with any bootstrap-tagged
67+
entries, output is split into **`early_bootstrap_inject`** (none backend, early K8s view; includes `bootstrap: true`
68+
and `bootstrap: only`) and **`primary_backend`** (configured backend; includes normal secrets and **`bootstrap: true`**
69+
again so dual-mode entries appear in both groups). Otherwise a single parse is shown as before.
6870

6971
Typical usage passes the pattern checkout as `pattern_dir` (for example `-e pattern_dir=/path/to/pattern`). If you omit
7072
it, the same resolution as `pattern_settings` applies: `PATTERN_DIR`, then `PWD`, then the `pwd` command.

playbooks/display_secrets_info.yml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,35 +43,41 @@
4343
)
4444
}}
4545
46-
- name: Parse secrets data (v2 with inline bootstrap — merged view)
46+
- name: Parse secrets data (v2 with bootstrap — two display groups)
4747
when: _vp_has_inline_bootstrap_secrets | bool
4848
block:
49-
- name: Parse bootstrap-only portion for display
49+
- name: Parse early-bootstrap inject portion for display (none backend)
5050
no_log: '{{ hide_sensitive_output }}'
5151
parse_secrets_info:
5252
values_secrets_plaintext: "{{ values_secrets_data }}"
5353
secrets_backing_store: none
5454
secrets_parse_filter: bootstrap_only
5555
register: _display_bootstrap_parse
5656

57-
- name: Parse primary portion for display
57+
- name: Parse primary-backend portion for display (configured backend)
5858
no_log: '{{ hide_sensitive_output }}'
5959
parse_secrets_info:
6060
values_secrets_plaintext: "{{ values_secrets_data }}"
6161
secrets_backing_store: "{{ secrets_backing_store }}"
6262
secrets_parse_filter: exclude_bootstrap
6363
register: _display_primary_parse
6464

65-
- name: Merge parsed structures for display
65+
- name: Build two-group secrets display (dual bootstrap entries appear in both)
6666
ansible.builtin.set_fact:
6767
secrets_results:
68-
failed: false
69-
changed: false
70-
parsed_secrets: "{{ _display_bootstrap_parse.parsed_secrets | combine(_display_primary_parse.parsed_secrets) }}"
71-
kubernetes_secret_objects: "{{ _display_bootstrap_parse.kubernetes_secret_objects + _display_primary_parse.kubernetes_secret_objects }}"
72-
vault_policies: "{{ _display_bootstrap_parse.vault_policies | combine(_display_primary_parse.vault_policies) }}"
73-
secret_store_namespace: "{{ _display_primary_parse.secret_store_namespace }}"
74-
unique_vault_prefixes: "{{ ((_display_bootstrap_parse.unique_vault_prefixes | default([])) + (_display_primary_parse.unique_vault_prefixes | default([]))) | unique | sort }}"
68+
early_bootstrap_inject:
69+
parsed_secrets: "{{ _display_bootstrap_parse.parsed_secrets }}"
70+
kubernetes_secret_objects: "{{ _display_bootstrap_parse.kubernetes_secret_objects }}"
71+
vault_policies: "{{ _display_bootstrap_parse.vault_policies | default({}) }}"
72+
unique_vault_prefixes: "{{ _display_bootstrap_parse.unique_vault_prefixes | default([]) }}"
73+
backing_store: none
74+
primary_backend:
75+
parsed_secrets: "{{ _display_primary_parse.parsed_secrets }}"
76+
kubernetes_secret_objects: "{{ _display_primary_parse.kubernetes_secret_objects }}"
77+
vault_policies: "{{ _display_primary_parse.vault_policies | default({}) }}"
78+
secret_store_namespace: "{{ _display_primary_parse.secret_store_namespace }}"
79+
unique_vault_prefixes: "{{ _display_primary_parse.unique_vault_prefixes | default([]) }}"
80+
secrets_backing_store: "{{ secrets_backing_store }}"
7581

7682
- name: Parse secrets data (single phase)
7783
when: not (_vp_has_inline_bootstrap_secrets | bool)

0 commit comments

Comments
 (0)