IN-493 fix ports for new ver of motoserver and improve makefile

Author: jamesrwarren

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": null,
     "lines": null
   },
-  "generated_at": "2020-10-27T15:31:23Z",
+  "generated_at": "2020-11-06T13:37:02Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -58,7 +58,7 @@
       {
         "hashed_secret": "dc724af18fbdd4e59189f5fe768a5f8311527050",
         "is_verified": false,
-        "line_number": 68,
+        "line_number": 69,
         "type": "Secret Keyword"
       }
     ]

Makefile

@@ -3,23 +3,36 @@ THIS_FILE := $(lastword $(MAKEFILE_LIST))
 help:
 	make -pRrq  -f $(THIS_FILE) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'
 
-everything:
-	docker-compose -f docker-compose.yml up -d --build
-	chmod +x mock_aws_services/create_secret.sh
-	mock_aws_services/create_secret.sh
-just_api:
-	docker-compose -f docker-compose.yml up --build -d mock-sirius motoserver api_gateway
+create_secrets:
 	chmod +x mock_aws_services/create_secret.sh
+	sleep 5
 	mock_aws_services/create_secret.sh
+	python3 mock_aws_services/create_secret.py
+
+build:
+	./build.sh
+
+up:
+	docker-compose -f docker-compose.yml up -d mock-sirius motoserver api_gateway
+
+up-all:
+	docker-compose -f docker-compose.yml up -d
 
 down:
 	docker-compose -f docker-compose.yml down $(c)
 
+setup: build up create_secrets
+
+setup-all: build up-all create_secrets
+
 destroy:
 	docker-compose down -v --rmi all --remove-orphans
+
 ps:
 	docker-compose -f docker-compose.yml ps
+
 login-api-gateway:
 	docker-compose -f docker-compose.yml exec api_gateway /bin/bash
+
 logs:
 	docker-compose -f docker-compose.yml logs --tail=100 -f $(c)

README.md

@@ -22,7 +22,35 @@ LPA related functions.
 
 ## Running the API locally
 
-### Set up
+To run the API locally you should have aws-vault installed and have an account that has access to assume
+the operator role in sirius dev.
+
+- Run full setup script from the make file:
+```
+make setup
+```
+or if you want pact as well:
+```
+make setup-all
+```
+- Test the setup
+
+```
+curl -X GET http://localhost:4343/v1/healthcheck
+curl -X GET http://localhost:4343/v1/lpa-online-tool/lpas/A39721583862
+curl -X GET http://localhost:4343/v1/use-an-lpa/lpas/700000000013
+```
+
+That should be all you need to set it up locally.
+
+-----------------------------------
+
+## Manual setup
+
+#### Set up local development environment outside of docker
+
+If you wish to develop against this environment and don't want to be dealing with docker containers then there
+is a bit more of an in depth set up process required.
 
 1. Create a virtual environment
     ```bash
@@ -48,30 +76,19 @@ LPA related functions.
    pip3 install -r lambda_functions/v1/requirements/dev-requirements.txt
    ```
 
-
-
-#### Running flask app locally, aka the quick way
+1. Remove the codeartifact login
+   ```bash
+   rm ~/.pypirc
+   ```
+#### Running flask app locally
 
 1. `cd lambda_functions/v1/functions/lpa/app`
 1. `flask run`
 1. Endpoints should be available on `http://localhost:5000`
 
-#### Running everything in Docker
-
-1. Get your AWS credentials
-    ```bash
-   cd docs/support_scripts/aws
-
-   aws-vault exec identity -- go run ./getcreds.go
-    ```
-1. Copy & paste the output to set your AWS details as env vars
-    * This is because we are using custom packages hosted in AWS CodeArtifact and we need to log in to be able to pip install them
-1. In the root folder: `make everything` (you can also use `make just_api` if you are not interested in Pact)
-1. Endpoints should be available on `http://0.0.0.0:4343`
-
 ## Unit Tests
 
