From beaf7fe30bae331812927e58401e66e886e8159e Mon Sep 17 00:00:00 2001 From: Ashley Gyngell Date: Thu, 6 Feb 2025 14:07:31 +0000 Subject: [PATCH 1/2] MAP-1878: remove product id from helm values --- helm_deploy/values-dev.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/helm_deploy/values-dev.yaml b/helm_deploy/values-dev.yaml index d88a7e5..0474871 100644 --- a/helm_deploy/values-dev.yaml +++ b/helm_deploy/values-dev.yaml @@ -11,7 +11,6 @@ generic-service: INGRESS_URL: "https://prison-roll-count-dev.hmpps.service.justice.gov.uk" ENVIRONMENT_NAME: DEV - PRODUCT_ID: "DPS118" HMPPS_AUTH_URL: "https://sign-in-dev.hmpps.service.justice.gov.uk/auth" HMPPS_COOKIE_DOMAIN: digital-dev.prison.service.justice.gov.uk HMPPS_COOKIE_NAME: hmpps-session-dev From 9caa716713054d9ac1276fbbf15a95cfaa1b2eda Mon Sep 17 00:00:00 2001 From: Ashley Gyngell Date: Thu, 6 Feb 2025 15:51:23 +0000 Subject: [PATCH 2/2] MAP-1878: github workflow values changed to send alerts to new channel --- .github/workflows/security_npm_dependency.yml | 2 +- .github/workflows/security_trivy.yml | 2 +- .github/workflows/security_veracode_pipeline_scan.yml | 2 +- .github/workflows/security_veracode_policy_scan.yml | 2 +- helm_deploy/values-dev.yaml | 8 +++----- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/security_npm_dependency.yml b/.github/workflows/security_npm_dependency.yml index f3338a5..dd6b360 100644 --- a/.github/workflows/security_npm_dependency.yml +++ b/.github/workflows/security_npm_dependency.yml @@ -8,5 +8,5 @@ jobs: name: Project security npm dependency check uses: ministryofjustice/hmpps-github-actions/.github/workflows/security_npm_dependency.yml@v2 # WORKFLOW_VERSION with: - channel_id: move-a-prisoner-alerts + channel_id: ${{ vars.SECURITY_ALERTS_SLACK_CHANNEL_ID || 'NO_SLACK' }} secrets: inherit diff --git a/.github/workflows/security_trivy.yml b/.github/workflows/security_trivy.yml index c6e5fbf..5fbcb0a 100644 --- a/.github/workflows/security_trivy.yml +++ b/.github/workflows/security_trivy.yml @@ -8,5 +8,5 @@ jobs: name: Project security trivy dependency check uses: ministryofjustice/hmpps-github-actions/.github/workflows/security_trivy.yml@v2 # WORKFLOW_VERSION with: - channel_id: move-a-prisoner-alerts + channel_id: ${{ vars.SECURITY_ALERTS_SLACK_CHANNEL_ID || 'NO_SLACK' }} secrets: inherit diff --git a/.github/workflows/security_veracode_pipeline_scan.yml b/.github/workflows/security_veracode_pipeline_scan.yml index 41b72aa..4e55c62 100644 --- a/.github/workflows/security_veracode_pipeline_scan.yml +++ b/.github/workflows/security_veracode_pipeline_scan.yml @@ -8,5 +8,5 @@ jobs: name: Project security veracode pipeline scan uses: ministryofjustice/hmpps-github-actions/.github/workflows/security_veracode_pipeline_scan.yml@v2 # WORKFLOW_VERSION with: - channel_id: move-a-prisoner-alerts + channel_id: ${{ vars.SECURITY_ALERTS_SLACK_CHANNEL_ID || 'NO_SLACK' }} secrets: inherit diff --git a/.github/workflows/security_veracode_policy_scan.yml b/.github/workflows/security_veracode_policy_scan.yml index c1003e1..5481ad1 100644 --- a/.github/workflows/security_veracode_policy_scan.yml +++ b/.github/workflows/security_veracode_policy_scan.yml @@ -8,5 +8,5 @@ jobs: name: Project security veracode policy scan uses: ministryofjustice/hmpps-github-actions/.github/workflows/security_veracode_policy_scan.yml@v2 # WORKFLOW_VERSION with: - channel_id: move-a-prisoner-alerts + channel_id: ${{ vars.SECURITY_ALERTS_SLACK_CHANNEL_ID || 'NO_SLACK' }} secrets: inherit diff --git a/helm_deploy/values-dev.yaml b/helm_deploy/values-dev.yaml index 0fb2b0c..bffa0ce 100644 --- a/helm_deploy/values-dev.yaml +++ b/helm_deploy/values-dev.yaml @@ -11,8 +11,6 @@ generic-service: INGRESS_URL: "https://prison-roll-count-dev.hmpps.service.justice.gov.uk" ENVIRONMENT_NAME: DEV HMPPS_AUTH_URL: "https://sign-in-dev.hmpps.service.justice.gov.uk/auth" - HMPPS_COOKIE_DOMAIN: digital-dev.prison.service.justice.gov.uk - HMPPS_COOKIE_NAME: hmpps-session-dev # APIs LOCATIONS_INSIDE_PRISON_API_URL: "https://locations-inside-prison-api-dev.hmpps.service.justice.gov.uk" @@ -21,9 +19,9 @@ generic-service: TOKEN_VERIFICATION_API_URL: "https://token-verification-api-dev.prison.service.justice.gov.uk" # Service URLs - CHANGE_SOMEONES_CELL_URL: https://change-someones-cell-dev.prison.service.justice.gov.uk - DIGITAL_PRISONS_URL: https://digital-dev.prison.service.justice.gov.uk - PRISONER_PROFILE_URL: https://prisoner-dev.digital.prison.service.justice.gov.uk + CHANGE_SOMEONES_CELL_URL: "https://change-someones-cell-dev.prison.service.justice.gov.uk" + DIGITAL_PRISONS_URL: "https://digital-dev.prison.service.justice.gov.uk" + PRISONER_PROFILE_URL: "https://prisoner-dev.digital.prison.service.justice.gov.uk" AUDIT_ENABLED: "false"