Skip to content
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

Fmd 911 workflow changes #971

Merged
merged 2 commits into from
Oct 22, 2024
Merged

Fmd 911 workflow changes #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f272f7
report an issue workflow changes and test fix
mitchdawson1982 Oct 22, 2024
398cebb
report an issue workflow changes and test fix
mitchdawson1982 Oct 22, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/deploy-dev-from-branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ jobs:
catalogue_token: ${{ secrets.CATALOGUE_TOKEN }}
slack_alert_webhook: ${{ secrets.SLACK_ALERT_WEBHOOK }}
azure_client_secret: ${{ secrets.AZURE_CLIENT_SECRET }}
notify_api_key: ${{ secrets.NOTIFY_API_KEY }}
3 changes: 3 additions & 0 deletions .github/workflows/deploy-staged.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
catalogue_token: ${{ secrets.CATALOGUE_TOKEN }}
slack_alert_webhook: ${{ secrets.SLACK_ALERT_WEBHOOK }}
azure_client_secret: ${{ secrets.AZURE_CLIENT_SECRET }}
notify_api_key: ${{ secrets.NOTIFY_API_KEY }}

deploy-preprod:
uses: "./.github/workflows/reusable-push-and-deploy.yml"
Expand All @@ -45,6 +46,7 @@ jobs:
catalogue_token: ${{ secrets.CATALOGUE_TOKEN }}
slack_alert_webhook: ${{ secrets.SLACK_ALERT_WEBHOOK }}
azure_client_secret: ${{ secrets.AZURE_CLIENT_SECRET }}
notify_api_key: ${{ secrets.NOTIFY_API_KEY }}

notify-preprod-success:
needs: deploy-preprod
Expand Down Expand Up @@ -85,6 +87,7 @@ jobs:
catalogue_token: ${{ secrets.CATALOGUE_TOKEN }}
slack_alert_webhook: ${{ secrets.SLACK_ALERT_WEBHOOK }}
azure_client_secret: ${{ secrets.AZURE_CLIENT_SECRET }}
notify_api_key: ${{ secrets.NOTIFY_API_KEY }}

post-deploy:
name: "Post-deploy admin"
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/reusable-push-and-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ on:
azure_client_secret:
description: "azure client secret"
required: true
notify_api_key:
description: "api key for the gds notify service"
required: true

jobs:
push-and-deploy:
Expand Down Expand Up @@ -119,6 +122,12 @@ jobs:
AZURE_REDIRECT_URI: ${{ vars.AZURE_REDIRECT_URI }}
AZURE_AUTHORITY: ${{ vars.AZURE_AUTHORITY }}
EXTERNAL_DOMAIN_PREFIX: ${{ vars.EXTERNAL_DOMAIN_PREFIX }}
NOTIFY_ENABLED: ${{ vars.NOTIFY_ENABLED }}
NOTIFY_API_KEY: ${{ secrets.NOTIFY_API_KEY }}
NOTIFY_DATA_OWNER_TEMPLATE_ID: ${{ vars. NOTIFY_DATA_OWNER_TEMPLATE_ID }}
NOTIFY_SENDER_TEMPLATE_ID: ${{ vars.NOTIFY_SENDER_TEMPLATE_ID }}
NOTIFY_DATA_CATALOGUE_TEMPLATE_ID: ${{ vars.NOTIFY_DATA_CATALOGUE_TEMPLATE_ID }}
DATA_CATALOGUE_EMAIL: ${{ vars.DATA_CATALOGUE_EMAIL }}

run: |
cat deployments/templates/deployment.yml | envsubst > deployments/deployment.yml
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repos:
exclude: tf$|j2$

- repo: https://github.com/psf/black
rev: 24.8.0
rev: 24.10.0
hooks:
- id: black
name: black formatting
Expand Down
12 changes: 12 additions & 0 deletions deployments/templates/deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,18 @@ spec:
value: "${TRACES_SAMPLE_RATE}"
- name: PROFILES_SAMPLE_RATE
value: "${PROFILES_SAMPLE_RATE}"
- name: "${NOTIFY_ENABLED}"
value: NOTIFY_ENABLED
- name: "${NOTIFY_API_KEY}"
value: NOTIFY_API_KEY
- name: "${NOTIFY_DATA_OWNER_TEMPLATE_ID}"
value: NOTIFY_DATA_OWNER_TEMPLATE_ID
- name: "${NOTIFY_SENDER_TEMPLATE_ID}"
value: NOTIFY_SENDER_TEMPLATE_ID
- name: "${NOTIFY_DATA_CATALOGUE_TEMPLATE_ID}"
value: NOTIFY_DATA_CATALOGUE_TEMPLATE_ID
- name: "${DATA_CATALOGUE_EMAIL}"
value: DATA_CATALOGUE_EMAIL
- name: SECRET_KEY
valueFrom:
secretKeyRef:
Expand Down