From 16bc1dff101761ac8739fb70710c6c155d83a0e5 Mon Sep 17 00:00:00 2001 From: William Zujkowski Date: Fri, 11 Jul 2025 16:27:29 -0400 Subject: [PATCH 1/3] var fixes --- ci/pipeline.yml | 11 ++++++++--- ci/tasks/zap-scan.yml | 6 +++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index ea90ad6..5ea3a37 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -17,12 +17,17 @@ jobs: - get: zap-runner trigger: true - passed: [set-self] + passed: + - set-self - across: - var: context - values: ["internal", "external", "pages", "unauthenticated"] - limit: all + values: + - "internal" + - "external" + - "pages" + - "unauthenticated" + max_in_flight: all fail_fast: false do: - task: zap-scan diff --git a/ci/tasks/zap-scan.yml b/ci/tasks/zap-scan.yml index e93d4f1..d066cda 100644 --- a/ci/tasks/zap-scan.yml +++ b/ci/tasks/zap-scan.yml @@ -20,8 +20,6 @@ outputs: params: TARGET_CONTEXT: # one of internal, external, pages, unauthenticated CREDHB_CRED: # JSON with all context credentials - repo_name: - runner_tag: run: path: bash @@ -34,9 +32,10 @@ run: CREDS_JSON="$CREDHB_CRED" + # Filter URLs for this context mapfile -t URLS < <( tail -n +2 ci/zap-config/urls.csv | \ - awk -F',' -v ctx="$TARGET_CONTEXT" '$1==ctx {print $2}' + awk -F',' -v ctx="$TARGET_CONTEXT" '$1==ctx { print $2 }' ) if [ ${#URLS[@]} -eq 0 ]; then @@ -44,6 +43,7 @@ run: exit 0 fi + # Extract credentials for this context CLIENT_ID=$(jq -r --arg ctx "$TARGET_CONTEXT" '.[$ctx].client_id' <<<"$CREDS_JSON") CLIENT_SECRET=$(jq -r --arg ctx "$TARGET_CONTEXT" '.[$ctx].client_secret' <<<"$CREDS_JSON") TOKEN_URI=$(jq -r --arg ctx "$TARGET_CONTEXT" '.[$ctx].token_uri' <<<"$CREDS_JSON") From 8e01b0d5c2655ee744c9630c22125a65c32c3b24 Mon Sep 17 00:00:00 2001 From: William Zujkowski Date: Fri, 11 Jul 2025 16:30:50 -0400 Subject: [PATCH 2/3] var fixes --- ci/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 5ea3a37..1cf5b6a 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -27,8 +27,8 @@ jobs: - "external" - "pages" - "unauthenticated" - max_in_flight: all - fail_fast: false + max_in_flight: all + fail_fast: false do: - task: zap-scan file: zap-runner/ci/tasks/zap-scan.yml From 45dafc79b5954c35209d7a32f6629e53e85cb9d5 Mon Sep 17 00:00:00 2001 From: William Zujkowski Date: Fri, 11 Jul 2025 16:32:38 -0400 Subject: [PATCH 3/3] var fixes --- ci/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 1cf5b6a..8dcef5e 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -28,7 +28,7 @@ jobs: - "pages" - "unauthenticated" max_in_flight: all - fail_fast: false + fail_fast: false do: - task: zap-scan file: zap-runner/ci/tasks/zap-scan.yml