OCTOPUS-534: refactor the subnet layout and resource group usage so i…

…t fails early with a relevant message

Signed-off-by: Paul Bastide <[email protected]>

modules/0_vpc/vpc.tf

@@ -10,6 +10,17 @@
 # Dev Note: This is the file where the VPC should be created in the future.
 # The code should follow the checks, and conditionally create the vpc.
 # outputs need to be updated and passed back to the user.
+### create
+module "create" {
+  count = var.vpc_create ? 1 : 0
+  providers = {
+    ibm = ibm
+  }
+  source = "./create"
+
+  vpc_name           = var.vpc_name
+  vpc_resource_group = var.vpc_resource_group
+}
 
 module "reuse" {
   count = var.vpc_create ? 0 : 1
@@ -25,17 +36,4 @@ module "reuse" {
   powervs_region        = var.powervs_region
   powervs_zone          = var.powervs_zone
   override_region_check = var.override_region_check
-}
-
-
-### create
-module "create" {
-  count = var.vpc_create ? 1 : 0
-  providers = {
-    ibm = ibm
-  }
-  source = "./create"
-
-  vpc_name           = var.vpc_name
-  vpc_resource_group = var.vpc_resource_group
 }

modules/1_vpc_prepare/subnets.tf

@@ -53,7 +53,6 @@ resource "ibm_is_subnet_public_gateway_attachment" "attach_pg_worker_zone_1" {
 }
 
 ### Zone 2
-
 resource "ibm_is_vpc_address_prefix" "address_prefix_worker_zone_2" {
   count = var.create_custom_subnet ? 1 : 0
   cidr  = "10.0.2.0/24"