Update networking module in example (#97)

Author: jnonino

examples/test/main.tf

@@ -1,21 +1,55 @@
 module "base-network" {
-  source                                      = "cn-terraform/networking/aws"
-  version = "2.0.16"
+  source  = "cn-terraform/networking/aws"
+  version = "3.0.0"
 
-  name_prefix                                 = "test-networking"
-  vpc_cidr_block                              = "192.168.0.0/16"
-  availability_zones                          = ["us-east-1a", "us-east-1b", "us-east-1c", "us-east-1d"]
-  public_subnets_cidrs_per_availability_zone  = ["192.168.0.0/19", "192.168.32.0/19", "192.168.64.0/19", "192.168.96.0/19"]
-  private_subnets_cidrs_per_availability_zone = ["192.168.128.0/19", "192.168.160.0/19", "192.168.192.0/19", "192.168.224.0/19"]
+  cidr_block = "192.168.0.0/16"
+
+  public_subnets = {
+    first_public_subnet = {
+      availability_zone = "us-east-1a"
+      cidr_block        = "192.168.0.0/19"
+    }
+    second_public_subnet = {
+      availability_zone = "us-east-1b"
+      cidr_block        = "192.168.32.0/19"
+    }
+    third_public_subnet = {
+      availability_zone = "us-east-1c"
+      cidr_block        = "192.168.64.0/19"
+    }
+    fourth_public_subnet = {
+      availability_zone = "us-east-1d"
+      cidr_block        = "192.168.96.0/19"
+    }
+  }
+
+  private_subnets = {
+    first_private_subnet = {
+      availability_zone = "us-east-1a"
+      cidr_block        = "192.168.128.0/19"
+    }
+    second_private_subnet = {
+      availability_zone = "us-east-1b"
+      cidr_block        = "192.168.160.0/19"
+    }
+    third_private_subnet = {
+      availability_zone = "us-east-1c"
+      cidr_block        = "192.168.192.0/19"
+    }
+    fourth_private_subnet = {
+      availability_zone = "us-east-1d"
+      cidr_block        = "192.168.224.0/19"
+    }
+  }
 }
 
 module "sonar" {
   source              = "../../"
   name_prefix         = "sonar"
   region              = "us-east-1"
   vpc_id              = module.base-network.vpc_id
-  public_subnets_ids  = module.base-network.public_subnets_ids
-  private_subnets_ids = module.base-network.private_subnets_ids
+  public_subnets_ids  = [for subnet in module.base-network.public_subnets : subnet.id]
+  private_subnets_ids = [for subnet in module.base-network.private_subnets : subnet.id]
   db_instance_size    = "db.t3.medium"
   enable_ssl          = false
   lb_https_ports      = {}

main.tf

@@ -8,8 +8,9 @@ locals {
   sonar_db_name           = var.db_name
   sonar_db_username       = var.db_username
   sonar_db_password       = var.db_password == "" ? random_password.master_password.result : var.db_password
-
-  default_certificate_arn = var.default_certificate_arn == "" || var.enable_ssl == true ? module.acm[0].acm_certificate_arn : var.default_certificate_arn
+  default_certificate_arn = (
+    var.default_certificate_arn == "" && var.enable_ssl
+  ) ? try(module.acm[0].acm_certificate_arn, null) : var.default_certificate_arn
 }
 
 #------------------------------------------------------------------------------