Skip to content

feat: update Datadog API key handling to support multiple secrets #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kb-typeform merged 1 commit into from
Feb 6, 2026
Merged

feat: update Datadog API key handling to support multiple secrets #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/frontend-deploy-workflow-v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ jobs:
PUBLIC_CDN_URL: ${{ inputs.cdn-url }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
JARVIS_DATADOG_LOGS_ENABLED: ${{ inputs.jarvis-datadog-enabled }}
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }}
JARVIS_DATADOG_SITE: datadoghq.com
JARVIS_DATADOG_SERVICE: ${{ inputs.jarvis-datadog-service }}
JARVIS_DATADOG_ENV: ${{ inputs.jarvis-datadog-env }}
Expand Down Expand Up @@ -636,7 +636,7 @@ jobs:
PUBLIC_CDN_URL: ${{ inputs.cdn-url }}
# Jarvis Datadog logging
JARVIS_DATADOG_LOGS_ENABLED: ${{ inputs.jarvis-datadog-enabled }}
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }}
JARVIS_DATADOG_SITE: datadoghq.com
JARVIS_DATADOG_SERVICE: ${{ inputs.jarvis-datadog-service }}
JARVIS_DATADOG_ENV: ${{ inputs.jarvis-datadog-env }}
Expand All @@ -655,7 +655,7 @@ jobs:
--tags "workflow_version:${{ env.WORKFLOW_VERSION }}" \
--tags "workflow_file:${{ env.WORKFLOW_FILE }}"
env:
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }}
DATADOG_SITE: datadoghq.com

- name: Print deployment info
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/frontend-pr-workflow-v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,8 @@ on:
required: false
DATADOG_API_KEY:
required: false
DATADOG_API_KEY_FRONTEND_METRICS:
required: false
JENKINS_OKTA_USERNAME:
required: false
JENKINS_USER_TOKEN:
Expand Down Expand Up @@ -297,7 +299,7 @@ jobs:
PUBLIC_CDN_URL: ${{ inputs.cdn-url }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
JARVIS_DATADOG_LOGS_ENABLED: ${{ inputs.jarvis-datadog-enabled }}
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }}
JARVIS_DATADOG_SITE: datadoghq.com
JARVIS_DATADOG_SERVICE: ${{ inputs.jarvis-datadog-service }}
JARVIS_DATADOG_ENV: ${{ inputs.jarvis-datadog-env }}
Expand Down Expand Up @@ -466,7 +468,7 @@ jobs:
AWS_CLOUDFRONT_DIST: ${{ inputs.cloudfront-dist }}
PUBLIC_CDN_URL: ${{ inputs.cdn-url }}
JARVIS_DATADOG_LOGS_ENABLED: ${{ inputs.jarvis-datadog-enabled }}
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
JARVIS_DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }}
JARVIS_DATADOG_SITE: datadoghq.com
JARVIS_DATADOG_SERVICE: ${{ inputs.jarvis-datadog-service }}
JARVIS_DATADOG_ENV: ${{ inputs.jarvis-datadog-env }}
Expand All @@ -477,7 +479,7 @@ jobs:
--tags "workflow_version:${{ env.WORKFLOW_VERSION }}" \
--tags "workflow_file:${{ env.WORKFLOW_FILE }}"
env:
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY || secrets.DATADOG_API_KEY_FRONTEND_METRICS }}
DATADOG_SITE: datadoghq.com

- name: Print GitHub SHA
Expand Down Expand Up @@ -647,4 +649,4 @@ jobs:
path: |
cypress/screenshots/
cypress/videos/
retention-days: 7
retention-days: 7