modularity

Author: robertnovac1

.github/workflows/deploy-template.yml

@@ -41,7 +41,7 @@ jobs:
       - name: Terraform Plan
         working-directory: ${{ vars.TERRAFORM_DIR_PATH }}
         run: |
-          make plan environment=${{ inputs.environment }}
+          make plan environment=${{ inputs.environment }} aws_account_name=int
 
   terraform-apply:
     needs: terraform-plan
@@ -74,7 +74,7 @@ jobs:
       - name: Terraform Apply
         working-directory: ${{ vars.TERRAFORM_DIR_PATH }}
         run: |
-          make plan environment=${{ inputs.environment }}
+          make apply environment=${{ inputs.environment }} aws_account_name=int
 
   e2e-tests:
     needs: terraform-apply

terraform_old/Makefile

@@ -1,6 +1,7 @@
 -include .env
 
 environment ?= $(ENVIRONMENT)
+aws_account_name ?= $(AWS_ACCOUNT_NAME)
 aws_profile ?= $(AWS_PROFILE) #apim-dev # Leave this here for pipeline
 tf_cmd = $(if $(AWS_PROFILE),AWS_PROFILE=$(AWS_PROFILE) ,)terraform
 
@@ -9,7 +10,7 @@ project_short_name = imms
 state_bucket = immunisation-preprod-terraform-state-files
 tf_state= -backend-config="bucket=$(state_bucket)"
 
-tf_vars= -var="project_name=$(project_name)" -var="project_short_name=$(project_short_name)" -var="aws_account_name=$(environment)"
+tf_vars= -var="project_name=$(project_name)" -var="project_short_name=$(project_short_name)" -var="aws_account_name=$(aws_account_name)"
 
 .PHONY : lock-provider workspace init plan apply clean destroy output state-list lambda-zip catch-all-zip
 

terraform_old/api_gateway/mtls_cert.tf

@@ -1,10 +1,10 @@
 locals {
   # NHSD cert file
-  truststore_file_name = "server-renewed-cert-v2.pem"
+  truststore_file_name = "server-renewed-cert.pem"
 }
 
 data "aws_s3_bucket" "cert_storage" {
-  bucket = "imms-fhir-int-cert-storage"
+  bucket = "imms-fhir-${var.aws_account_name}-cert-storage"
 }
 
 data "aws_s3_object" "cert" {

terraform_old/api_gateway/variables.tf

@@ -5,7 +5,7 @@ variable "api_domain_name" {}
 variable "environment" {}
 variable "oas" {}
 variable "config_env" {}
-
+variable "aws_account_name" {}
 locals {
   environment = terraform.workspace == "green" ? "prod" : terraform.workspace == "blue" ? "prod" : terraform.workspace
 }

terraform_old/main.tf

@@ -21,7 +21,7 @@ provider "aws" {
   default_tags {
     tags = {
       Project     = var.project_name
-      Environment = "int"
+      Environment = var.aws_account_name
       Service     = var.service
     }
   }

terraform_old/route53.tf

@@ -3,5 +3,5 @@ locals {
 }
 
 data "aws_route53_zone" "project_zone" {
-  name = "imms.int.vds.platform.nhs.uk"
+  name = "imms.${var.aws_account_name}.vds.platform.nhs.uk"
 }

terraform_old/splunk.tf

@@ -1,5 +1,5 @@
 data "aws_secretsmanager_secret" "splunk_token" {
-  name = "imms/splunk/int/hec"
+  name = "imms/splunk/${var.aws_account_name}/hec"
 }
 data "aws_secretsmanager_secret_version" "splunk_token_id" {
   secret_id = data.aws_secretsmanager_secret.splunk_token.id

terraform_old/variables.tf

@@ -19,7 +19,7 @@ variable "service" {
 data "aws_vpc" "default" {
   filter {
     name   = "tag:Name"
-    values = ["imms-int-fhir-api-vpc"]
+    values = ["imms-${var.aws_account_name}-fhir-api-vpc"]
   }
 }