Environment var value changed to dev

Author: robertnovac1

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

@@ -1,4 +1,4 @@
-environment             = "non-prod"
+environment             = "dev"
 sub_environment         = "int"
 immunisation_account_id = "345594581768"
 dspp_core_account_id    = "603871901111"

terraform/environments/non-prod/internal-dev/variables.tfvars

@@ -1,4 +1,4 @@
-environment             = "non-prod"
+environment             = "dev"
 sub_environment         = "internal-dev"
 immunisation_account_id = "345594581768"
 dspp_core_account_id    = "603871901111"

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

@@ -1,4 +1,4 @@
-environment             = "non-prod"
+environment             = "dev"
 sub_environment         = "pr"
 immunisation_account_id = "345594581768"
 dspp_core_account_id    = "603871901111"

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

@@ -1,4 +1,4 @@
-environment             = "non-prod"
+environment             = "dev"
 sub_environment         = "ref"
 immunisation_account_id = "345594581768"
 dspp_core_account_id    = "603871901111"

terraform/main.tf

@@ -40,20 +40,37 @@ data "aws_region" "current" {}
 data "aws_caller_identity" "current" {}
 data "aws_ecr_authorization_token" "token" {}
 
-data "aws_vpc" "default" {
-  filter {
-    name   = "tag:Name"
-    values = [local.vpc_name]
+check "private_subnets" {
+  assert {
+    condition     = length(local.private_subnet_ids) > 0
+    error_message = "No private subnets with internet access found in VPC ${data.aws_vpc.default.id}"
   }
 }
 
-data "aws_subnets" "default" {
+data "aws_vpc" "default" {
+  default = true
+}
+
+data "aws_subnets" "all" {
   filter {
     name   = "vpc-id"
     values = [data.aws_vpc.default.id]
   }
 }
 
+data "aws_route_table" "route_table_by_subnet" {
+  for_each = toset(data.aws_subnets.all.ids)
+
+  subnet_id = each.value
+}
+
+data "aws_route" "internet_traffic_route_by_subnet" {
+  for_each = data.aws_route_table.route_table_by_subnet
+
+  route_table_id         = each.value.id
+  destination_cidr_block = "0.0.0.0/0"
+}
+
 data "aws_kms_key" "existing_s3_encryption_key" {
   key_id = "alias/imms-batch-s3-shared-key"
 }
@@ -82,6 +99,5 @@ data "aws_kms_key" "existing_kinesis_encryption_key" {
 }
 
 data "aws_kms_key" "mesh_s3_encryption_key" {
-  count  = var.environment == "int" ? 0 : 1
   key_id = "alias/local-immunisation-mesh"
 }

terraform/splunk.tf

@@ -1,8 +1,5 @@
-locals {
-  splunk_env = var.environment == "prod" ? "prod" : var.sub_environment == "int" ? "int" : "dev"
-}
 data "aws_secretsmanager_secret" "splunk_token" {
-  name = "imms/splunk/${local.splunk_env}/hec"
+  name = "imms/splunk/${var.environment}/hec"
 }
 data "aws_secretsmanager_secret_version" "splunk_token_id" {
   secret_id = data.aws_secretsmanager_secret.splunk_token.id