[PRMP-939] Wrong version by PedroSoaresNHS · Pull Request #1071 · NHSDigital/national-document-repository

PedroSoaresNHS · 2026-02-10T15:31:29Z

Something went wrong with Git, so this is the new branch
#1102

MohammadIqbalAD-NHS · 2026-02-13T15:32:42Z

.github/workflows/base-lambdas-reusable-deploy-all.yml

+  deploy_s3_data_collection_lambda:
+    name: Deploy S3 data collection lambda
+    uses: ./.github/workflows/base-lambdas-reusable-deploy.yml
+    with:
+      environment: ${{ inputs.environment}}
+      python_version: ${{ inputs.python_version }}
+      build_branch: ${{ inputs.build_branch}}
+      sandbox: ${{ inputs.sandbox }}
+      lambda_handler_name: data_collection_handler
+      lambda_aws_name: ReportS3Content
+      lambda_layer_names: "core_lambda_layer,data_lambda_layer"
+    secrets:
+      AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}
+


Undo as lambda no longer required

MohammadIqbalAD-NHS · 2026-02-13T15:33:45Z

.github/workflows/full-deploy-to-pre-prod.yml

+  deploy_s3_data_collection:
+    name: Deploy S3 Data Collection
+    needs: [ "tag_and_release" ]
+    uses: ./.github/workflows/s3-base-data-collection.yml


Suggested change

uses: ./.github/workflows/s3-base-data-collection.yml

uses: ./.github/workflows/base-s3-data-collection.yml

MohammadIqbalAD-NHS · 2026-02-13T15:34:44Z

.github/workflows/full-deploy-to-prod.yml

+
+  deploy_s3_data_collection:
+    name: Deploy S3 Data Collection
+    uses: ./.github/workflows/s3_base-data-collection.yml


Suggested change

uses: ./.github/workflows/s3_base-data-collection.yml

uses: ./.github/workflows/base-s3-data-collection.yml

MohammadIqbalAD-NHS · 2026-02-13T15:36:01Z

.github/workflows/lambdas-dev-to-main-ci.yml

+  deploy_s3_data_collection:
+    name: Deploy S3 Data Collection
+    needs: [ "run_tests" ]
+    uses: ./.github/workflows/s3-base-data-collection.yml


Suggested change

uses: ./.github/workflows/s3-base-data-collection.yml

uses: ./.github/workflows/base-s3-data-collection.yml

MohammadIqbalAD-NHS · 2026-02-13T15:41:35Z

.github/workflows/base-s3-data-collection.yml

Rename to base-s3-data-collection.yml to match other workflow naming conventions

MohammadIqbalAD-NHS · 2026-02-13T15:47:52Z

.github/workflows/s3-data-collection-deploy-to-sandbox.yml

+jobs:
+  push_image:
+    name: Push Image
+    uses: ./.github/workflows/s3-base-data-collection.yml


Suggested change

uses: ./.github/workflows/s3-base-data-collection.yml

uses: ./.github/workflows/base-s3-data-collection.yml

MohammadIqbalAD-NHS · 2026-02-13T15:52:30Z

lambdas/ecs/s3_data_collection/main.py

+    logging.getLogger(__name__).info("Starting Report S3 content ECS task")
+
+    service = ReportS3ContentService()
+    service.process_s3_content()


We should stick with one name throughout all files, either ReportS3Content or S3DataCollection ?

Yes, but Ods are the name will change later on.
On a conversation with Kris he stated that the name right now is too narrow

MohammadIqbalAD-NHS · 2026-02-13T15:53:30Z

lambdas/handlers/report_s3_content_handler.py

Lambda no longer needed.

This reverts commit 36f6149.

This reverts commit 611d03c, reversing changes made to 6222c7c.

This reverts commit 7299031, reversing changes made to 6d066e7.

This reverts commit dcfb4d7, reversing changes made to 6b5098a.

This reverts commit 360e32b20e60a59e99ce33203d17bb155784b087.

This reverts commit 46edc53379190d46f4ef5041bde12709c29994b3.

