Merge pull request #22 from NHSDigital/AMB-1684-Create-AWS-resources

 AMB-1684-Create-AWS-resources

Author: artronics

.gitignore

@@ -16,6 +16,8 @@ __pycache__/
 .venv/
 .env
 smoketest-report.xml
+lambda_typescript/**/*.js
+terraform/zips
 .dir-locals.el
 *.pyc
 .python-version

Makefile

@@ -2,6 +2,7 @@ SHELL=/bin/bash -euo pipefail
 
 #Installs dependencies using poetry.
 install-python:
+	poetry lock --no-update
 	poetry install
 
 #Installs dependencies using npm.
@@ -17,6 +18,7 @@ install: install-node install-python .git/hooks/pre-commit
 
 #Run the npm linting script (specified in package.json). Used to check the syntax and formatting of files.
 lint:
+	npm run lint
 	find . -name '*.py' -not -path '**/.venv/*' | xargs poetry run flake8
 
 #Removes build/ + dist/ directories
@@ -36,7 +38,7 @@ build-proxy:
 	scripts/build_proxy.sh
 
 #Files to loop over in release
-_dist_include="pytest.ini poetry.lock poetry.toml pyproject.toml Makefile build/. tests specification sandbox terraform"
+_dist_include="pytest.ini poetry.lock poetry.toml pyproject.toml Makefile build/. tests specification sandbox terraform lambda_typescript scripts"
 
 #Create /dist/ sub-directory and copy files into directory
 release: clean publish build-proxy

azure/azure-pr-pipeline.yml

@@ -34,9 +34,14 @@ extends:
     service_base_path: ${{ variables.service_base_path }} 
     apigee_deployments:
       - environment: internal-dev
+        jinja_templates:
+          DOMAIN_ENDPOINT: https://pr-${{ variables.pr_number }}.imms.dev.api.platform.nhs.uk
         post_deploy:
           - template: ./templates/post-deploy.yml
       - environment: internal-dev-sandbox
         proxy_path: sandbox
+        jinja_templates:
+          DOMAIN_ENDPOINT: just-dummy-value-for-successful-build
         post_deploy:
           - template: ./templates/post-deploy.yml
+

azure/azure-release-pipeline.yml

@@ -32,14 +32,20 @@ extends:
     service_base_path: ${{ variables.service_base_path }} 
     apigee_deployments:
       - environment: internal-dev
+        jinja_templates:
+          DOMAIN_ENDPOINT: https://internal-dev.imms.dev.api.platform.nhs.uk
         post_deploy:
           - template: ./templates/post-deploy.yml
       - environment: internal-dev-sandbox
         proxy_path: sandbox
+        jinja_templates:
+          DOMAIN_ENDPOINT: just-dummy-value-for-successful-build
         post_deploy:
           - template: ./templates/post-deploy.yml
       - environment: sandbox
         proxy_path: sandbox
+        jinja_templates:
+          DOMAIN_ENDPOINT: just-dummy-value-for-successful-build
         depends_on:
           - internal_dev_sandbox
     # # Enable int environment when ready by uncommenting:

azure/project.yml

@@ -6,3 +6,6 @@ variables:
     value: ifa
   - name: service_base_path
     value: immunisation-fhir-api
+  - name: pr_number
+    value: ${{ split(variables['Build.SourceBranch'], '/')[2] }}
+    

azure/templates/post-deploy.yml

@@ -10,6 +10,16 @@ steps:
       parameters:
           role: "auto-ops"
           profile: "apm_ptl"
+    
+    - template: "azure/components/get-aws-secrets-and-ssm-params.yml@common"
+      parameters:
+          secret_file_ids:
+              - ptl/app-credentials/jwt_testing/non-prod/JWT_TESTING_PRIVATE_KEY
+          secret_ids:
+              - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_ID  
+              - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_SECRET
+              - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_ID_INT
+              - ptl/app-credentials/immunisation-fhir-api-testing-app/non-prod/INTROSPECTION_CLIENT_SECRET_INT
 
   - bash: |
       make install-python
@@ -47,7 +57,7 @@ steps:
         cd terraform
         make init
         make apply aws_account_no=${aws_account_no} environment=$workspace 
-        cd ..
+        
       fi
     displayName: Deploy sandbox
     workingDirectory: "$(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)"

lambda_typescript/README.md

@@ -0,0 +1,30 @@
+# immunisation-fhir-api
+This is lambdas for the *immunisation-fhir-api* API.
+
+## Set up your TypeScript Lambda function:
+Make sure you have your TypeScript Lambda function code structured properly in a directory. For example, you might have a directory structure like this:
+lambda/
+├── src/
+│   └── index.ts
+├── package.json
+└── tsconfig.json
+
+## Install npm dependencies (if any):
+
+If your TypeScript Lambda function has npm dependencies, make sure they are installed in the project directory. You can do this by running:
+`npm install`
+
+### Build your TypeScript code:
+Before creating a ZIP file, you need to build your TypeScript code into JavaScript. Navigate to the directory where your tsconfig.json file is located and run:
+`tsc`
+This command will compile your TypeScript code into JavaScript and place the output files in the specified directory.
+
+In the package.json, added this build command in the scripts: 
+` "build": "tsc" `
+
+
+### Create a ZIP file:
+To create a ZIP file containing your Lambda function code, navigate to the directory where your TypeScript code and built JavaScript files are located. Then, create a ZIP archive that includes your Lambda function code and its dependencies (if any) using the zip command. 
+
+### Specify the ZIP file in your Terraform configuration:
+In your Terraform configuration for the Lambda function, you can specify the location of the ZIP file using the filename argument in the aws_lambda_function resource block. 

lambda_typescript/deploy.sh

@@ -0,0 +1,20 @@
+    
+    
+  # Run the npm commands to transpile the TypeScript to JavaScript
+  npm i && \
+  npm run build && \
+  npm prune --production &&\
+  # Create a dist folder and copy only the js files to distribution.
+  # AWS Lambda does not have a use for a package.json or typescript files on runtime.
+  mkdir dist &&\
+  cp -r ./src/*.js dist/ &&\
+  cp -r ./node_modules dist/ &&\
+  cd dist &&\
+  find . -name "*.zip" -type f -delete && \
+  #Create zips directory under terraform, delete existing one
+  rm -rf ../../terraform/zips
+  mkdir ../../terraform/zips
+  # Zip everything in the dist folder and move to terraform directory
+  zip -r ../../terraform/zips/lambda_function.zip . && \
+  #Delete Distibution folder
+  cd .. && rm -rf dist

lambda_typescript/package-lock.json

@@ -0,0 +1,19 @@
+{
+  "name": "lambda",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "tsc"
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/node": "^20.5.9",
+    "typescript": "^5.2.2"
+  },
+  "dependencies": {
+    "aws-sdk": "^2.1450.0"
+  }
+}