Fixed compatibility issues

Author: robertnovac1

.github/workflows/pr-deploy-to-int.yml

@@ -10,9 +10,6 @@ on:
         required: false
         default: ''
 
-env:
-  TF_CLI_ARGS_apply: --auto-approve
-
 jobs:
   test-oidc:
     runs-on: ubuntu-latest
@@ -29,3 +26,41 @@ jobs:
 
       - name: Whoami
         run: aws sts get-caller-identity
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: "1.12.2"
+
+      - name: Terraform Init
+        working-directory: ./terraform_old
+        run: |
+          make init
+          
+
+      - name: Terraform Plan
+        working-directory: ./terraform_old
+        run: |
+          make plan environment=green aws_account_no=int
+
+      # - name: Set up Python
+      #   id: setup_python
+      #   uses: actions/setup-python@v5
+      #   with:
+      #     python-version: "3.10.16" # this is for e2e tests
+
+      # - name: cache virtualenv
+      #   uses: actions/cache@v4
+      #   id: cache-venv
+      #   with:
+      #     path: ./.venv/
+      #     key: ${{ hashFiles('**/*requirements.txt') }}
+      #     restore-keys: ${{ hashFiles('**/*requirements.txt') }}
+
+      # - name: Install dependencies
+      #   if: steps.cache-venv.outputs.cache-hit != 'true'
+      #   run: make install-dev-requirements

terraform_old/Makefile

@@ -6,10 +6,10 @@ tf_cmd = AWS_PROFILE=$(aws_profile) terraform
 
 project_name = immunisation
 project_short_name = imms
-state_bucket = $(BUCKET_NAME) #$(project_name)-$(APIGEE_ENVIRONMENT)-terraform-state-files
+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="profile=$(aws_profile)" -var="aws_account_name=$(AWS_ACCOUNT)"
+tf_vars= -var="project_name=$(project_name)" -var="project_short_name=$(project_short_name)" -var="profile=$(aws_profile)" -var="aws_account_name=$(ENVIRONMENT)"
 
 .PHONY : lock-provider workspace init plan apply clean destroy output state-list lambda-zip catch-all-zip
 

terraform_old/api_gateway/mtls_cert.tf

@@ -4,7 +4,7 @@ locals {
 }
 
 data "aws_s3_bucket" "cert_storage" {
-  bucket = "imms-fhir-${var.config_env}-cert-storage"
+  bucket = "imms-fhir-int-cert-storage"
 }
 
 data "aws_s3_object" "cert" {

terraform_old/main.tf

@@ -17,12 +17,11 @@ terraform {
 }
 
 provider "aws" {
-  region  = var.region
-  profile = var.profile
+  region = var.region
   default_tags {
     tags = {
       Project     = var.project_name
-      Environment = local.environment
+      Environment = "int"
       Service     = var.service
     }
   }

terraform_old/route53.tf

@@ -2,14 +2,6 @@ locals {
   zone_subdomain = var.project_short_name
 }
 
-data "aws_route53_zone" "root_zone" {
-  name = local.root_domain
-}
-
-locals {
-  project_zone_name = "${local.zone_subdomain}.${data.aws_route53_zone.root_zone.name}"
-}
-
 data "aws_route53_zone" "project_zone" {
-  name    = local.project_zone_name
-}
+  name = "imms.int.vds.platform.nhs.uk"
+}

terraform_old/splunk.tf

@@ -1,16 +1,13 @@
-locals {
-    splunk_env = local.environment == "prod" ? "prod" : local.environment == "int" ? "int" : "dev"
-}
 data "aws_secretsmanager_secret" "splunk_token" {
-    name = "imms/splunk/${local.splunk_env}/hec"
+  name = "imms/splunk/int/hec"
 }
 data "aws_secretsmanager_secret_version" "splunk_token_id" {
-    secret_id = data.aws_secretsmanager_secret.splunk_token.id
+  secret_id = data.aws_secretsmanager_secret.splunk_token.id
 }
 
 module "splunk" {
-    source = "./splunk"
-    prefix = local.prefix
-    splunk_endpoint = "https://firehose.inputs.splunk.aws.digital.nhs.uk/services/collector/event"
-    hec_token = data.aws_secretsmanager_secret_version.splunk_token_id.secret_string
-}
+  source          = "./splunk"
+  prefix          = local.prefix
+  splunk_endpoint = "https://firehose.inputs.splunk.aws.digital.nhs.uk/services/collector/event"
+  hec_token       = data.aws_secretsmanager_secret_version.splunk_token_id.secret_string
+}

terraform_old/variables.tf

@@ -19,7 +19,7 @@ variable "service" {
 data "aws_vpc" "default" {
   filter {
     name   = "tag:Name"
-    values = ["imms-${var.aws_account_name}-fhir-api-vpc"]
+    values = ["imms-int-fhir-api-vpc"]
   }
 }
 
@@ -30,10 +30,6 @@ data "aws_subnets" "default" {
   }
 }
 
-locals {
-  root_domain = "${local.config_env}.vds.platform.nhs.uk"
-}
-
 locals {
   project_domain_name = data.aws_route53_zone.project_zone.name
 }
@@ -50,6 +46,7 @@ locals {
   service_domain_name     = "${local.env}.${local.project_domain_name}"
   immunisation_account_id = "084828561157"
   dspp_core_account_id    = "603871901111"
+  root_domain             = "${local.config_env}.vds.platform.nhs.uk"
 
   tags = {
     Project     = var.project_name
@@ -90,11 +87,11 @@ data "aws_s3_bucket" "existing_config_bucket" {
 }
 
 data "aws_s3_bucket" "existing_destination_bucket" {
-  bucket = "immunisation-batch-${var.aws_account_name}-preprod-data-destinations"
+  bucket = "immunisation-batch-int-preprod-data-destinations"
 }
 
 data "aws_s3_bucket" "existing_source_bucket" {
-  bucket = "immunisation-batch-${var.aws_account_name}-preprod-data-sources"
+  bucket = "immunisation-batch-int-preprod-data-sources"
 }
 
 data "aws_kms_key" "existing_lambda_encryption_key" {
@@ -106,15 +103,15 @@ data "aws_kms_key" "existing_kinesis_encryption_key" {
 }
 
 data "aws_dynamodb_table" "events-dynamodb-table" {
-  name = "imms-${var.aws_account_name}-imms-events"
+  name = "imms-int-imms-events"
 }
 
 data "aws_dynamodb_table" "audit-table" {
-  name = "immunisation-batch-${var.aws_account_name}-audit-table"
+  name = "immunisation-batch-int-audit-table"
 }
 
 data "aws_dynamodb_table" "delta-dynamodb-table" {
-  name = "imms-${var.aws_account_name}-delta"
+  name = "imms-int-delta"
 }
 
 data "aws_lambda_function" "existing_file_name_proc_lambda" {