PDS check variable

Author: robertnovac1

terraform/endpoints.tf

@@ -27,7 +27,7 @@ locals {
     "IMMUNIZATION_BASE_PATH" = strcontains(terraform.workspace, "pr-") ? "immunisation-fhir-api-${terraform.workspace}" : "immunisation-fhir-api"
     # except for prod and ref, any other env uses PDS int environment
     "PDS_ENV"              = var.pds_environment
-    "PDS_CHECK_ENABLED"    = tostring(var.environment != "int")
+    "PDS_CHECK_ENABLED"    = tostring(var.pds_check_enabled)
     "SPLUNK_FIREHOSE_NAME" = module.splunk.firehose_stream_name
     "SQS_QUEUE_URL"        = "https://sqs.eu-west-2.amazonaws.com/${var.immunisation_account_id}/${local.short_prefix}-ack-metadata-queue.fifo"
     "REDIS_HOST"           = data.aws_elasticache_cluster.existing_redis.cache_nodes[0].address

terraform/environments/int/blue/variables.tfvars

@@ -2,3 +2,4 @@ environment             = "int"
 sub_environment         = "blue"
 immunisation_account_id = "084828561157"
 dspp_core_account_id    = "603871901111"
+pds_check_enabled       = false

terraform/environments/int/green/variables.tfvars

@@ -2,3 +2,4 @@ environment             = "int"
 sub_environment         = "green"
 immunisation_account_id = "084828561157"
 dspp_core_account_id    = "603871901111"
+pds_check_enabled       = false

terraform/environments/non-prod/int/variables.tfvars

@@ -2,3 +2,4 @@ environment             = "dev"
 sub_environment         = "int"
 immunisation_account_id = "345594581768"
 dspp_core_account_id    = "603871901111"
+pds_check_enabled       = false

terraform/modules/api_gateway/api.tf

@@ -1,7 +1,7 @@
 
 resource "aws_apigatewayv2_api" "service_api" {
   name                         = "${var.prefix}-api"
-  description                  = "Immunisation FHIR API - ${var.environment}"
+  description                  = "Immunisation FHIR API - ${var.sub_environment}"
   protocol_type                = "HTTP"
   disable_execute_api_endpoint = true
   body                         = var.oas
@@ -10,7 +10,7 @@ resource "aws_apigatewayv2_api" "service_api" {
 resource "aws_apigatewayv2_stage" "default" {
   depends_on  = [aws_cloudwatch_log_group.api_access_log]
   api_id      = aws_apigatewayv2_api.service_api.id
-  name        = var.environment
+  name        = var.sub_environment
   auto_deploy = true
 
   default_route_settings {

terraform/modules/api_gateway/logs.tf

@@ -1,5 +1,5 @@
 resource "aws_cloudwatch_log_group" "api_access_log" {
-  name              = "/aws/vendedlogs/${aws_apigatewayv2_api.service_api.id}/${var.environment}"
+  name              = "/aws/vendedlogs/${aws_apigatewayv2_api.service_api.id}/${var.sub_environment}"
   retention_in_days = 30
 }
 

terraform/variables.tf

@@ -30,6 +30,10 @@ variable "pds_environment" {
   default = "int"
 }
 
+variable "pds_check_enabled" {
+  default = true
+}
+
 variable "root_domain" {
   default = "imms.dev.vds.platform.nhs.uk"
 }