-1. [Set up local environment](#Set up)
+1. [Set up local environment](#set-up-local-development-environment-outside-of-docker)
 
 1. Run the tests command-line style
     ```bash
@@ -84,12 +101,12 @@ LPA related functions.
     ```
 1. Run the tests in PyCharm
 
-    *  Go to PyCharm > Preferences > Tools > Python Integrated Tools
+    * Go to PyCharm > Preferences > Tools > Python Integrated Tools
     * Set the Default Test Runner to 'pytest'
     * Right click on the tests folder (or single file) > 'Run pytest in tests'
 
 ## Integration Tests
-1. [Set up local environment](#Set up)
+1. [Set up local environment](#set-up-local-development-environment-outside-of-docker)
 
 1. Setup the tests:
      - In `integration_tests/v1/conftest.py`, check that the url you are pointing to is correct.
@@ -101,8 +118,6 @@ LPA related functions.
     aws-vault exec identity -- python -m pytest -n2 --dist=loadfile --html=report.html --self-contained-html
     ```
 
-
-
 ## PACT
 
 To run pact locally, the easiest way to interact with it is to use the client tools.
@@ -135,7 +150,7 @@ http://localhost:9292/pacticipants/lpa_data/versions/x12345/tags/v1
 
 You can check it has worked here:
 
-`http://localhost:9292/matrix/provider/OPG%20Data/consumer/Complete%20the%20deputy%20report`
+`http://localhost:9292/matrix/provider/lpa_data_sirius/consumer/lpa_data`
 
 Run the secret creation against mock
 

build.sh

@@ -0,0 +1,5 @@
+$(aws-vault exec identity -- go run ./docs/support_scripts/aws/getcreds.go)
+docker-compose -f docker-compose.yml build \
+--build-arg AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \
+--build-arg AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \
+--build-arg AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN

docker-compose.yml

@@ -40,6 +40,7 @@ services:
       dockerfile: Dockerfile
     ports:
       - "4584:4584"
+      - "4566:4566"
   redis:
     image: "redis:alpine"
     ports:

docs/support_scripts/aws/getcreds.go

@@ -12,11 +12,10 @@ import (
 func main() {
 
     roletoassume := "arn:aws:iam::288342028542:role/operator"
-//     roletoassume := "arn:aws:iam::492687888235:role/operator"
 
 	mysession := session.Must(session.NewSession())
-	digidepcreds := stscreds.NewCredentials(mysession, roletoassume)
-	cfg := aws.Config{Credentials: digidepcreds,Region: aws.String("eu-west-1")}
+	creds := stscreds.NewCredentials(mysession, roletoassume)
+	cfg := aws.Config{Credentials: creds,Region: aws.String("eu-west-1")}
 	sess := session.Must(session.NewSession(&cfg))
 	sessionstring, err := sess.Config.Credentials.Get()
 
@@ -30,7 +29,6 @@ func main() {
 	fmt.Println(accesskey)
 	fmt.Println(secret)
 	fmt.Println(session)
-	fmt.Println("Provider Name: ",sessionstring.ProviderName)
 
 }
 

mock_aws_services/Dockerfile

@@ -5,5 +5,5 @@ RUN apk add --no-cache gcc musl-dev libffi-dev openssl-dev && \
     apk del gcc musl-dev libffi-dev openssl-dev
 
 
-CMD moto_server secretsmanager -H 0.0.0.0 -p 4584
+CMD moto_server secretsmanager -H 0.0.0.0 -p 4566
 

mock_aws_services/create_secret.py

@@ -2,7 +2,7 @@
 from tenacity import retry
 import requests
 
-url = "http://0.0.0.0:4584/?Action=CreateSecret"
+url = "http://0.0.0.0:4566/?Action=CreateSecret"
 
 
 payload = {

mock_aws_services/create_secret.sh

@@ -2,9 +2,9 @@
 
 
 printf "creating secret\n"
-until $(curl --output /dev/null --silent --head --fail 'http://0.0.0.0:4584/?Action=ListSecrets'); do
+until $(curl --output /dev/null --silent --head --fail 'http://0.0.0.0:4566/?Action=ListSecrets'); do
     printf '.'
     sleep 1
 done
-curl --location --request POST 'http://0.0.0.0:4584/?Action=CreateSecret' --header 'Content-Type: application/json' --header 'Content-Type: text/plain' --data-raw '{"Name": "local/jwt-key_docker", "Description": "Secret for local testing with Docker","SecretString":"this_is_a_secret_string","ClientRequestToken": "EXAMPLE1-90ab-cdef-fedc-ba987SECRET1"}'
+curl --location --request POST 'http://0.0.0.0:4566/?Action=CreateSecret' --header 'Content-Type: application/json' --header 'Content-Type: text/plain' --data-raw '{"Name": "local/jwt-key_docker", "Description": "Secret for local testing with Docker","SecretString":"this_is_a_secret_string","ClientRequestToken": "EXAMPLE1-90ab-cdef-fedc-ba987SECRET1"}'
 printf "\nsecret created\n"