Removed remaining dojo from ehr-out and updated README a bit

Author: oliverbeumkes-nhs

services/ehr-out-service/.talismanrc

@@ -3,7 +3,6 @@
 This component is part of the Repository, responsible for creating and handling of EHR transfers out from the Repository,
 when the Orphaned/Stranded health record stored in the Repository's `ehr-repository` is requested by the next registering
 practice.
-
 When the a GP2GP EHR request on its incoming queue, the `ehr-out-service` accepts this and creates a record to track this outward transfer.
 After the successful validation of the request and retrieval of patient's health record from `ehr-repository`, it sends the 
 EHR out to the requesting practice via `gp2gp-messenger`.
@@ -16,28 +15,16 @@ Follow the links to download
 - [Node](https://nodejs.org/en/download/package-manager/#nvm) - version 14.x
 - [Docker](https://docs.docker.com/install/)
 
-### AWS helpers
-
-This repository imports shared AWS helpers from [prm-deductions-support-infra](https://github.com/nhsconnect/prm-deductions-support-infra/).
-They can be found `utils` directory after running any task from `tasks` file.
-
 ## Directories
 
 | Directory         | Description                                       |
 | :---------------- |:--------------------------------------------------|
-| /test/docker      | Contains smoke test for docker                    |
-| /test/functional  | Contains tests against deployed service           |
-| /gocd             | Contains the GoCD pipeline files                  |
 | /src              | The source code                                   |
-| /terraform        | Terraform to deploy app as a Fargate task in AWS  |
+| /terraform        | The relative terraform lives in the infra repo.   |
 | /scripts          | Useful scripts (e.g. for sending canary messages) |
-| /utils            | Contains aws-helpers                              |
 
 ## Starting the app locally
 
-*BEWARE be sure what you're doing here as `node_modules` can contain platform-specific files e.g. mac vs linux/amd64 not
-necessarily compatible*
-
 1. Run `npm install` to install all node dependencies.
 2. Configure local environment variables:
     - run `./tasks setup_test_integration_local`

services/ehr-out-service/README.md

@@ -18,30 +18,6 @@ GIT_REPO_NAME=prm-repo-ehr-out-service
 export OLD_SERVICE=repo-to-gp
 export NHS_SERVICE=ehr-out-service
 
-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"
-}
-
-AWS_HELPERS_FILE=$(download_util $AWS_HELPERS_VERSION aws-helpers)
-source $AWS_HELPERS_FILE
 
 ####################################
 # Instance (Environment) Variables #
@@ -54,13 +30,6 @@ function check_env {
   fi
 }
 
-function check_nhs_service {
-  if [[ -z "${NHS_SERVICE}" ]]; then
-    echo "Must set NHS_SERVICE"
-    exit 1
-  fi
-}
-
 function configure_service_url {
   if [[ -z "${NHS_ENVIRONMENT}" ]]; then
     export SERVICE_URL=http://${NHS_SERVICE}:3000
@@ -124,33 +93,17 @@ function configure_local_envs_for_docker_test {
   set_image_tag
 }
 
-function get_aws_account_id {
-    AWS_ACCOUNT_ID=$(dojo -c Dojofile-infra "aws sts get-caller-identity | jq -r .Account")
-}
-
 ############################
 # Docker Related Functions #
 ############################
 
-function docker_login {
-  echo Logging in to Amazon ECR...
-  eval $(dojo -c Dojofile-infra "aws ecr get-login --no-include-email --region $AWS_DEFAULT_REGION")
-}
 
 function configure_docker_repository_uri {
   docker_login
   get_aws_account_id
   export REPOSITORY_URI=$AWS_ACCOUNT_ID.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/$IMAGE_REPO_NAME
 }
 
-function build_docker_image() {
-  echo Build started on $(date)
-  set_image_tag
-  echo Building the Docker image...
-  docker build --build-arg UTILS_VERSION=$AWS_HELPERS_VERSION -t $REPOSITORY_URI:latest -t $REPOSITORY_URI:$IMAGE_TAG .
-  echo Build completed on `date`
-}
-
 function kill_container {
   local filter=$1
   local moniker=$2
@@ -179,81 +132,6 @@ function run_localstack {
 function run_localstack_itest {
   docker-compose -f docker-compose-itest.yml up -d
 }
-#######################
-# Terraform Functions #
-#######################
-
-export TF_BUCKET="prm-deductions-${NHS_ENVIRONMENT}-terraform-state"
-function tf_init_with_options {
-  local state_key=$1
-  local tf_options=$2
-
-  terraform init $tf_options \
-    -backend-config key="${state_key}" \
-    -backend-config bucket="${TF_BUCKET}" \
-    -backend-config dynamodb_table="prm-deductions-${NHS_ENVIRONMENT}-terraform-table" \
-    -backend-config region=${AWS_DEFAULT_REGION}
-}
-
-function tf_init_or_rename {
-  local state_key_suffix=$1
-
-  echo checking state file exists
-  set +e
-  aws s3 ls ${TF_BUCKET}/$NHS_SERVICE-${state_key_suffix}
-  local state_file_exists=$?
-  if [ $state_file_exists -ne 0 ]; then
-    echo cannot find state file so assuming rename
-    local RENAME_STATE=true
-  else
-    echo state file exists
-  fi
-  set -e
-
-  if [ -z "${RENAME_STATE}" ]; then
-    tf_init_with_options $NHS_SERVICE-${state_key_suffix} -reconfigure
-  else
-    echo doing one-time renaming of state file
-    if [ -z "${OLD_SERVICE}" ]; then
-      echo OLD_SERVICE needs to be set if RENAME_STATE being used
-      exit 88
-    fi
-    tf_init_with_options $OLD_SERVICE-${state_key_suffix} -reconfigure
-
-    tf_init_with_options $NHS_SERVICE-${state_key_suffix} '-migrate-state -force-copy'
-  fi
-}
-
-
-function tf_init {
-  check_env
-  cd terraform
-
-  tf_init_or_rename ${NHS_ENVIRONMENT}/terraform.tfstate
-}
-
-function tf_plan {
-  operation=$1
-  set_image_tag
-
-  tf_init
-  terraform get # modules
-  if [[ "${operation}" == "create" ]]; then
-    terraform plan -var task_image_tag=$IMAGE_TAG -var-file=$NHS_ENVIRONMENT.tfvars -out="nhs_deployment.tfplan"
-  elif [[ "${operation}" == "destroy" ]]; then
-    terraform plan -var task_image_tag=$IMAGE_TAG -var-file=$NHS_ENVIRONMENT.tfvars -out="nhs_deployment.tfplan" -destroy
-  else
-    echo "Unknown operation (should be create or destroy), got: ${operation}"
-    exit 1
-  fi
-}
-
-function tf_apply {
-  tf_init
-  terraform get # modules
-  terraform apply nhs_deployment.tfplan
-  terraform output -json > tf-out.json
-}
 
 ###########
 # Testing #
@@ -356,7 +234,7 @@ case "${command}" in
       ;;
   run_docker_local)
       configure_local_envs
-      dojo -c Dojofile-dtest
+      run_docker_local
       ;;
   tf_plan)
       check_env