…to PRMP-939""" This reverts commit 5fdd76c99b046daea5d902534d22d087422789b7.

sonarqubecloud · 2026-02-16T10:19:30Z

Quality Gate failed

Failed conditions
1 Security Hotspot
77.3% Coverage on New Code (required ≥ 80%)

See analysis details on SonarQube Cloud

…n of objects

…r is Latest column

# Conflicts: # app/src/helpers/utils/documentUpload.test.ts # app/src/helpers/utils/documentUpload.ts # lambdas/services/upload_document_reference_service.py # lambdas/tests/unit/utils/test_file_utils.py

github-actions · 2026-02-17T08:45:58Z

Code security issues found

View full details here.

PedroSoaresNHS added 3 commits February 10, 2026 11:40

[PRMP-939] checking what report s3 content lambda is created

2761e78

[PRMP-939] updated logic to upload the csv

d90e183

[PRMP-939] updated name

1974a3b

PedroSoaresNHS temporarily deployed to development February 10, 2026 15:31 — with GitHub Actions Inactive

PedroSoaresNHS temporarily deployed to development February 10, 2026 16:06 — with GitHub Actions Inactive

PedroSoaresNHS temporarily deployed to development February 10, 2026 16:07 — with GitHub Actions Inactive

MohammadIqbalAD-NHS reviewed Feb 13, 2026

View reviewed changes

PedroSoaresNHS added 15 commits February 13, 2026 16:04

[PRMP-939] adressed comments and removed handlers

c7ae3ce

[PRMP-939] fixed test

7062705

[PRMP-939] fix sonar

6222c7c

Merge remote-tracking branch 'origin/main' into PRMP-939

611d03c

[PRMP-939] deploy to sandbox

36f6149

Revert "[PRMP-939] deploy to sandbox"

c0c0967

This reverts commit 36f6149.

Revert "Merge remote-tracking branch 'origin/main' into PRMP-939"

95526b9

This reverts commit 611d03c, reversing changes made to 6222c7c.

Revert "Merge remote-tracking branch 'origin/main' into PRMP-939"

5687494

This reverts commit 7299031, reversing changes made to 6d066e7.

Revert "Merge remote-tracking branch 'origin/main' into PRMP-939"

a32dd3a

This reverts commit dcfb4d7, reversing changes made to 6b5098a.

Revert "Revert "[PRMP-939] deploy to sandbox""

c471789

This reverts commit 360e32b20e60a59e99ce33203d17bb155784b087.

Revert "Revert "Revert "[PRMP-939] deploy to sandbox"""

c2fe13a

This reverts commit 46edc53379190d46f4ef5041bde12709c29994b3.

Revert "Revert "Revert "Merge remote-tracking branch 'origin/main' in…

94fbd16

…to PRMP-939""" This reverts commit 5fdd76c99b046daea5d902534d22d087422789b7.

chore: advance revert sequence (empty patch)

c06d836

[PRMP-939] Restore repository state to match commit 886fca3

427eea7

[PRMP-939] for now listing all objects

4d987b1

PedroSoaresNHS added 5 commits February 16, 2026 11:53

[PRMP-939] Updated s3 content service to fetch only the latest versio…

b055eec

…n of objects

[PRMP-939] Updated report generator service to not show version Id, o…

39906f7

…r is Latest column

[PRMP-939] updated tests

46fadd8

[PRMP-939] remove unused test

dbf2462

Merge remote-tracking branch 'origin/main' into PRMP-939

669e326

# Conflicts: # app/src/helpers/utils/documentUpload.test.ts # app/src/helpers/utils/documentUpload.ts # lambdas/services/upload_document_reference_service.py # lambdas/tests/unit/utils/test_file_utils.py

	uses: ./.github/workflows/s3-base-data-collection.yml
	uses: ./.github/workflows/base-s3-data-collection.yml

	uses: ./.github/workflows/s3_base-data-collection.yml
	uses: ./.github/workflows/base-s3-data-collection.yml

Conversation

PedroSoaresNHS commented Feb 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Feb 16, 2026

Quality Gate failed

Uh oh!

github-actions bot commented Feb 17, 2026

Code security issues found

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

PedroSoaresNHS commented Feb 10, 2026 •

edited

Loading