From 4fd323885713b9f8c440d761bb32a127057ba54e Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sat, 13 Sep 2025 22:07:24 -0400 Subject: [PATCH] Tweaks for DAG-related items. --- .gitea/workflows/dag-config-check.yml | 2 +- playbooks/rinoa-render-dags.yml | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/dag-config-check.yml b/.gitea/workflows/dag-config-check.yml index aac785a..04d42f3 100644 --- a/.gitea/workflows/dag-config-check.yml +++ b/.gitea/workflows/dag-config-check.yml @@ -49,6 +49,6 @@ jobs: - name: Validate DAGs run: | for dag in $(find ${DAGS_PATH} -type f -name "*.yaml" -a ! -name "*example*"); do - echo "Validating ${dag}..." + echo "========Validating ${dag}========" dagu dry "${dag}" done diff --git a/playbooks/rinoa-render-dags.yml b/playbooks/rinoa-render-dags.yml index 1443b06..4391bce 100644 --- a/playbooks/rinoa-render-dags.yml +++ b/playbooks/rinoa-render-dags.yml @@ -26,14 +26,15 @@ ansible.builtin.set_fact: vault_keys: >- {{ - ( - dag_templates - | map('file', 'r') - | map('regex_findall', - "lookup\\('community.hashi_vault.vault_kv2_get',\\s*'[^']+',\\s*engine_mount_point='[^']+',\\s*url=[^,]+,\\s*token=[^\\)]+\\)\\['secret'\\]\\['([^']+)'\\]") - | list - ) | default([]) + dag_templates + | map('file', 'r') + | select('string') + | map('regex_findall', + "lookup\\('community.hashi_vault.vault_kv2_get',\\s*'[^']+',\\s*engine_mount_point='[^']+',\\s*url=[^,]+,\\s*token=[^\\)]+\\)\\['secret'\\]\\['([^']+)'\\]") + | sum(start=[]) }} + when: dag_templates | length > 0 + - name: Warn if any Vault keys might be missing loop: "{{ vault_keys }}"