Feature/ved 000 merge latest from master (#1216)

* VED-1059 Made adjustment to batch queueing logic (#1189)

* Bump @redocly/cli from 2.15.1 to 2.16.0 in the npm-minor-patch group (#1188)

Bumps the npm-minor-patch group with 1 update: [@redocly/cli](https://github.com/Redocly/redocly-cli).


Updates `@redocly/cli` from 2.15.1 to 2.16.0
- [Release notes](https://github.com/Redocly/redocly-cli/releases)
- [Commits](https://github.com/Redocly/redocly-cli/compare/@redocly/cli@2.15.1...@redocly/cli@2.16.0)

---
updated-dependencies:
- dependency-name: "@redocly/cli"
  dependency-version: 2.16.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-minor-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel Yip <daniel.yip4@nhs.net>

* OAS documentation for name field characters (#1190)

* VED-901: Update extended attribute file destination. (#1141)

* VED-901: Update extended attributes destination prefix.

* VED-901: Update tests.

* VED-901: Upload EA files directly to the S3 submission upload bucket.

* VED-901: Lint tfvars files.

* VED-1017: Generate JSON ACK file (#1168)

* init

* log bugfix

* interim: create_json_ack_file. pending new unit test and fixing old ones

* TEMP_ACK_FILE

* update_json_ack_file

* ingestion_start_time

* complete_batch_file_process

* obtain_current_json_ack_content

* cut/paste fix

* mock out get_ingestion_start_time_by_message_id

* fix & test get_ingestion_start_time_by_message_id

* bugfix

* bugfix split()[]

* test_update_ack_file

* test_complete_batch_file_process_json_ack_file II

* code cleanup

* extra mocks

* supplier

* restored move_file

* json ack file unit tests for lambda_handler (part 1)

* archive source file test - to support e2e testing

* remove redundant functions

* bugfix: get message_id from correct place for JSON ack file

* Trigger build

* bug fix: get_ingestion_start_time_by_message_id

* fixed filename in JSON ack file

* fixed filename in JSON ack file II

* supplier

* unit tests

* cleanup

* kick pipeline

* remove duplicate update_audit_table_item() call

* remove duplicate update_audit_table_item() call II

* review changes

* success -> succeeded

* _make_json_ack_file_row

* refactor json_ack_data helper functions

* _generated_date test values

* update_csv_ack_file

* obtain_current_csv_ack_content

* _generated_date comment

* _make_json_ack_data_row

* manual merge of e2e_automation from #1177

* Remove grafana code, dependabot, README references and sonar config (#1193)

* Bump @redocly/cli from 2.16.0 to 2.17.0 in the npm-minor-patch group (#1192)

Bumps the npm-minor-patch group with 1 update: [@redocly/cli](https://github.com/Redocly/redocly-cli).


Updates `@redocly/cli` from 2.16.0 to 2.17.0
- [Release notes](https://github.com/Redocly/redocly-cli/releases)
- [Commits](https://github.com/Redocly/redocly-cli/compare/@redocly/cli@2.16.0...@redocly/cli@2.17.0)

---
updated-dependencies:
- dependency-name: "@redocly/cli"
  dependency-version: 2.17.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-minor-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel Yip <daniel.yip4@nhs.net>

* VED-000 [NOJIRA] Update Python dependencies. (#1196)

* VED-1039 Added the new vaccine types permitted for TPP and Optum (EMIS) (#1200)

* Bump @redocly/cli from 2.17.0 to 2.18.0 in the npm-minor-patch group (#1198)

Bumps the npm-minor-patch group with 1 update: [@redocly/cli](https://github.com/Redocly/redocly-cli).


Updates `@redocly/cli` from 2.17.0 to 2.18.0
- [Release notes](https://github.com/Redocly/redocly-cli/releases)
- [Commits](https://github.com/Redocly/redocly-cli/compare/@redocly/cli@2.17.0...@redocly/cli@2.18.0)

---
updated-dependencies:
- dependency-name: "@redocly/cli"
  dependency-version: 2.18.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm-minor-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel Yip <daniel.yip4@nhs.net>

* Bump @redocly/cli from 2.18.0 to 2.18.1 in the npm-minor-patch group (#1208)

* Bump @redocly/cli from 2.18.0 to 2.18.1 in the npm-minor-patch group

Bumps the npm-minor-patch group with 1 update: [@redocly/cli](https://github.com/Redocly/redocly-cli).


Updates `@redocly/cli` from 2.18.0 to 2.18.1
- [Release notes](https://github.com/Redocly/redocly-cli/releases)
- [Commits](https://github.com/Redocly/redocly-cli/compare/@redocly/cli@2.18.0...@redocly/cli@2.18.1)

---
updated-dependencies:
- dependency-name: "@redocly/cli"
  dependency-version: 2.18.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm-minor-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Trigger build

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel Yip <daniel.yip4@nhs.net>

* Bump the terraform-minor-patch group across 2 directories with 1 update (#1209)

Bumps the terraform-minor-patch group with 1 update in the /infrastructure/account directory: [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws).
Bumps the terraform-minor-patch group with 1 update in the /infrastructure/instance directory: [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws).


Updates `hashicorp/aws` from 6.31.0 to 6.32.1
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v6.31.0...v6.32.1)

Updates `hashicorp/aws` from 6.31.0 to 6.32.1
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v6.31.0...v6.32.1)

Updates `hashicorp/aws` from 6.31.0 to 6.32.1
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v6.31.0...v6.32.1)

Updates `hashicorp/aws` from 6.31.0 to 6.32.1
- [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases)
- [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md)
- [Commits](hashicorp/terraform-provider-aws@v6.31.0...v6.32.1)

---
updated-dependencies:
- dependency-name: hashicorp/aws
  dependency-version: 6.32.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: terraform-minor-patch
- dependency-name: hashicorp/aws
  dependency-version: 6.32.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: terraform-minor-patch
- dependency-name: hashicorp/aws
  dependency-version: 6.32.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: terraform-minor-patch
- dependency-name: hashicorp/aws
  dependency-version: 6.32.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: terraform-minor-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daniel Yip <daniel.yip4@nhs.net>

* VED-1038 updated lint issue (#1207)

* updated the smoke tag and add scenarios as required in ticket

* ruff format

* fix the broken tests

* updated lint issue

* Update tests/e2e_automation/features/APITests/update.feature

Co-authored-by: Daniel Yip <daniel.yip4@nhs.net>

* fix broken test by adding the valid vaccination in pre-condition

* fix lint issue

---------

Co-authored-by: Daniel Yip <daniel.yip4@nhs.net>

* VED-981 Add base infrastructure for the MNS Publisher feature (#1191)

* VED-981 (Part 2) Add DLQ, redrive policy, and encryption to queues (#1203)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Akinola Olutola <akinola.olutola1@nhs.net>
Co-authored-by: Matt Jarvis <61870561+mfjarvis@users.noreply.github.com>
Co-authored-by: James W. <218585646+JamesW1-NHS@users.noreply.github.com>
Co-authored-by: Ed Hall <239591530+edhall-nhs@users.noreply.github.com>
Co-authored-by: FimranNHS <fatima.imran3@nhs.net>

Author: 7 people

.github/dependabot.yml

@@ -7,7 +7,6 @@ version: 2
 updates:
   - package-ecosystem: "docker"
     directories:
-      - "/infrastructure/grafana/non-prod/docker"
       - "/lambdas/ack_backend"
       - "/lambdas/batch_processor_filter"
       - "/lambdas/delta_backend"
@@ -74,7 +73,6 @@ updates:
 
   - package-ecosystem: "terraform"
     directories:
-      - "/infrastructure/grafana/non-prod/terraform"
       - "/infrastructure/account"
       - "/infrastructure/instance"
       - "/infrastructure/terraform_aws_backup/**"

README.md

@@ -50,13 +50,12 @@ GitHub Actions for our entire pipeline.
 
 ### Infrastructure
 
-| Folder                 | Description                                                      |
-| ---------------------- | ---------------------------------------------------------------- |
-| `account`              | Base infrastructure components deployed on a per account basis.  |
-| `grafana`              | Terraform configuration for Grafana, built on top of core infra. |
-| `instance`             | Core Terraform app infrastructure.                               |
-| `terraform_aws_backup` | Streamlined backup processing with AWS.                          |
-| `proxies`              | Apigee API proxy definitions.                                    |
+| Folder                 | Description                                                     |
+| ---------------------- | --------------------------------------------------------------- |
+| `account`              | Base infrastructure components deployed on a per account basis. |
+| `instance`             | Core Terraform app infrastructure.                              |
+| `terraform_aws_backup` | Streamlined backup processing with AWS.                         |
+| `proxies`              | Apigee API proxy definitions.                                   |
 
 ---
 

config/prod/permissions_config.json

@@ -37,21 +37,31 @@
     "supplier": "EMIS",
     "permissions": [
       "3IN1.CRUDS",
+      "FLU.CRUDS",
       "HPV.CRUDS",
       "MENACWY.CRUDS",
       "MMR.CRUDS",
-      "RSV.CRUDS"
+      "MMRV.CRUDS",
+      "PERTUSSIS.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
+      "RSV.CRUDS",
+      "SHINGLES.CRUDS"
     ],
     "ods_codes": ["YGM41", "YGJ"]
   },
   {
     "supplier": "TPP",
     "permissions": [
       "3IN1.CRUDS",
+      "FLU.CRUDS",
       "HPV.CRUDS",
       "MENACWY.CRUDS",
       "MMR.CRUDS",
-      "RSV.CRUDS"
+      "MMRV.CRUDS",
+      "PERTUSSIS.CRUDS",
+      "PNEUMOCOCCAL.CRUDS",
+      "RSV.CRUDS",
+      "SHINGLES.CRUDS"
     ],
     "ods_codes": ["YGA"]
   },