Testing fixes

Author: Veetaha

connector/terraform/examples/basic/main.tf

@@ -13,4 +13,6 @@ module "elastio_connectors" {
       region = "us-east-2",
     }
   ]
+
+  elastio_nat_provision_stack = "v5"
 }

connector/terraform/main.tf

@@ -35,13 +35,13 @@ module "region" {
   region                  = each.value.region
   vpc_id                  = each.value.vpc_id
   subnet_ids              = each.value.subnet_ids
-  connector_account_stack = each.value.account.cloudformation_stack
+  connector_account_stack = module.account.cloudformation_stack
 }
 
 module "nat_provision" {
   source   = "./modules/nat-provision"
-  for_each = var.elastio_nat_provision_stack == null ? [] : local.connectors
+  for_each = var.elastio_nat_provision_stack == null ? {} : local.connectors
 
-  version                 = var.elastio_nat_provision_stack
-  connector_account_stack = each.value.account.cloudformation_stack
+  template_version        = var.elastio_nat_provision_stack
+  connector_account_stack = module.account.cloudformation_stack
 }

connector/terraform/modules/account/main.tf

@@ -39,6 +39,7 @@ locals {
     disableServiceLinkedRolesCreation = var.service_linked_roles == "tf"
     supportRoleExpirationDate         = var.support_role_expiration_date
     ecrPublicPrefix                   = var.ecr_public_prefix
+    networkConfiguration              = var.network_configuration
   }
 
   enriched_regional_configs = [

connector/terraform/modules/account/variables.tf

@@ -25,7 +25,7 @@ variable "regional_configs" {
   DESCR
 
   type = list(object({
-    region     = string
+    region = string
 
     s3_access_logging = optional(object({
       target_bucket = string
@@ -54,7 +54,7 @@ variable "network_configuration" {
   DESCR
 
   type     = string
-  default  = "Manual"
+  default  = "Auto"
   nullable = false
 
   validation {

connector/terraform/modules/nat-provision/main.tf

@@ -4,7 +4,7 @@ resource "aws_cloudformation_stack" "this" {
     "/",
     [
       "https://elastio-prod-artifacts-us-east-2.s3.us-east-2.amazonaws.com",
-      "contrib/elastio-nat-provision-lambda/${var.version}",
+      "contrib/elastio-nat-provision-lambda/${var.template_version}",
       "cloudformation-lambda.yaml"
     ]
   )

connector/terraform/modules/nat-provision/outputs.tf

@@ -22,7 +22,7 @@ variable "connector_account_stack" {
 ## Optional parameters ##
 #########################
 
-variable "version" {
+variable "template_version" {
   description = <<DESCR
     Specifies the version of Elastio NAT provision stack to deploy (e.g. `v5`).
 

connector/terraform/modules/nat-provision/variables.tf

@@ -11,7 +11,7 @@ data "aws_region" "current" {}
 locals {
   connector_config = {
     region     = coalesce(var.region, data.aws_region.current.name),
-    account    = data.aws_caller_identity.current.account_id,
+    account_id = data.aws_caller_identity.current.account_id,
     vpc_id     = var.vpc_id
     subnet_ids = var.subnet_ids
   }

connector/terraform/modules/region/main.tf

@@ -59,7 +59,7 @@ variable "vpc_id" {
 
   validation {
     condition = (
-      var.vpc_id == null ? var.connector_account_stack.parameters["networkConfiguration"] == "Auto" : true
+      var.vpc_id == null ? local.network_configuration == "Auto" : true
     )
 
     error_message = <<MSG
@@ -70,7 +70,7 @@ variable "vpc_id" {
 
   validation {
     condition = (
-      var.vpc_id != null ? var.connector_account_stack.parameters["networkConfiguration"] == "Manual" : true
+      var.vpc_id != null ? local.network_configuration == "Manual" : true
     )
 
     error_message = <<-MSG
@@ -93,7 +93,7 @@ variable "subnet_ids" {
 
   validation {
     condition = (
-      length(var.subnet_ids[*]) == 0 ? var.connector_account_stack.parameters["networkConfiguration"] == "Auto" : true
+      length(coalesce(var.subnet_ids, [])) == 0 ? local.network_configuration == "Auto" : true
     )
 
     error_message = <<MSG
@@ -104,7 +104,7 @@ variable "subnet_ids" {
 
   validation {
     condition = (
-      length(var.subnet_ids[*]) > 0 ? var.connector_account_stack.parameters["networkConfiguration"] == "Manual" : true
+      length(coalesce(var.subnet_ids, [])) > 0 ? local.network_configuration == "Manual" : true
     )
 
     error_message = <<-MSG
@@ -113,3 +113,7 @@ variable "subnet_ids" {
     MSG
   }
 }
+
+locals {
+  network_configuration = var.connector_account_stack.parameters["networkConfiguration"]
+}