diff --git a/.github/workflows/_deploy.yml b/.github/workflows/_deploy.yml index c73736c94..443fbe28a 100644 --- a/.github/workflows/_deploy.yml +++ b/.github/workflows/_deploy.yml @@ -152,7 +152,7 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - - if: ${{ env.SCOPE == 'per_workspace' && env.ACCOUNT == 'int' }} + - if: ${{ env.SCOPE == 'per_workspace' && (env.ACCOUNT == 'int' || env.ACCOUNT == 'prod') }} uses: ./.github/actions/make/ with: command: swagger--publish diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bbcfb87c1..e3c5f8e5e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ repos: rev: v1.4.0 hooks: - id: detect-secrets - exclude: ".pre-commit-config.yaml|infrastructure/localstack/provider.tf|src/etl/sds/tests/changelog|src/etl/sds/worker/bulk/transform_bulk/tests|src/etl/sds/worker/bulk/tests/stage_data|src/api/tests/smoke_tests/test_smoke.py" + exclude: ".pre-commit-config.yaml|infrastructure/localstack/provider.tf|src/etl/sds/tests/changelog|src/etl/sds/worker/bulk/transform_bulk/tests|src/etl/sds/worker/bulk/tests/stage_data|src/api/tests/smoke_tests/test_smoke.py|archived_epr/src_old/api/tests/smoke_tests/test_smoke.py" - repo: https://github.com/prettier/pre-commit rev: 57f39166b5a5a504d6808b87ab98d41ebf095b46 diff --git a/CHANGELOG.md b/CHANGELOG.md index c6256051d..5e9f8746e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ - [PI-754] Search Product - Dependabot: datamodel-code-generator +## 2025-02-21-a +- [PI-792] Remove EPR & SDS lambdas +- [PI-816] Deploy PROD API Spec + ## 2025-02-20 - [PI-790] Remove EPR from swagger diff --git a/README.md b/README.md index 38bceb453..fe49c5be9 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ ### Prerequisites -We use `asdf` to fetch the required versions of prerequisite libraries instead of your system's default version. To get it up and running go to https://asdf-vm.com/guide/getting-started.html. You can check it installed properly by using the command `asdf --version`. +We use `asdf` to fetch the required versions of prerequisite libraries instead of your system's default version. To get it up and running go to . You can check it installed properly by using the command `asdf --version`. However, you will also need to install the `docker engine` separately @@ -469,3 +469,11 @@ To run the SBOM commands there are some make commands that currently handle this `make generate--sbom` `make validate--sbom` + +## Extras + +### Archive + +The project originally was designed to have a concept of an EPRv2. This did not work out but we have kept the remains of the EPR work in an archive folder located in the `root/archived_epr`. The EPR code was supposed to fit into the structure of our existing CPM model but it became apparent as requirements came through that this would not be possible. You will find in this folder `swagger/OAS spec`, `lambdas`, `ETL` and `tests`. + +This has been left in for future reference. The code would need to be transferred back into the root of the project, changing `src_old` back to `src` and merging into the existing `src` directory. diff --git a/VERSION b/VERSION index 73130fe3a..a37b1d820 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2025.02.21 +2025.02.21.a diff --git a/src/api/createDevice/index.py b/archived_epr/src_old/api/createDevice/index.py similarity index 100% rename from src/api/createDevice/index.py rename to archived_epr/src_old/api/createDevice/index.py diff --git a/src/api/createDevice/make/make.py b/archived_epr/src_old/api/createDevice/make/make.py similarity index 100% rename from src/api/createDevice/make/make.py rename to archived_epr/src_old/api/createDevice/make/make.py diff --git a/src/api/createDevice/policies/dynamodb.json b/archived_epr/src_old/api/createDevice/policies/dynamodb.json similarity index 100% rename from src/api/createDevice/policies/dynamodb.json rename to archived_epr/src_old/api/createDevice/policies/dynamodb.json diff --git a/src/api/createDevice/policies/kms.json b/archived_epr/src_old/api/createDevice/policies/kms.json similarity index 100% rename from src/api/createDevice/policies/kms.json rename to archived_epr/src_old/api/createDevice/policies/kms.json diff --git a/src/api/createDevice/src/v1/steps.py b/archived_epr/src_old/api/createDevice/src/v1/steps.py similarity index 100% rename from src/api/createDevice/src/v1/steps.py rename to archived_epr/src_old/api/createDevice/src/v1/steps.py diff --git a/src/api/createDevice/tests/data.py b/archived_epr/src_old/api/createDevice/tests/data.py similarity index 100% rename from src/api/createDevice/tests/data.py rename to archived_epr/src_old/api/createDevice/tests/data.py diff --git a/src/api/createDevice/tests/test_index.py b/archived_epr/src_old/api/createDevice/tests/test_index.py similarity index 100% rename from src/api/createDevice/tests/test_index.py rename to archived_epr/src_old/api/createDevice/tests/test_index.py diff --git a/src/api/createDeviceAccreditedSystem/index.py b/archived_epr/src_old/api/createDeviceAccreditedSystem/index.py similarity index 100% rename from src/api/createDeviceAccreditedSystem/index.py rename to archived_epr/src_old/api/createDeviceAccreditedSystem/index.py diff --git a/src/api/createDeviceAccreditedSystem/make/make.py b/archived_epr/src_old/api/createDeviceAccreditedSystem/make/make.py similarity index 100% rename from src/api/createDeviceAccreditedSystem/make/make.py rename to archived_epr/src_old/api/createDeviceAccreditedSystem/make/make.py diff --git a/src/api/createDeviceAccreditedSystem/policies/dynamodb.json b/archived_epr/src_old/api/createDeviceAccreditedSystem/policies/dynamodb.json similarity index 100% rename from src/api/createDeviceAccreditedSystem/policies/dynamodb.json rename to archived_epr/src_old/api/createDeviceAccreditedSystem/policies/dynamodb.json diff --git a/src/api/createDeviceAccreditedSystem/policies/kms.json b/archived_epr/src_old/api/createDeviceAccreditedSystem/policies/kms.json similarity index 100% rename from src/api/createDeviceAccreditedSystem/policies/kms.json rename to archived_epr/src_old/api/createDeviceAccreditedSystem/policies/kms.json diff --git a/src/api/createDeviceAccreditedSystem/src/v1/steps.py b/archived_epr/src_old/api/createDeviceAccreditedSystem/src/v1/steps.py similarity index 100% rename from src/api/createDeviceAccreditedSystem/src/v1/steps.py rename to archived_epr/src_old/api/createDeviceAccreditedSystem/src/v1/steps.py diff --git a/src/api/createDeviceAccreditedSystem/tests/test_index.py b/archived_epr/src_old/api/createDeviceAccreditedSystem/tests/test_index.py similarity index 100% rename from src/api/createDeviceAccreditedSystem/tests/test_index.py rename to archived_epr/src_old/api/createDeviceAccreditedSystem/tests/test_index.py diff --git a/src/api/createDeviceMessageHandlingSystem/index.py b/archived_epr/src_old/api/createDeviceMessageHandlingSystem/index.py similarity index 100% rename from src/api/createDeviceMessageHandlingSystem/index.py rename to archived_epr/src_old/api/createDeviceMessageHandlingSystem/index.py diff --git a/src/api/createDeviceMessageHandlingSystem/make/make.py b/archived_epr/src_old/api/createDeviceMessageHandlingSystem/make/make.py similarity index 100% rename from src/api/createDeviceMessageHandlingSystem/make/make.py rename to archived_epr/src_old/api/createDeviceMessageHandlingSystem/make/make.py diff --git a/src/api/createDeviceMessageHandlingSystem/policies/dynamodb.json b/archived_epr/src_old/api/createDeviceMessageHandlingSystem/policies/dynamodb.json similarity index 100% rename from src/api/createDeviceMessageHandlingSystem/policies/dynamodb.json rename to archived_epr/src_old/api/createDeviceMessageHandlingSystem/policies/dynamodb.json diff --git a/src/api/createDeviceMessageHandlingSystem/policies/kms.json b/archived_epr/src_old/api/createDeviceMessageHandlingSystem/policies/kms.json similarity index 100% rename from src/api/createDeviceMessageHandlingSystem/policies/kms.json rename to archived_epr/src_old/api/createDeviceMessageHandlingSystem/policies/kms.json diff --git a/src/api/createDeviceMessageHandlingSystem/src/v1/steps.py b/archived_epr/src_old/api/createDeviceMessageHandlingSystem/src/v1/steps.py similarity index 100% rename from src/api/createDeviceMessageHandlingSystem/src/v1/steps.py rename to archived_epr/src_old/api/createDeviceMessageHandlingSystem/src/v1/steps.py diff --git a/src/api/createDeviceMessageHandlingSystem/tests/test_index.py b/archived_epr/src_old/api/createDeviceMessageHandlingSystem/tests/test_index.py similarity index 100% rename from src/api/createDeviceMessageHandlingSystem/tests/test_index.py rename to archived_epr/src_old/api/createDeviceMessageHandlingSystem/tests/test_index.py diff --git a/src/api/createDeviceReferenceData/index.py b/archived_epr/src_old/api/createDeviceReferenceData/index.py similarity index 100% rename from src/api/createDeviceReferenceData/index.py rename to archived_epr/src_old/api/createDeviceReferenceData/index.py diff --git a/src/api/createDeviceReferenceData/make/make.py b/archived_epr/src_old/api/createDeviceReferenceData/make/make.py similarity index 100% rename from src/api/createDeviceReferenceData/make/make.py rename to archived_epr/src_old/api/createDeviceReferenceData/make/make.py diff --git a/src/api/createDeviceReferenceData/policies/dynamodb.json b/archived_epr/src_old/api/createDeviceReferenceData/policies/dynamodb.json similarity index 100% rename from src/api/createDeviceReferenceData/policies/dynamodb.json rename to archived_epr/src_old/api/createDeviceReferenceData/policies/dynamodb.json diff --git a/src/api/createDeviceReferenceData/policies/kms.json b/archived_epr/src_old/api/createDeviceReferenceData/policies/kms.json similarity index 100% rename from src/api/createDeviceReferenceData/policies/kms.json rename to archived_epr/src_old/api/createDeviceReferenceData/policies/kms.json diff --git a/src/api/createDeviceReferenceData/src/v1/steps.py b/archived_epr/src_old/api/createDeviceReferenceData/src/v1/steps.py similarity index 100% rename from src/api/createDeviceReferenceData/src/v1/steps.py rename to archived_epr/src_old/api/createDeviceReferenceData/src/v1/steps.py diff --git a/src/api/createDeviceReferenceData/tests/test_index.py b/archived_epr/src_old/api/createDeviceReferenceData/tests/test_index.py similarity index 100% rename from src/api/createDeviceReferenceData/tests/test_index.py rename to archived_epr/src_old/api/createDeviceReferenceData/tests/test_index.py diff --git a/src/api/createDeviceReferenceDataASActions/index.py b/archived_epr/src_old/api/createDeviceReferenceDataASActions/index.py similarity index 100% rename from src/api/createDeviceReferenceDataASActions/index.py rename to archived_epr/src_old/api/createDeviceReferenceDataASActions/index.py diff --git a/src/api/createDeviceReferenceDataASActions/make/make.py b/archived_epr/src_old/api/createDeviceReferenceDataASActions/make/make.py similarity index 100% rename from src/api/createDeviceReferenceDataASActions/make/make.py rename to archived_epr/src_old/api/createDeviceReferenceDataASActions/make/make.py diff --git a/src/api/createDeviceReferenceDataASActions/policies/dynamodb.json b/archived_epr/src_old/api/createDeviceReferenceDataASActions/policies/dynamodb.json similarity index 100% rename from src/api/createDeviceReferenceDataASActions/policies/dynamodb.json rename to archived_epr/src_old/api/createDeviceReferenceDataASActions/policies/dynamodb.json diff --git a/src/api/createDeviceReferenceDataASActions/policies/kms.json b/archived_epr/src_old/api/createDeviceReferenceDataASActions/policies/kms.json similarity index 100% rename from src/api/createDeviceReferenceDataASActions/policies/kms.json rename to archived_epr/src_old/api/createDeviceReferenceDataASActions/policies/kms.json diff --git a/src/api/createDeviceReferenceDataASActions/src/v1/steps.py b/archived_epr/src_old/api/createDeviceReferenceDataASActions/src/v1/steps.py similarity index 100% rename from src/api/createDeviceReferenceDataASActions/src/v1/steps.py rename to archived_epr/src_old/api/createDeviceReferenceDataASActions/src/v1/steps.py diff --git a/src/api/createDeviceReferenceDataASActions/tests/test_index.py b/archived_epr/src_old/api/createDeviceReferenceDataASActions/tests/test_index.py similarity index 100% rename from src/api/createDeviceReferenceDataASActions/tests/test_index.py rename to archived_epr/src_old/api/createDeviceReferenceDataASActions/tests/test_index.py diff --git a/src/api/createDeviceReferenceDataMessageSet/index.py b/archived_epr/src_old/api/createDeviceReferenceDataMessageSet/index.py similarity index 100% rename from src/api/createDeviceReferenceDataMessageSet/index.py rename to archived_epr/src_old/api/createDeviceReferenceDataMessageSet/index.py diff --git a/src/api/createDeviceReferenceDataMessageSet/make/make.py b/archived_epr/src_old/api/createDeviceReferenceDataMessageSet/make/make.py similarity index 100% rename from src/api/createDeviceReferenceDataMessageSet/make/make.py rename to archived_epr/src_old/api/createDeviceReferenceDataMessageSet/make/make.py diff --git a/src/api/createDeviceReferenceDataMessageSet/policies/dynamodb.json b/archived_epr/src_old/api/createDeviceReferenceDataMessageSet/policies/dynamodb.json similarity index 100% rename from src/api/createDeviceReferenceDataMessageSet/policies/dynamodb.json rename to archived_epr/src_old/api/createDeviceReferenceDataMessageSet/policies/dynamodb.json diff --git a/src/api/createDeviceReferenceDataMessageSet/policies/kms.json b/archived_epr/src_old/api/createDeviceReferenceDataMessageSet/policies/kms.json similarity index 100% rename from src/api/createDeviceReferenceDataMessageSet/policies/kms.json rename to archived_epr/src_old/api/createDeviceReferenceDataMessageSet/policies/kms.json diff --git a/src/api/createDeviceReferenceDataMessageSet/src/v1/steps.py b/archived_epr/src_old/api/createDeviceReferenceDataMessageSet/src/v1/steps.py similarity index 100% rename from src/api/createDeviceReferenceDataMessageSet/src/v1/steps.py rename to archived_epr/src_old/api/createDeviceReferenceDataMessageSet/src/v1/steps.py diff --git a/src/api/createDeviceReferenceDataMessageSet/tests/test_index.py b/archived_epr/src_old/api/createDeviceReferenceDataMessageSet/tests/test_index.py similarity index 100% rename from src/api/createDeviceReferenceDataMessageSet/tests/test_index.py rename to archived_epr/src_old/api/createDeviceReferenceDataMessageSet/tests/test_index.py diff --git a/src/api/createEprProduct/index.py b/archived_epr/src_old/api/createEprProduct/index.py similarity index 100% rename from src/api/createEprProduct/index.py rename to archived_epr/src_old/api/createEprProduct/index.py diff --git a/src/api/createEprProduct/make/make.py b/archived_epr/src_old/api/createEprProduct/make/make.py similarity index 100% rename from src/api/createEprProduct/make/make.py rename to archived_epr/src_old/api/createEprProduct/make/make.py diff --git a/src/api/createEprProduct/policies/dynamodb.json b/archived_epr/src_old/api/createEprProduct/policies/dynamodb.json similarity index 100% rename from src/api/createEprProduct/policies/dynamodb.json rename to archived_epr/src_old/api/createEprProduct/policies/dynamodb.json diff --git a/src/api/createEprProduct/policies/kms.json b/archived_epr/src_old/api/createEprProduct/policies/kms.json similarity index 100% rename from src/api/createEprProduct/policies/kms.json rename to archived_epr/src_old/api/createEprProduct/policies/kms.json diff --git a/src/api/createEprProduct/src/v1/steps.py b/archived_epr/src_old/api/createEprProduct/src/v1/steps.py similarity index 100% rename from src/api/createEprProduct/src/v1/steps.py rename to archived_epr/src_old/api/createEprProduct/src/v1/steps.py diff --git a/src/api/createEprProduct/tests/test_index.py b/archived_epr/src_old/api/createEprProduct/tests/test_index.py similarity index 100% rename from src/api/createEprProduct/tests/test_index.py rename to archived_epr/src_old/api/createEprProduct/tests/test_index.py diff --git a/src/api/createProductTeamEpr/index.py b/archived_epr/src_old/api/createProductTeamEpr/index.py similarity index 100% rename from src/api/createProductTeamEpr/index.py rename to archived_epr/src_old/api/createProductTeamEpr/index.py diff --git a/src/api/createProductTeamEpr/make/make.py b/archived_epr/src_old/api/createProductTeamEpr/make/make.py similarity index 100% rename from src/api/createProductTeamEpr/make/make.py rename to archived_epr/src_old/api/createProductTeamEpr/make/make.py diff --git a/src/api/createProductTeamEpr/policies/dynamodb.json b/archived_epr/src_old/api/createProductTeamEpr/policies/dynamodb.json similarity index 100% rename from src/api/createProductTeamEpr/policies/dynamodb.json rename to archived_epr/src_old/api/createProductTeamEpr/policies/dynamodb.json diff --git a/src/api/createProductTeamEpr/policies/kms.json b/archived_epr/src_old/api/createProductTeamEpr/policies/kms.json similarity index 100% rename from src/api/createProductTeamEpr/policies/kms.json rename to archived_epr/src_old/api/createProductTeamEpr/policies/kms.json diff --git a/src/api/createProductTeamEpr/src/v1/steps.py b/archived_epr/src_old/api/createProductTeamEpr/src/v1/steps.py similarity index 100% rename from src/api/createProductTeamEpr/src/v1/steps.py rename to archived_epr/src_old/api/createProductTeamEpr/src/v1/steps.py diff --git a/src/api/createProductTeamEpr/tests/data.py b/archived_epr/src_old/api/createProductTeamEpr/tests/data.py similarity index 100% rename from src/api/createProductTeamEpr/tests/data.py rename to archived_epr/src_old/api/createProductTeamEpr/tests/data.py diff --git a/src/api/createProductTeamEpr/tests/v1/test_index_v1.py b/archived_epr/src_old/api/createProductTeamEpr/tests/v1/test_index_v1.py similarity index 100% rename from src/api/createProductTeamEpr/tests/v1/test_index_v1.py rename to archived_epr/src_old/api/createProductTeamEpr/tests/v1/test_index_v1.py diff --git a/src/api/deleteEprProduct/index.py b/archived_epr/src_old/api/deleteEprProduct/index.py similarity index 100% rename from src/api/deleteEprProduct/index.py rename to archived_epr/src_old/api/deleteEprProduct/index.py diff --git a/src/api/deleteEprProduct/make/make.py b/archived_epr/src_old/api/deleteEprProduct/make/make.py similarity index 100% rename from src/api/deleteEprProduct/make/make.py rename to archived_epr/src_old/api/deleteEprProduct/make/make.py diff --git a/src/api/deleteEprProduct/policies/dynamodb.json b/archived_epr/src_old/api/deleteEprProduct/policies/dynamodb.json similarity index 100% rename from src/api/deleteEprProduct/policies/dynamodb.json rename to archived_epr/src_old/api/deleteEprProduct/policies/dynamodb.json diff --git a/src/api/deleteEprProduct/policies/kms.json b/archived_epr/src_old/api/deleteEprProduct/policies/kms.json similarity index 100% rename from src/api/deleteEprProduct/policies/kms.json rename to archived_epr/src_old/api/deleteEprProduct/policies/kms.json diff --git a/src/api/deleteEprProduct/src/v1/steps.py b/archived_epr/src_old/api/deleteEprProduct/src/v1/steps.py similarity index 100% rename from src/api/deleteEprProduct/src/v1/steps.py rename to archived_epr/src_old/api/deleteEprProduct/src/v1/steps.py diff --git a/src/api/deleteEprProduct/tests/test_index.py b/archived_epr/src_old/api/deleteEprProduct/tests/test_index.py similarity index 100% rename from src/api/deleteEprProduct/tests/test_index.py rename to archived_epr/src_old/api/deleteEprProduct/tests/test_index.py diff --git a/src/api/readDevice/index.py b/archived_epr/src_old/api/readDevice/index.py similarity index 100% rename from src/api/readDevice/index.py rename to archived_epr/src_old/api/readDevice/index.py diff --git a/src/api/readDevice/make/make.py b/archived_epr/src_old/api/readDevice/make/make.py similarity index 100% rename from src/api/readDevice/make/make.py rename to archived_epr/src_old/api/readDevice/make/make.py diff --git a/src/api/readDevice/policies/dynamodb.json b/archived_epr/src_old/api/readDevice/policies/dynamodb.json similarity index 100% rename from src/api/readDevice/policies/dynamodb.json rename to archived_epr/src_old/api/readDevice/policies/dynamodb.json diff --git a/src/api/readDevice/policies/kms.json b/archived_epr/src_old/api/readDevice/policies/kms.json similarity index 100% rename from src/api/readDevice/policies/kms.json rename to archived_epr/src_old/api/readDevice/policies/kms.json diff --git a/src/api/readDevice/src/v1/steps.py b/archived_epr/src_old/api/readDevice/src/v1/steps.py similarity index 100% rename from src/api/readDevice/src/v1/steps.py rename to archived_epr/src_old/api/readDevice/src/v1/steps.py diff --git a/src/api/readDevice/tests/test_index.py b/archived_epr/src_old/api/readDevice/tests/test_index.py similarity index 100% rename from src/api/readDevice/tests/test_index.py rename to archived_epr/src_old/api/readDevice/tests/test_index.py diff --git a/src/api/readDeviceReferenceData/index.py b/archived_epr/src_old/api/readDeviceReferenceData/index.py similarity index 100% rename from src/api/readDeviceReferenceData/index.py rename to archived_epr/src_old/api/readDeviceReferenceData/index.py diff --git a/src/api/readDeviceReferenceData/make/make.py b/archived_epr/src_old/api/readDeviceReferenceData/make/make.py similarity index 100% rename from src/api/readDeviceReferenceData/make/make.py rename to archived_epr/src_old/api/readDeviceReferenceData/make/make.py diff --git a/src/api/readDeviceReferenceData/policies/dynamodb.json b/archived_epr/src_old/api/readDeviceReferenceData/policies/dynamodb.json similarity index 100% rename from src/api/readDeviceReferenceData/policies/dynamodb.json rename to archived_epr/src_old/api/readDeviceReferenceData/policies/dynamodb.json diff --git a/src/api/readDeviceReferenceData/policies/kms.json b/archived_epr/src_old/api/readDeviceReferenceData/policies/kms.json similarity index 100% rename from src/api/readDeviceReferenceData/policies/kms.json rename to archived_epr/src_old/api/readDeviceReferenceData/policies/kms.json diff --git a/src/api/readDeviceReferenceData/src/v1/steps.py b/archived_epr/src_old/api/readDeviceReferenceData/src/v1/steps.py similarity index 100% rename from src/api/readDeviceReferenceData/src/v1/steps.py rename to archived_epr/src_old/api/readDeviceReferenceData/src/v1/steps.py diff --git a/src/api/readDeviceReferenceData/tests/test_index.py b/archived_epr/src_old/api/readDeviceReferenceData/tests/test_index.py similarity index 100% rename from src/api/readDeviceReferenceData/tests/test_index.py rename to archived_epr/src_old/api/readDeviceReferenceData/tests/test_index.py diff --git a/src/api/readEprProduct/index.py b/archived_epr/src_old/api/readEprProduct/index.py similarity index 100% rename from src/api/readEprProduct/index.py rename to archived_epr/src_old/api/readEprProduct/index.py diff --git a/src/api/readEprProduct/make/make.py b/archived_epr/src_old/api/readEprProduct/make/make.py similarity index 100% rename from src/api/readEprProduct/make/make.py rename to archived_epr/src_old/api/readEprProduct/make/make.py diff --git a/src/api/readEprProduct/policies/dynamodb.json b/archived_epr/src_old/api/readEprProduct/policies/dynamodb.json similarity index 100% rename from src/api/readEprProduct/policies/dynamodb.json rename to archived_epr/src_old/api/readEprProduct/policies/dynamodb.json diff --git a/src/api/readEprProduct/policies/kms.json b/archived_epr/src_old/api/readEprProduct/policies/kms.json similarity index 100% rename from src/api/readEprProduct/policies/kms.json rename to archived_epr/src_old/api/readEprProduct/policies/kms.json diff --git a/src/api/readEprProduct/src/v1/steps.py b/archived_epr/src_old/api/readEprProduct/src/v1/steps.py similarity index 100% rename from src/api/readEprProduct/src/v1/steps.py rename to archived_epr/src_old/api/readEprProduct/src/v1/steps.py diff --git a/src/api/readEprProduct/tests/test_index.py b/archived_epr/src_old/api/readEprProduct/tests/test_index.py similarity index 100% rename from src/api/readEprProduct/tests/test_index.py rename to archived_epr/src_old/api/readEprProduct/tests/test_index.py diff --git a/src/api/readProductTeamEpr/index.py b/archived_epr/src_old/api/readProductTeamEpr/index.py similarity index 100% rename from src/api/readProductTeamEpr/index.py rename to archived_epr/src_old/api/readProductTeamEpr/index.py diff --git a/src/api/readProductTeamEpr/make/make.py b/archived_epr/src_old/api/readProductTeamEpr/make/make.py similarity index 100% rename from src/api/readProductTeamEpr/make/make.py rename to archived_epr/src_old/api/readProductTeamEpr/make/make.py diff --git a/src/api/readProductTeamEpr/policies/dynamodb.json b/archived_epr/src_old/api/readProductTeamEpr/policies/dynamodb.json similarity index 100% rename from src/api/readProductTeamEpr/policies/dynamodb.json rename to archived_epr/src_old/api/readProductTeamEpr/policies/dynamodb.json diff --git a/src/api/readProductTeamEpr/policies/kms.json b/archived_epr/src_old/api/readProductTeamEpr/policies/kms.json similarity index 100% rename from src/api/readProductTeamEpr/policies/kms.json rename to archived_epr/src_old/api/readProductTeamEpr/policies/kms.json diff --git a/src/api/readProductTeamEpr/src/v1/steps.py b/archived_epr/src_old/api/readProductTeamEpr/src/v1/steps.py similarity index 100% rename from src/api/readProductTeamEpr/src/v1/steps.py rename to archived_epr/src_old/api/readProductTeamEpr/src/v1/steps.py diff --git a/src/api/readProductTeamEpr/tests/test_index.py b/archived_epr/src_old/api/readProductTeamEpr/tests/test_index.py similarity index 100% rename from src/api/readProductTeamEpr/tests/test_index.py rename to archived_epr/src_old/api/readProductTeamEpr/tests/test_index.py diff --git a/src/api/readQuestionnaire/index.py b/archived_epr/src_old/api/readQuestionnaire/index.py similarity index 100% rename from src/api/readQuestionnaire/index.py rename to archived_epr/src_old/api/readQuestionnaire/index.py diff --git a/src/api/readQuestionnaire/make/make.py b/archived_epr/src_old/api/readQuestionnaire/make/make.py similarity index 100% rename from src/api/readQuestionnaire/make/make.py rename to archived_epr/src_old/api/readQuestionnaire/make/make.py diff --git a/src/api/readQuestionnaire/src/v1/steps.py b/archived_epr/src_old/api/readQuestionnaire/src/v1/steps.py similarity index 100% rename from src/api/readQuestionnaire/src/v1/steps.py rename to archived_epr/src_old/api/readQuestionnaire/src/v1/steps.py diff --git a/src/api/readQuestionnaire/tests/test_index.py b/archived_epr/src_old/api/readQuestionnaire/tests/test_index.py similarity index 100% rename from src/api/readQuestionnaire/tests/test_index.py rename to archived_epr/src_old/api/readQuestionnaire/tests/test_index.py diff --git a/src/api/searchDeviceReferenceData/index.py b/archived_epr/src_old/api/searchDeviceReferenceData/index.py similarity index 100% rename from src/api/searchDeviceReferenceData/index.py rename to archived_epr/src_old/api/searchDeviceReferenceData/index.py diff --git a/src/api/searchDeviceReferenceData/make/make.py b/archived_epr/src_old/api/searchDeviceReferenceData/make/make.py similarity index 100% rename from src/api/searchDeviceReferenceData/make/make.py rename to archived_epr/src_old/api/searchDeviceReferenceData/make/make.py diff --git a/src/api/searchDeviceReferenceData/policies/dynamodb.json b/archived_epr/src_old/api/searchDeviceReferenceData/policies/dynamodb.json similarity index 100% rename from src/api/searchDeviceReferenceData/policies/dynamodb.json rename to archived_epr/src_old/api/searchDeviceReferenceData/policies/dynamodb.json diff --git a/src/api/searchDeviceReferenceData/policies/kms.json b/archived_epr/src_old/api/searchDeviceReferenceData/policies/kms.json similarity index 100% rename from src/api/searchDeviceReferenceData/policies/kms.json rename to archived_epr/src_old/api/searchDeviceReferenceData/policies/kms.json diff --git a/src/api/searchDeviceReferenceData/src/v1/steps.py b/archived_epr/src_old/api/searchDeviceReferenceData/src/v1/steps.py similarity index 100% rename from src/api/searchDeviceReferenceData/src/v1/steps.py rename to archived_epr/src_old/api/searchDeviceReferenceData/src/v1/steps.py diff --git a/src/api/searchDeviceReferenceData/tests/test_index.py b/archived_epr/src_old/api/searchDeviceReferenceData/tests/test_index.py similarity index 100% rename from src/api/searchDeviceReferenceData/tests/test_index.py rename to archived_epr/src_old/api/searchDeviceReferenceData/tests/test_index.py diff --git a/src/api/searchEprProduct/index.py b/archived_epr/src_old/api/searchEprProduct/index.py similarity index 100% rename from src/api/searchEprProduct/index.py rename to archived_epr/src_old/api/searchEprProduct/index.py diff --git a/src/api/searchEprProduct/make/make.py b/archived_epr/src_old/api/searchEprProduct/make/make.py similarity index 100% rename from src/api/searchEprProduct/make/make.py rename to archived_epr/src_old/api/searchEprProduct/make/make.py diff --git a/src/api/searchEprProduct/policies/dynamodb.json b/archived_epr/src_old/api/searchEprProduct/policies/dynamodb.json similarity index 100% rename from src/api/searchEprProduct/policies/dynamodb.json rename to archived_epr/src_old/api/searchEprProduct/policies/dynamodb.json diff --git a/src/api/searchEprProduct/policies/kms.json b/archived_epr/src_old/api/searchEprProduct/policies/kms.json similarity index 100% rename from src/api/searchEprProduct/policies/kms.json rename to archived_epr/src_old/api/searchEprProduct/policies/kms.json diff --git a/src/api/searchEprProduct/src/v1/steps.py b/archived_epr/src_old/api/searchEprProduct/src/v1/steps.py similarity index 100% rename from src/api/searchEprProduct/src/v1/steps.py rename to archived_epr/src_old/api/searchEprProduct/src/v1/steps.py diff --git a/src/api/searchEprProduct/tests/test_index.py b/archived_epr/src_old/api/searchEprProduct/tests/test_index.py similarity index 100% rename from src/api/searchEprProduct/tests/test_index.py rename to archived_epr/src_old/api/searchEprProduct/tests/test_index.py diff --git a/src/api/searchSdsDevice/index.py b/archived_epr/src_old/api/searchSdsDevice/index.py similarity index 100% rename from src/api/searchSdsDevice/index.py rename to archived_epr/src_old/api/searchSdsDevice/index.py diff --git a/src/api/searchSdsDevice/make/make.py b/archived_epr/src_old/api/searchSdsDevice/make/make.py similarity index 100% rename from src/api/searchSdsDevice/make/make.py rename to archived_epr/src_old/api/searchSdsDevice/make/make.py diff --git a/src/api/searchSdsDevice/policies/dynamodb.json b/archived_epr/src_old/api/searchSdsDevice/policies/dynamodb.json similarity index 100% rename from src/api/searchSdsDevice/policies/dynamodb.json rename to archived_epr/src_old/api/searchSdsDevice/policies/dynamodb.json diff --git a/src/api/searchSdsDevice/policies/kms.json b/archived_epr/src_old/api/searchSdsDevice/policies/kms.json similarity index 100% rename from src/api/searchSdsDevice/policies/kms.json rename to archived_epr/src_old/api/searchSdsDevice/policies/kms.json diff --git a/src/api/searchSdsDevice/src/v1/steps.py b/archived_epr/src_old/api/searchSdsDevice/src/v1/steps.py similarity index 100% rename from src/api/searchSdsDevice/src/v1/steps.py rename to archived_epr/src_old/api/searchSdsDevice/src/v1/steps.py diff --git a/src/api/searchSdsDevice/tests/_test_index.py b/archived_epr/src_old/api/searchSdsDevice/tests/_test_index.py similarity index 100% rename from src/api/searchSdsDevice/tests/_test_index.py rename to archived_epr/src_old/api/searchSdsDevice/tests/_test_index.py diff --git a/src/api/searchSdsEndpoint/index.py b/archived_epr/src_old/api/searchSdsEndpoint/index.py similarity index 100% rename from src/api/searchSdsEndpoint/index.py rename to archived_epr/src_old/api/searchSdsEndpoint/index.py diff --git a/src/api/searchSdsEndpoint/make/make.py b/archived_epr/src_old/api/searchSdsEndpoint/make/make.py similarity index 100% rename from src/api/searchSdsEndpoint/make/make.py rename to archived_epr/src_old/api/searchSdsEndpoint/make/make.py diff --git a/src/api/searchSdsEndpoint/policies/dynamodb.json b/archived_epr/src_old/api/searchSdsEndpoint/policies/dynamodb.json similarity index 100% rename from src/api/searchSdsEndpoint/policies/dynamodb.json rename to archived_epr/src_old/api/searchSdsEndpoint/policies/dynamodb.json diff --git a/src/api/searchSdsEndpoint/policies/kms.json b/archived_epr/src_old/api/searchSdsEndpoint/policies/kms.json similarity index 100% rename from src/api/searchSdsEndpoint/policies/kms.json rename to archived_epr/src_old/api/searchSdsEndpoint/policies/kms.json diff --git a/src/api/searchSdsEndpoint/src/v1/steps.py b/archived_epr/src_old/api/searchSdsEndpoint/src/v1/steps.py similarity index 100% rename from src/api/searchSdsEndpoint/src/v1/steps.py rename to archived_epr/src_old/api/searchSdsEndpoint/src/v1/steps.py diff --git a/src/api/searchSdsEndpoint/tests/_test_index.py b/archived_epr/src_old/api/searchSdsEndpoint/tests/_test_index.py similarity index 100% rename from src/api/searchSdsEndpoint/tests/_test_index.py rename to archived_epr/src_old/api/searchSdsEndpoint/tests/_test_index.py diff --git a/archived_epr/src/api/tests/feature_tests/features/createDevice.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/createDevice.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createDevice.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createDevice.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/createDevice.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/createDevice.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createDevice.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createDevice.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/createDeviceAccreditedSystem.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/createDeviceAccreditedSystem.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createDeviceAccreditedSystem.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createDeviceAccreditedSystem.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/createDeviceAccreditedSystem.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/createDeviceAccreditedSystem.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createDeviceAccreditedSystem.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createDeviceAccreditedSystem.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/createDeviceMessageHandlingSystem.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/createDeviceMessageHandlingSystem.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createDeviceMessageHandlingSystem.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createDeviceMessageHandlingSystem.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/createDeviceMessageHandlingSystem.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/createDeviceMessageHandlingSystem.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createDeviceMessageHandlingSystem.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createDeviceMessageHandlingSystem.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/createDeviceReferenceData.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/createDeviceReferenceData.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createDeviceReferenceData.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createDeviceReferenceData.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/createDeviceReferenceData.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/createDeviceReferenceData.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createDeviceReferenceData.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createDeviceReferenceData.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/createDeviceReferenceDataAdditionalInteractions.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/createDeviceReferenceDataAdditionalInteractions.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createDeviceReferenceDataAdditionalInteractions.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createDeviceReferenceDataAdditionalInteractions.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/createDeviceReferenceDataAdditionalInteractions.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/createDeviceReferenceDataAdditionalInteractions.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createDeviceReferenceDataAdditionalInteractions.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createDeviceReferenceDataAdditionalInteractions.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/createDeviceReferenceDataMessageSet.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/createDeviceReferenceDataMessageSet.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createDeviceReferenceDataMessageSet.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createDeviceReferenceDataMessageSet.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/createDeviceReferenceDataMessageSet.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/createDeviceReferenceDataMessageSet.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createDeviceReferenceDataMessageSet.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createDeviceReferenceDataMessageSet.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/createEprProduct.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/createEprProduct.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createEprProduct.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createEprProduct.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/createEprProduct.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/createEprProduct.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createEprProduct.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createEprProduct.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/createProductTeamEpr.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/createProductTeamEpr.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createProductTeamEpr.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createProductTeamEpr.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/createProductTeamEpr.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/createProductTeamEpr.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/createProductTeamEpr.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/createProductTeamEpr.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/deleteEprProduct.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/deleteEprProduct.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/deleteEprProduct.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/deleteEprProduct.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/deleteEprProduct.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/deleteEprProduct.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/deleteEprProduct.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/deleteEprProduct.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/readDevice.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/readDevice.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/readDevice.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/readDevice.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/readDevice.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/readDevice.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/readDevice.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/readDevice.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/readDeviceReferenceData.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/readDeviceReferenceData.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/readDeviceReferenceData.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/readDeviceReferenceData.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/readDeviceReferenceData.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/readDeviceReferenceData.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/readDeviceReferenceData.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/readDeviceReferenceData.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/readEprProduct.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/readEprProduct.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/readEprProduct.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/readEprProduct.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/readEprProduct.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/readEprProduct.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/readEprProduct.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/readEprProduct.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/readProductTeamEpr.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/readProductTeamEpr.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/readProductTeamEpr.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/readProductTeamEpr.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/readProductTeamEpr.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/readProductTeamEpr.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/readProductTeamEpr.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/readProductTeamEpr.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/readQuestionnaire.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/readQuestionnaire.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/readQuestionnaire.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/readQuestionnaire.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/readQuestionnaire.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/readQuestionnaire.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/readQuestionnaire.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/readQuestionnaire.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/searchDeviceReferenceData.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/searchDeviceReferenceData.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/searchDeviceReferenceData.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/searchDeviceReferenceData.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/searchDeviceReferenceData.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/searchDeviceReferenceData.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/searchDeviceReferenceData.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/searchDeviceReferenceData.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/searchEprProduct.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/searchEprProduct.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/searchEprProduct.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/searchEprProduct.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/searchEprProduct.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/searchEprProduct.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/searchEprProduct.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/searchEprProduct.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/searchSdsDevice.failure.feature b/archived_epr/src_old/api/tests/feature_tests/features/searchSdsDevice.failure.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/searchSdsDevice.failure.feature rename to archived_epr/src_old/api/tests/feature_tests/features/searchSdsDevice.failure.feature diff --git a/archived_epr/src/api/tests/feature_tests/features/searchSdsDevice.success.feature b/archived_epr/src_old/api/tests/feature_tests/features/searchSdsDevice.success.feature similarity index 100% rename from archived_epr/src/api/tests/feature_tests/features/searchSdsDevice.success.feature rename to archived_epr/src_old/api/tests/feature_tests/features/searchSdsDevice.success.feature diff --git a/archived_epr/src/api/tests/feature_tests/steps/endpoint_lambda_mapping.py b/archived_epr/src_old/api/tests/feature_tests/steps/endpoint_lambda_mapping.py similarity index 99% rename from archived_epr/src/api/tests/feature_tests/steps/endpoint_lambda_mapping.py rename to archived_epr/src_old/api/tests/feature_tests/steps/endpoint_lambda_mapping.py index 01e186f43..56709a7c5 100644 --- a/archived_epr/src/api/tests/feature_tests/steps/endpoint_lambda_mapping.py +++ b/archived_epr/src_old/api/tests/feature_tests/steps/endpoint_lambda_mapping.py @@ -21,7 +21,6 @@ def get_endpoint_lambda_mapping() -> ENDPOINT_LAMBDA_MAPPING: query_parameters = {'value': something} """ - import api.createCpmProduct.index import api.createDevice.index import api.createDeviceAccreditedSystem.index import api.createDeviceMessageHandlingSystem.index @@ -29,24 +28,26 @@ def get_endpoint_lambda_mapping() -> ENDPOINT_LAMBDA_MAPPING: import api.createDeviceReferenceDataASActions.index import api.createDeviceReferenceDataMessageSet.index import api.createEprProduct.index - import api.createProductTeam.index import api.createProductTeamEpr.index - import api.deleteCpmProduct.index import api.deleteEprProduct.index - import api.deleteProductTeam.index - import api.readCpmProduct.index import api.readDevice.index import api.readDeviceReferenceData.index # import api.searchCpmProduct.index import api.readEprProduct.index - import api.readProductTeam.index import api.readProductTeamEpr.index import api.readQuestionnaire.index import api.searchDeviceReferenceData.index import api.searchEprProduct.index import api.searchSdsDevice.index import api.searchSdsEndpoint.index + + import api.createCpmProduct.index + import api.createProductTeam.index + import api.deleteCpmProduct.index + import api.deleteProductTeam.index + import api.readCpmProduct.index + import api.readProductTeam.index import api.status.index return { diff --git a/archived_epr/src/api/tests/feature_tests/steps/tests/test_endpoint_lambda_mapping.py b/archived_epr/src_old/api/tests/feature_tests/steps/tests/test_endpoint_lambda_mapping.py similarity index 100% rename from archived_epr/src/api/tests/feature_tests/steps/tests/test_endpoint_lambda_mapping.py rename to archived_epr/src_old/api/tests/feature_tests/steps/tests/test_endpoint_lambda_mapping.py diff --git a/archived_epr/src/api/tests/smoke_tests/_test_sds_smoke.py b/archived_epr/src_old/api/tests/smoke_tests/_test_sds_smoke.py similarity index 100% rename from archived_epr/src/api/tests/smoke_tests/_test_sds_smoke.py rename to archived_epr/src_old/api/tests/smoke_tests/_test_sds_smoke.py diff --git a/archived_epr/src/api/tests/smoke_tests/test_smoke.py b/archived_epr/src_old/api/tests/smoke_tests/test_smoke.py similarity index 100% rename from archived_epr/src/api/tests/smoke_tests/test_smoke.py rename to archived_epr/src_old/api/tests/smoke_tests/test_smoke.py diff --git a/changelog/2025-02-21-a.md b/changelog/2025-02-21-a.md new file mode 100644 index 000000000..713d34a55 --- /dev/null +++ b/changelog/2025-02-21-a.md @@ -0,0 +1,2 @@ +- [PI-792] Remove EPR & SDS lambdas +- [PI-816] Deploy PROD API Spec diff --git a/pyproject.toml b/pyproject.toml index c487b3853..015480bba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "connecting-party-manager" -version = "2025.02.21" +version = "2025.02.21.a" description = "Repository for the Connecting Party Manager API and related services" authors = ["NHS England"] license = "LICENSE.md" diff --git a/scripts/builder/build.mk b/scripts/builder/build.mk index fdc0bf360..a1a2e84d5 100644 --- a/scripts/builder/build.mk +++ b/scripts/builder/build.mk @@ -6,7 +6,7 @@ POSTMAN_COLLECTION = $(CURDIR)/src/api/tests/feature_tests/postman-collection.js TOOL_VERSIONS_COPY = $(TIMESTAMP_DIR)/tool-versions.copy POETRY_LOCK = $(CURDIR)/poetry.lock INIT_TIMESTAMP = $(CURDIR)/.timestamp/init.timestamp -SRC_FILES = $(shell find src -type f -name "*.py" -not -path "*/feature_tests/*" -not -path "*/test_*" -not -path "*/fhir/r4/strict_models.py" -not -path "*/fhir/r4/models.py") +SRC_FILES = $(shell find src/api src/etl src/layers src/test_helpers -type f -name "*.py" -not -path "*/feature_tests/*" -not -path "*/test_*" -not -path "*/fhir/r4/strict_models.py" -not -path "*/fhir/r4/models.py" -not -path "*/archived_epr/*") THIRD_PARTY_DIST = $(CURDIR)/src/layers/third_party/dist SWAGGER_DIST = $(CURDIR)/infrastructure/swagger/dist SWAGGER_PUBLIC = $(SWAGGER_DIST)/public/swagger.yaml @@ -32,7 +32,7 @@ clean--build: build: $(BUILD_TIMESTAMP) ## Complete project install and build artifacts for deployment $(BUILD_TIMESTAMP): $(BUILD_DEPENDENCIES) - @find $(CURDIR) -name make.py | xargs -n 1 -P 8 -I % bash -c 'poetry run python %' + @find $(CURDIR)/src -name make.py | xargs -n 1 -P 8 -I % bash -c 'poetry run python %' touch $(BUILD_TIMESTAMP) generate--sbom: build diff --git a/scripts/builder/common.py b/scripts/builder/common.py index 968786968..4df3b723c 100644 --- a/scripts/builder/common.py +++ b/scripts/builder/common.py @@ -9,10 +9,12 @@ DIST_DIR = "dist" BUILD_DIR = "build" SCRIPT_DIR = "make" +ARCHIVE_DIR = "archived_epr" UNNECESSARY_DIRS = [ DIST_DIR, BUILD_DIR, SCRIPT_DIR, + ARCHIVE_DIR, "setup.py", "__pycache__", "*.dist-info", diff --git a/scripts/builder/lambda_build.py b/scripts/builder/lambda_build.py index 0423068ee..6398c23a7 100644 --- a/scripts/builder/lambda_build.py +++ b/scripts/builder/lambda_build.py @@ -34,10 +34,11 @@ def create_zip_package( def build(file): - lambda_base_dir = get_base_dir(file) - package_name = lambda_base_dir.name + if "archived_epr" not in file: + lambda_base_dir = get_base_dir(file) + package_name = lambda_base_dir.name - with create_zip_package( - package_name=package_name, base_dir=lambda_base_dir - ) as build_dir: - copy_source_code(source_dir=lambda_base_dir, build_dir=build_dir) + with create_zip_package( + package_name=package_name, base_dir=lambda_base_dir + ) as build_dir: + copy_source_code(source_dir=lambda_base_dir, build_dir=build_dir) diff --git a/scripts/builder/layer_build.py b/scripts/builder/layer_build.py index 55a516534..976ad86a5 100644 --- a/scripts/builder/layer_build.py +++ b/scripts/builder/layer_build.py @@ -47,13 +47,14 @@ def create_zip_package( def build(file): - layer_base_dir = get_base_dir(file) - package_name = layer_base_dir.name + if "archived_epr" not in file: + layer_base_dir = get_base_dir(file) + package_name = layer_base_dir.name - with create_zip_package( - package_name=package_name, base_dir=layer_base_dir - ) as build_dir: - copy_source_code(source_dir=layer_base_dir, build_dir=build_dir) + with create_zip_package( + package_name=package_name, base_dir=layer_base_dir + ) as build_dir: + copy_source_code(source_dir=layer_base_dir, build_dir=build_dir) @contextmanager diff --git a/scripts/builder/third_party_build.py b/scripts/builder/third_party_build.py index 11f893446..77a13228b 100644 --- a/scripts/builder/third_party_build.py +++ b/scripts/builder/third_party_build.py @@ -98,21 +98,22 @@ def build_third_party( group: str, dependencies: dict[str, str], ): - base_dir = get_base_dir(file) - package_zipper = create_zip_package( - package_name=f"third_party_{group}", base_dir=base_dir, third_party=True - ) - docker_file = get_dockerfile_path(base_dir=base_dir, group=group) + if "archived_epr" not in file: + base_dir = get_base_dir(file) + package_zipper = create_zip_package( + package_name=f"third_party_{group}", base_dir=base_dir, third_party=True + ) + docker_file = get_dockerfile_path(base_dir=base_dir, group=group) - with TemporaryDirectory() as root_dir, package_zipper as build_dir: - root_dir = Path(root_dir).resolve() - venv_dir = root_dir / VENV - with create_temp_path(path=venv_dir, is_dir=True): - create_requirements( - root_dir=root_dir, - pyproject_toml_path=pyproject_toml_path, - group=group, - dependencies=dependencies, - ) - docker_run(docker_file=docker_file, root_dir=root_dir, group=group) - copy_source_code(source_dir=venv_dir, build_dir=build_dir) + with TemporaryDirectory() as root_dir, package_zipper as build_dir: + root_dir = Path(root_dir).resolve() + venv_dir = root_dir / VENV + with create_temp_path(path=venv_dir, is_dir=True): + create_requirements( + root_dir=root_dir, + pyproject_toml_path=pyproject_toml_path, + group=group, + dependencies=dependencies, + ) + docker_run(docker_file=docker_file, root_dir=root_dir, group=group) + copy_source_code(source_dir=venv_dir, build_dir=build_dir) diff --git a/scripts/infrastructure/apigee/proxygen.sh b/scripts/infrastructure/apigee/proxygen.sh index 9d778e869..7e34438b6 100644 --- a/scripts/infrastructure/apigee/proxygen.sh +++ b/scripts/infrastructure/apigee/proxygen.sh @@ -192,12 +192,8 @@ function publish_swagger(){ if [[ ${_aws_environment} == "prod" ]]; then _flags="" - #elif [[ ${_aws_environment} == "int" ]]; then else _flags="--uat" - # else - # echo "ERROR: only environments to deploy to are 'prod' and 'int'" - # exit 1; fi echo " diff --git a/scripts/test/test.mk b/scripts/test/test.mk index 7b8ef1b58..ce9248a12 100644 --- a/scripts/test/test.mk +++ b/scripts/test/test.mk @@ -10,25 +10,25 @@ RUN_SPEEDTEST = ?= FALSE PROXYGEN_PRODUCT_TIMESTAMP = $(TIMESTAMP_DIR)/.proxygen-product.stamp _pytest: - AWS_DEFAULT_REGION=$(AWS_DEFAULT_REGION) AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) AWS_SESSION_TOKEN=$(AWS_SESSION_TOKEN) poetry run python -m pytest $(PYTEST_FLAGS) $(_INTERNAL_FLAGS) $(_CACHE_CLEAR) + AWS_DEFAULT_REGION=$(AWS_DEFAULT_REGION) AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) AWS_SESSION_TOKEN=$(AWS_SESSION_TOKEN) poetry run python -m pytest $(PYTEST_FLAGS) --ignore=archived_epr $(_INTERNAL_FLAGS) $(_CACHE_CLEAR) _behave: AWS_DEFAULT_REGION=$(AWS_DEFAULT_REGION) AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) AWS_SESSION_TOKEN=$(AWS_SESSION_TOKEN) poetry run python -m behave src/api/tests/feature_tests $(BEHAVE_FLAGS) $(_INTERNAL_FLAGS) --no-skipped test--unit: ## Run unit (pytest) tests - $(MAKE) _pytest _INTERNAL_FLAGS="-m 'unit' --ignore=archived_epr $(_INTERNAL_FLAGS)" _CACHE_CLEAR=$(_CACHE_CLEAR) + $(MAKE) _pytest _INTERNAL_FLAGS="-m 'unit' $(_INTERNAL_FLAGS)" _CACHE_CLEAR=$(_CACHE_CLEAR) test--integration: aws--login ## Run integration (pytest) tests - $(MAKE) _pytest _INTERNAL_FLAGS="-m 'integration' --ignore=archived_epr $(_INTERNAL_FLAGS)" _CACHE_CLEAR=$(_CACHE_CLEAR) AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) AWS_SESSION_TOKEN=$(AWS_SESSION_TOKEN) + $(MAKE) _pytest _INTERNAL_FLAGS="-m 'integration' $(_INTERNAL_FLAGS)" _CACHE_CLEAR=$(_CACHE_CLEAR) AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) AWS_SESSION_TOKEN=$(AWS_SESSION_TOKEN) test--slow: ## Run slow (pytest) tests - $(MAKE) _pytest _INTERNAL_FLAGS="-m 'slow' --ignore=archived_epr" _CACHE_CLEAR=$(_CACHE_CLEAR) + $(MAKE) _pytest _INTERNAL_FLAGS="-m 'slow'" _CACHE_CLEAR=$(_CACHE_CLEAR) test--s3: aws--login ## Run (pytest) tests that require s3 downloads - $(MAKE) _pytest _INTERNAL_FLAGS="-m 's3' --ignore=archived_epr $(_INTERNAL_FLAGS)" _CACHE_CLEAR=$(_CACHE_CLEAR) AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) AWS_SESSION_TOKEN=$(AWS_SESSION_TOKEN) + $(MAKE) _pytest _INTERNAL_FLAGS="-m 's3' $(_INTERNAL_FLAGS)" _CACHE_CLEAR=$(_CACHE_CLEAR) AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) AWS_SESSION_TOKEN=$(AWS_SESSION_TOKEN) test--smoke: aws--login ## Run end-to-end smoke tests (pytest) - AWS_DEFAULT_REGION=$(AWS_DEFAULT_REGION) AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) AWS_SESSION_TOKEN=$(AWS_SESSION_TOKEN) WORKSPACE=$(WORKSPACE) ACCOUNT=$(ACCOUNT) poetry run python -m pytest $(PYTEST_FLAGS) -m 'smoke' --ignore=src/layers --ignore=src/etl --ignore=archived_epr/src $(_CACHE_CLEAR) + AWS_DEFAULT_REGION=$(AWS_DEFAULT_REGION) AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) AWS_SESSION_TOKEN=$(AWS_SESSION_TOKEN) WORKSPACE=$(WORKSPACE) ACCOUNT=$(ACCOUNT) poetry run python -m pytest $(PYTEST_FLAGS) -m 'smoke' --ignore=src/layers --ignore=src/etl --ignore=archived_epr $(_CACHE_CLEAR) test--%--rerun: ## Rerun failed integration or unit (pytest) tests $(MAKE) test--$* _INTERNAL_FLAGS="--last-failed --last-failed-no-failures none" _CACHE_CLEAR=$(_CACHE_CLEAR) @@ -42,4 +42,4 @@ test--feature--%--auto-retry: ## Autoretry of failed feature (gherkin) tests $(MAKE) test--feature--$* _INTERNAL_FLAGS="--define='auto_retry=true'" test--sds--matrix: ## Run end-to-end smoke tests that check data matches betweeen cpm and ldap - SDS_PROD_APIKEY=$(SDS_PROD_APIKEY) SDS_DEV_APIKEY=$(SDS_DEV_APIKEY) USE_CPM_PROD=$(USE_CPM_PROD) TEST_COUNT=$(TEST_COUNT) COMPARISON_ENV=$(COMPARISON_ENV) RUN_SPEEDTEST=$(RUN_SPEEDTEST) poetry run python -m pytest $(PYTEST_FLAGS) -m 'matrix' --ignore=src/layers --ignore=src/etl $(_CACHE_CLEAR) + SDS_PROD_APIKEY=$(SDS_PROD_APIKEY) SDS_DEV_APIKEY=$(SDS_DEV_APIKEY) USE_CPM_PROD=$(USE_CPM_PROD) TEST_COUNT=$(TEST_COUNT) COMPARISON_ENV=$(COMPARISON_ENV) RUN_SPEEDTEST=$(RUN_SPEEDTEST) poetry run python -m pytest $(PYTEST_FLAGS) -m 'matrix' --ignore=src/layers --ignore=src/etl --ignore=archived_epr $(_CACHE_CLEAR)