Merge branch 'main' into DTOSS-7884-Add-Mapping-Utilities-Tests

Author: Joseph2910

.github/workflows/cicd-1-pull-request.yaml

@@ -103,7 +103,7 @@ jobs:
     name: "Image build stage"
     needs: [metadata, commit-stage, test-stage]
     uses: NHSDigital/dtos-devops-templates/.github/workflows/stage-3-build-images.yaml@main
-    if: needs.metadata.outputs.does_pull_request_exist == 'true' || (github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened'))
+    if: needs.metadata.outputs.does_pull_request_exist == 'true' || github.ref == 'refs/heads/main' || (github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened'))
     with:
       docker_compose_file: application/CohortManager/compose.core.yaml,application/CohortManager/compose.cohort-distribution.yaml
       excluded_containers_csv_list: azurite,azurite-setup,sql-edge,db-setup

.github/workflows/cicd-2-publish.yaml

@@ -51,15 +51,15 @@ jobs:
           export VERSION="${{ steps.variables.outputs.version }}"
           make list-variables
 
-  publish:
-    name: "Build and publish image stage"
-    # runs-on: ubuntu-latest
-    needs: [metadata]
-    uses: ./.github/workflows/stage-3-build-images.yaml
-    if: github.event.pull_request.merged == true
-    with:
-      environment_tag: "${{ needs.metadata.outputs.environment_tag }}"
-    secrets: inherit
+  # publish:
+  #   name: "Build and publish image stage"
+  #   # runs-on: ubuntu-latest
+  #   needs: [metadata]
+  #   uses: ./.github/workflows/stage-3-build-images.yaml
+  #   if: github.event.pull_request.merged == true
+  #   with:
+  #     environment_tag: "${{ needs.metadata.outputs.environment_tag }}"
+  #   secrets: inherit
     # timeout-minutes: 3
     # steps:
     #   - name: "Checkout code"

.github/workflows/stage-3-build-images.yaml

@@ -84,3 +84,4 @@ application/CohortManager/.vscode/
 # Ignore generated feature bindings
 *.feature.cs
 tests/smoke-tests/dtos-cohort-manager-smoke-tests/Config/appsettings-local.json
+*.crt

.gitignore

@@ -24,6 +24,7 @@ services:
       - ASPNETCORE_URLS=http://*:7078
       - DtOsDatabaseConnectionString=Server=localhost,1433;Database=${DB_NAME};User Id=SA;Password=${PASSWORD};TrustServerCertificate=True
       - ExceptionFunctionURL=http://localhost:7070/api/CreateException
+      - AcceptableLatencyThresholdMs=500
 
   retrieve-cohort-request-audit:
     container_name: retrieve-cohort-request-audit
@@ -49,6 +50,7 @@ services:
       - BsSelectGpPracticeUrl=http://localhost:7998/api/BsSelectGpPracticeDataService/
       - CohortDistributionDataServiceUrl=http://localhost:7992/api/CohortDistributionDataService/
       - DtOsDatabaseConnectionString=Server=localhost,1433;Database=${DB_NAME};User Id=SA;Password=${PASSWORD};TrustServerCertificate=True
+      - AcceptableLatencyThresholdMs=500
 
   allocate-service-provider:
     container_name: allocate-service-provider
@@ -80,6 +82,7 @@ services:
       - CohortQueueNamePoison=cohort-distribution-queue-poison
       - IgnoreParticipantExceptions=false
       - IsExtractedToBSSelect=true
+      - AcceptableLatencyThresholdMs=500
 
   retrieve-participant-data:
     container_name: retrieve-participant-data
@@ -92,6 +95,7 @@ services:
       - ExceptionFunctionURL=http://localhost:7070/api/CreateException
       - ParticipantManagementUrl=http://localhost:7994/api/ParticipantManagementDataService
       - DemographicDataFunctionURL=http://localhost:7076/api/DemographicDataFunction
+      - AcceptableLatencyThresholdMs=500
 
   validate-cohort-distribution-record:
     container_name: validate-cohort-distribution-record
@@ -105,6 +109,7 @@ services:
       - ExceptionFunctionURL=http://localhost:7070/api/CreateException
       - DtOsDatabaseConnectionString=Server=localhost,1433;Database=${DB_NAME};User Id=SA;Password=${PASSWORD};TrustServerCertificate=True
       - CohortDistributionDataServiceURL=http://localhost:7992/api/CohortDistributionDataService/
+      - AcceptableLatencyThresholdMs=500
 
   remove-validation-exception-data:
     container_name: remove-validation-exception-data
@@ -129,4 +134,4 @@ services:
     environment:
       - ASPNETCORE_URLS=http://*:7992
       - DtOsDatabaseConnectionString=Server=localhost,1433;Database=${DB_NAME};User Id=SA;Password=${PASSWORD};TrustServerCertificate=True
-
+      - AcceptableLatencyThresholdMs=500