Merge branch 'main' into feature/eja-eli-759-adding-repo-check-for-regression-tests

Author: eddalmond1

.github/workflows/error_handling_utils_tests.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v6.0.2
 
       - name: Set up Python
         uses: actions/setup-python@v6

.github/workflows/my-vaccs-int-tests.yml

@@ -43,7 +43,7 @@ jobs:
           echo "Workflow triggered by allowed repository: $CALLER_REPO"
 
       - name: Checkout main
-        uses: actions/checkout@v6
+        uses: actions/checkout@v6.0.2
         with:
           repository: NHSDigital/eligibility-signposting-api-regression-tests
           ref: main

.github/workflows/performance_tests.yml

@@ -52,7 +52,7 @@ jobs:
           echo "spawn_rate: ${spawn_rate}"
 
       - name: Checkout
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
 
       # using git commit sha for version of action to ensure we have stable version
       - name: Install asdf

.github/workflows/quality-checks.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v6.0.2
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0
@@ -69,7 +69,7 @@ jobs:
             .git
 
       - name: SonarQube
-        uses: actions/checkout@v6
+        uses: actions/checkout@v6.0.2
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

.github/workflows/regression_tests.yml

@@ -67,6 +67,32 @@ jobs:
     runs-on: ubuntu-22.04
     environment: ${{ inputs.environment }}
     steps:
+      - name: Verify caller repository
+        run: |
+          ALLOWED_REPOS=("NHSDigital/eligibility-signposting-api")
+          CALLER_REPO="${{ github.repository }}"
+
+          # If triggered by workflow_call, the calling repo is in github.repository
+          # If triggered manually, it's this repo itself which is allowed
+          if [[ "${{ github.event_name }}" == "workflow_call" ]]; then
+            CALLER_REPO="${{ github.event.workflow_run.repository.full_name || github.repository }}"
+          fi
+
+          ALLOWED=false
+          for repo in "${ALLOWED_REPOS[@]}"; do
+            if [[ "$CALLER_REPO" == "$repo" ]]; then
+              ALLOWED=true
+              break
+            fi
+          done
+
+          if [[ "$ALLOWED" == "false" && "${{ github.event_name }}" == "workflow_call" ]]; then
+            echo "Error: Repository $CALLER_REPO is not allowed to trigger this workflow"
+            exit 1
+          fi
+
+          echo "Workflow triggered by allowed repository: $CALLER_REPO"
+
       - name: show_input_parameters
         env:
           tags: ${{ inputs.tags }}

.github/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
       spec_version: ${{steps.output_version_tag.outputs.SPEC_VERSION}}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v6.0.2
         with:
           ref: ${{ env.BRANCH_NAME }}
           fetch-depth: 0

Makefile

@@ -98,5 +98,8 @@ endif
 run-vita-preprod-tests:
 	poetry run pytest --env=preprod --log-cli-level=info tests/test_vita_integration_tests.py tests/test_upload_consumer_configs.py
 
+run-nbs-preprod-tests:
+	poetry run pytest --env=preprod --log-cli-level=info tests/test_nbs_integration_tests.py tests/test_upload_consumer_configs.py
+
 run-unit-tests: guard-env guard-log_level
 	poetry run pytest --env=${env} --log-cli-level=${log_level} tests/test_error_handling_utils.py -v

data/configs/consumerMappings/consumer_mapping_config.json

@@ -19,28 +19,32 @@
     ],
     "test-P.XWA-VFF": [
         {
-            "CampaignConfigID": "7fcb742b-45fa-4w0d-8f2f-9c2efb1f46d1",
+            "CampaignConfigID": "7fcb742b-43fa-4a0d-8f2f-9c2efb1f46d1",
             "Description": "RSV Ongoing for NBS"
         },
         {
             "CampaignConfigID": "b21cff69-a2c7-4e78-a514-ce067c09df0c",
             "Description": "FLU Ongoing for NBS"
         },
+        {
+            "CampaignConfigID": "3ecb346g-45ea-4g0d-8e2e-9g2feb1e46d0",
+            "Description": "COVID Ongoing for NBS"
+        },
         {
             "CampaignConfigID": "NBS_Campaign_Config_ID_RSV",
             "Description": "RSV Test Config for NBS"
         },
         {
             "CampaignConfigID": "NBS_Campaign_Config_ID_COVID",
-            "Description": "COVID Ongoing for NBS"
+            "Description": "COVID Test for NBS"
         },
         {
             "CampaignConfigID": "NBS_Campaign_Config_ID_COVID_ACTIVE",
             "Description": "COVID Ongoing for NBS"
         },
         {
             "CampaignConfigID": "NBS_Campaign_Config_ID_FLU",
-            "Description": "Flu for NBS Story Tests"
+            "Description": "Flu Test for NBS"
         },
         {
             "CampaignConfigID": "VITA_NBS_Campaign_Config_ID_COVID",

data/configs/consumerMappings/preprod/consumer_mapping_config.json

@@ -19,20 +19,24 @@
     ],
     "P.XWA-VFF": [
         {
-            "CampaignConfigID": "7fcb742b-45fa-4w0d-8f2f-9c2efb1f46d1",
+            "CampaignConfigID": "7fcb742b-43fa-4a0d-8f2f-9c2efb1f46d1",
             "Description": "RSV Ongoing for NBS"
         },
         {
             "CampaignConfigID": "b21cff69-a2c7-4e78-a514-ce067c09df0c",
             "Description": "FLU Ongoing for NBS"
         },
+        {
+            "CampaignConfigID": "3ecb346g-45ea-4g0d-8e2e-9g2feb1e46d0",
+            "Description": "COVID Ongoing for NBS"
+        },
         {
             "CampaignConfigID": "NBS_Campaign_Config_ID_RSV",
-            "Description": "RSV Ongoing for NBS"
+            "Description": "RSV Test for NBS"
         },
         {
             "CampaignConfigID": "NBS_Campaign_Config_ID_COVID",
-            "Description": "COVID Ongoing for NBS"
+            "Description": "COVID Test Config for NBS"
         },
         {
             "CampaignConfigID": "NBS_Campaign_Config_ID_COVID_ACTIVE",