diff --git a/services/mesh-forwarder/Pipfile b/services/mesh-forwarder/Pipfile index a29f5801..00c7306a 100644 --- a/services/mesh-forwarder/Pipfile +++ b/services/mesh-forwarder/Pipfile @@ -7,27 +7,27 @@ name = "pypi" mesh-inbox-s3-forwarder = {editable = true, path = "."} [dev-packages] -werkzeug = "~=2.1.0" -moto = {version = "~=2.2", extras = ["server"]} -pytest-cov = "~=2.12" -pytest = "~=6.2" -pyfakefs = "~=4.5" -fake-mesh = "~=0.3" -flake8 = "~=3.9" -flake8-bugbear="~=21.9" -flake8-comprehensions="~=3.6" -mccabe="~=0.6" -flake8-builtins="~=1.5" -flake8-print="~=4.0" -bandit = "~=1.7" -isort = "~=5.9" -black = "==21.9b0" -mypy = "~=0.9" -types-requests = "2.25" -click = "~=8.0.4" +werkzeug = "~=3.1.5" +moto = {version = "~=5.1.21", extras = ["server"]} +pytest-cov = "~=7.0.0" +pytest = "~=9.0.2" +pyfakefs = "~=6.1.0" +fake-mesh = "~=0.4.0" +flake8 = "~=7.3.0" +flake8-bugbear="~=25.11.29" +flake8-comprehensions="~=3.17.0" +mccabe="~=0.7.0" +flake8-builtins="~=3.1.0" +flake8-print="~=5.0.0" +bandit = "~=1.9.3" +isort = "~=7.0.0" +black = "==26.1.0" +mypy = "~=1.19.1" +types-requests = "~=2.32.4" +click = "~=8.3.1" [requires] -python_version = "3.9" +python_version = "3.14.3" [scripts] test = "python -m pytest --cov=awsmesh --cov-report=term-missing tests/unit tests/e2e" diff --git a/services/mesh-forwarder/Pipfile.lock b/services/mesh-forwarder/Pipfile.lock index 430ce5ec..cf623358 100644 --- a/services/mesh-forwarder/Pipfile.lock +++ b/services/mesh-forwarder/Pipfile.lock @@ -1,11 +1,11 @@ { "_meta": { "hash": { - "sha256": "7141ee1c4d8b430d5c5ea660b9f372721ac46327f04ff50047e678adb9a25e29" + "sha256": "51f0de9ce134bb75deaa608cfcd7d757143c2faab136c767f0b641014b0ae439" }, "pipfile-spec": 6, "requires": { - "python_version": "3.9" + "python_version": "3.14.3" }, "sources": [ { diff --git a/services/mesh-forwarder/tasks b/services/mesh-forwarder/tasks index cd6ee01e..70475cfa 100755 --- a/services/mesh-forwarder/tasks +++ b/services/mesh-forwarder/tasks @@ -10,38 +10,6 @@ AWS_DEFAULT_REGION=eu-west-2 IMAGE_REPO_NAME=deductions/mesh-forwarder export NHS_SERVICE=mesh-forwarder -AWS_HELPERS_VERSION=0.2.27 -echo "AWS helper scripts version: $AWS_HELPERS_VERSION" - - -########################### -# Shared utils # -########################### - -function download_util() { - local UTIL_VERSION=$1 - local UTIL_FILENAME=$2 - - local UTIL_FILEPATH="utils/$UTIL_VERSION/$UTIL_FILENAME" - - mkdir -p "utils/$UTIL_VERSION" - if [[ ! -f $UTIL_FILEPATH ]];then - wget --quiet -O $UTIL_FILEPATH https://github.com/nhsconnect/prm-deductions-support-infra/releases/download/${UTIL_VERSION}/${UTIL_FILENAME} - fi - chmod +x $UTIL_FILEPATH - - echo "$UTIL_FILEPATH" -} - -function fetch_redaction_utils() { - download_util $AWS_HELPERS_VERSION run-with-redaction.sh - download_util $AWS_HELPERS_VERSION redactor -} - -AWS_HELPERS_FILE=$(download_util $AWS_HELPERS_VERSION aws-helpers) -source $AWS_HELPERS_FILE - - #################################### # Instance (Environment) Variables # #################################### @@ -137,14 +105,9 @@ function set_cert_issuer() { } function setup_venv { - venv_directory=venv - echo "Using this directory for venv: ${venv_directory}" - python3 -m venv "${venv_directory}" - source "${venv_directory}"/bin/activate -} - -function get_aws_account_id() { - AWS_ACCOUNT_ID=$(aws sts get-caller-identity | jq -r .Account) + echo "Creating Dev Virtual Environment" + pip3 install pipenv + pipenv shell } function generate_mesh_fqdn() { @@ -159,19 +122,6 @@ function generate_mesh_fqdn() { fi } -function build_forwarder_image() { - fetch_redaction_utils - docker build --build-arg SOURCE_IMAGE_TAG=$SOURCE_IMAGE_TAG \ - --build-arg UTILS_VERSION=$AWS_HELPERS_VERSION \ - -t "$IMAGE_REPO_NAME:${IMAGE_TAG}" . -} - -function push_forwarder_image_to_repo_ecr() { - IMAGE_FULL_URL="${REPOSITORY_URI}:${IMAGE_TAG}" - docker tag "$IMAGE_REPO_NAME:${IMAGE_TAG}" "$IMAGE_FULL_URL" - docker push "$IMAGE_FULL_URL" -} - function generate_csr { keys_file_name="$1" # If you intend to secure the URL https://www.yourdomain.com, then your CSR’s common name must be www.yourdomain.com @@ -300,11 +250,6 @@ case "${command}" in set_nems_env python3 print_delete_subscription.py ;; - promote_docker_image) - check_env - set_image_tag - promote_docker_image "$IMAGE_REPO_NAME:$IMAGE_TAG" "$NHS_ENVIRONMENT" - ;; venv) setup_venv ;; @@ -316,13 +261,6 @@ case "${command}" in --cluster $NHS_ENVIRONMENT-${NHS_SERVICE}-ecs-cluster \ --services $NHS_ENVIRONMENT-mesh-forwarder-service ;; - fetch_utils) - fetch_redaction_utils - ;; - build_docker) - set_image_tag - build_forwarder_image - ;; push_forwarder_image_to_repo_ecr) if [ -z $SOURCE_IMAGE_TAG ]; then echo "Please set SOURCE_IMAGE_TAG environment variable"