Skip to content

Commit 93bd492

Browse files
authored
feat: update Datadog API key handling to support multiple secrets (#182)
Updated v2 workflows to fall back to `DATADOG_API_KEY_FRONTEND_METRICS` whenever `secrets.DATADOG_API_KEY` is null/undefined/empty, and added the missing secret declaration in the PR workflow.
1 parent b695b5e commit 93bd492

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.github/workflows/frontend-deploy-workflow-v2.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ jobs:
303303
PUBLIC_CDN_URL: ${{ inputs.cdn-url }}
304304
GH_TOKEN: ${{ secrets.GH_TOKEN }}
305305
JARVIS_DATADOG_LOGS_ENABLED: ${{ inputs.jarvis-datadog-enabled }}
306-
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
306+
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }}
307307
JARVIS_DATADOG_SITE: datadoghq.com
308308
JARVIS_DATADOG_SERVICE: ${{ inputs.jarvis-datadog-service }}
309309
JARVIS_DATADOG_ENV: ${{ inputs.jarvis-datadog-env }}
@@ -636,7 +636,7 @@ jobs:
636636
PUBLIC_CDN_URL: ${{ inputs.cdn-url }}
637637
# Jarvis Datadog logging
638638
JARVIS_DATADOG_LOGS_ENABLED: ${{ inputs.jarvis-datadog-enabled }}
639-
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
639+
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }}
640640
JARVIS_DATADOG_SITE: datadoghq.com
641641
JARVIS_DATADOG_SERVICE: ${{ inputs.jarvis-datadog-service }}
642642
JARVIS_DATADOG_ENV: ${{ inputs.jarvis-datadog-env }}
@@ -655,7 +655,7 @@ jobs:
655655
--tags "workflow_version:${{ env.WORKFLOW_VERSION }}" \
656656
--tags "workflow_file:${{ env.WORKFLOW_FILE }}"
657657
env:
658-
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
658+
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }}
659659
DATADOG_SITE: datadoghq.com
660660

661661
- name: Print deployment info

.github/workflows/frontend-pr-workflow-v2.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@ on:
235235
required: false
236236
DATADOG_API_KEY:
237237
required: false
238+
DATADOG_API_KEY_FRONTEND_METRICS:
239+
required: false
238240
JENKINS_OKTA_USERNAME:
239241
required: false
240242
JENKINS_USER_TOKEN:
@@ -297,7 +299,7 @@ jobs:
297299
PUBLIC_CDN_URL: ${{ inputs.cdn-url }}
298300
GH_TOKEN: ${{ secrets.GH_TOKEN }}
299301
JARVIS_DATADOG_LOGS_ENABLED: ${{ inputs.jarvis-datadog-enabled }}
300-
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
302+
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }}
301303
JARVIS_DATADOG_SITE: datadoghq.com
302304
JARVIS_DATADOG_SERVICE: ${{ inputs.jarvis-datadog-service }}
303305
JARVIS_DATADOG_ENV: ${{ inputs.jarvis-datadog-env }}
@@ -466,7 +468,7 @@ jobs:
466468
AWS_CLOUDFRONT_DIST: ${{ inputs.cloudfront-dist }}
467469
PUBLIC_CDN_URL: ${{ inputs.cdn-url }}
468470
JARVIS_DATADOG_LOGS_ENABLED: ${{ inputs.jarvis-datadog-enabled }}
469-
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
471+
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }}
470472
JARVIS_DATADOG_SITE: datadoghq.com
471473
JARVIS_DATADOG_SERVICE: ${{ inputs.jarvis-datadog-service }}
472474
JARVIS_DATADOG_ENV: ${{ inputs.jarvis-datadog-env }}
@@ -477,7 +479,7 @@ jobs:
477479
--tags "workflow_version:${{ env.WORKFLOW_VERSION }}" \
478480
--tags "workflow_file:${{ env.WORKFLOW_FILE }}"
479481
env:
480-
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
482+
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }}
481483
DATADOG_SITE: datadoghq.com
482484

483485
- name: Print GitHub SHA
@@ -647,4 +649,4 @@ jobs:
647649
path: |
648650
cypress/screenshots/
649651
cypress/videos/
650-
retention-days: 7
652+
retention-days: 7

0 commit comments

Comments
 (0)