CIV-0000 Rename Jenkinsfile_nightly to Jenkinsfile_skip_nightly (#86)

* Rename Jenkinsfile_nightly to Jenkinsfile_skip_nightly * Update suppressions.xml * Update values.aat.template.yaml * Update values.preview.template.yaml
hmcts · Dec 8, 2023 · 10d9991 · 10d9991
1 parent 92e1293
commit 10d9991
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 41 deletions.
diff --git a/Jenkinsfile_nightly → Jenkinsfile_skip_nightly b/Jenkinsfile_nightly → Jenkinsfile_skip_nightly
diff --git a/charts/civil-orchestrator-service/values.aat.template.yaml b/charts/civil-orchestrator-service/values.aat.template.yaml
@@ -40,27 +40,56 @@ civil-service:
       civil:
         resourceGroup: civil
         secrets:
-          - civil-idam-client-secret
-          - microservicekey-civil-service
-          - system-update-user-username
-          - system-update-user-password
-          - cross-access-user-username
-          - cross-access-user-password
-          - prd-admin-user-username
-          - prd-admin-user-password
-          - docmosis-api-key
-          - gov-notify-api-key
-          - sendgrid-api-key
-          - robotics-notification-sender
-          - robotics-notification-recipient
+          - name: civil-idam-client-secret
+            alias: idam.client.secret
+          - name: microservicekey-civil-service
+            alias: idam.s2s-auth.totp_secret
+          - name: system-update-user-username
+            alias: CIVIL_SYSTEM_UPDATE_USERNAME
+          - name: system-update-user-password
+            alias: CIVIL_SYSTEM_UPDATE_PASSWORD
+          - name: cross-access-user-username
+            alias: CIVIL_CROSS_ACCESS_USERNAME
+          - name: cross-access-user-password
+            alias: CIVIL_CROSS_ACCESS_PASSWORD
+          - name: prd-admin-user-username
+            alias: CIVIL_PRD_ADMIN_USERNAME
+          - name: prd-admin-user-password
+            alias: CIVIL_PRD_ADMIN_PASSWORD
+          - name: appinsights-connection-string
+            alias: appinsights-connection-string
+          - name: AppInsightsInstrumentationKey
+            alias: azure.application-insights.instrumentation-key
+          - name: docmosis-api-key
+            alias: docmosis.tornado.key
+          - name: cmc-db-password-v11
+            alias: CMC_DB_PASSWORD
+          - name: gov-notify-api-key
+            alias: GOV_NOTIFY_API_KEY
+          - name: sendgrid-api-key
+            alias: SENDGRID_API_KEY
+          - name: robotics-notification-sender
+            alias: robotics.notification.sender
+          - name: robotics-notification-recipient
+            alias: robotics.notification.recipient
           - name: launch-darkly-sdk-key-non-prod
-            alias: launch-darkly-sdk-key
-          - ordnance-survey-api-key
-          - robotics-notification-recipient-spec
-          - robotics-notification-multipartyrecipient
-          - default-password
-          - judge-default-password
-          - iac-default-password
+            alias: LAUNCH_DARKLY_SDK_KEY
+          - name: robotics-notification-multipartyrecipient
+            alias: robotics.notification.multipartyrecipient
+          - name: robotics-notification-recipient-spec
+            alias: robotics.notification.specRecipient
+          - name: robotics-notification-recipient-lipj
+            alias: robotics.notification.lipJRecipient
+          - name: ordnance-survey-api-key
+            alias: OS_POSTCODE_LOOKUP_API_KEY
+          - name: notification-caseworker-spec-receiver
+            alias: notification.caseworker.spec.receiver
+          - name: mediation-notification-sender
+            alias: mediation.emails.sender
+          - name: mediation-notification-recipient
+            alias: mediation.emails.recipient
+          - name: hmc-servicebus-shared-access-key-tf
+            alias: HMC_HEARINGS_TOPIC_ACCESS_KEY
     environment:
       IDAM_CLIENT_ID: civil-service
       IDAM_CLIENT_REDIRECT_URI: https://civil-orchestrator-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal/oauth2/callback

diff --git a/charts/civil-orchestrator-service/values.preview.template.yaml b/charts/civil-orchestrator-service/values.preview.template.yaml
@@ -39,28 +39,56 @@ civil-service:
       civil:
         resourceGroup: civil
         secrets:
-          - civil-idam-client-secret
-          - microservicekey-civil-service
-          - system-update-user-username
-          - system-update-user-password
-          - cross-access-user-username
-          - cross-access-user-password
-          - prd-admin-user-username
-          - prd-admin-user-password
-          #- AppInsightsInstrumentationKey needs to be replaced with GA specific key
-          - docmosis-api-key
-          - gov-notify-api-key
-          - sendgrid-api-key
-          - robotics-notification-sender
-          - robotics-notification-recipient
+          - name: civil-idam-client-secret
+            alias: idam.client.secret
+          - name: microservicekey-civil-service
+            alias: idam.s2s-auth.totp_secret
+          - name: system-update-user-username
+            alias: CIVIL_SYSTEM_UPDATE_USERNAME
+          - name: system-update-user-password
+            alias: CIVIL_SYSTEM_UPDATE_PASSWORD
+          - name: cross-access-user-username
+            alias: CIVIL_CROSS_ACCESS_USERNAME
+          - name: cross-access-user-password
+            alias: CIVIL_CROSS_ACCESS_PASSWORD
+          - name: prd-admin-user-username
+            alias: CIVIL_PRD_ADMIN_USERNAME
+          - name: prd-admin-user-password
+            alias: CIVIL_PRD_ADMIN_PASSWORD
+          - name: appinsights-connection-string
+            alias: appinsights-connection-string
+          - name: AppInsightsInstrumentationKey
+            alias: azure.application-insights.instrumentation-key
+          - name: docmosis-api-key
+            alias: docmosis.tornado.key
+          - name: cmc-db-password-v11
+            alias: CMC_DB_PASSWORD
+          - name: gov-notify-api-key
+            alias: GOV_NOTIFY_API_KEY
+          - name: sendgrid-api-key
+            alias: SENDGRID_API_KEY
+          - name: robotics-notification-sender
+            alias: robotics.notification.sender
+          - name: robotics-notification-recipient
+            alias: robotics.notification.recipient
           - name: launch-darkly-sdk-key-non-prod
-            alias: launch-darkly-sdk-key
-          - ordnance-survey-api-key
-          - robotics-notification-recipient-spec
-          - robotics-notification-multipartyrecipient
-          - default-password
-          - judge-default-password
-          - iac-default-password
+            alias: LAUNCH_DARKLY_SDK_KEY
+          - name: robotics-notification-multipartyrecipient
+            alias: robotics.notification.multipartyrecipient
+          - name: robotics-notification-recipient-spec
+            alias: robotics.notification.specRecipient
+          - name: robotics-notification-recipient-lipj
+            alias: robotics.notification.lipJRecipient
+          - name: ordnance-survey-api-key
+            alias: OS_POSTCODE_LOOKUP_API_KEY
+          - name: notification-caseworker-spec-receiver
+            alias: notification.caseworker.spec.receiver
+          - name: mediation-notification-sender
+            alias: mediation.emails.sender
+          - name: mediation-notification-recipient
+            alias: mediation.emails.recipient
+          - name: hmc-servicebus-shared-access-key-tf
+            alias: HMC_HEARINGS_TOPIC_ACCESS_KEY
     environment:
       IDAM_CLIENT_ID: civil-service
       IDAM_CLIENT_REDIRECT_URI: https://civil-ccd-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal/oauth2/callback

diff --git a/config/owasp/suppressions.xml b/config/owasp/suppressions.xml
@@ -20,5 +20,12 @@
     <cve>CVE-2023-41080</cve>
     <cve>CVE-2023-5072</cve>
   </suppress>
+  <suppress until="2024-01-14">
+    <cve>CVE-2023-33202</cve>
+    <cve>CVE-2023-34053</cve>
+    <cve>CVE-2023-34055</cve>
+    <cve>CVE-2023-46589</cve>
+    <cve>CVE-2023-6378</cve>
+  </suppress>
   <!--End of temporary suppression section -->
 </suppressions>