Removes resource_group_id variable (#51)

* Removes resource_group_id variable
* Adds enabled to the output

Signed-off-by: Sean Sundberg <[email protected]>

Author: Sean Sundberg

main.tf

@@ -17,11 +17,23 @@ locals {
   vpc               = try(var.enabled ? data.ibm_is_vpc.vpc[0] : tomap(false), {})
 }
 
+resource null_resource print_names {
+  provisioner "local-exec" {
+    command = "echo 'Resource group: ${var.resource_group_name}'"
+  }
+}
+
+data ibm_resource_group resource_group {
+  depends_on = [null_resource.print_names]
+
+  name = var.resource_group_name
+}
+
 resource ibm_is_vpc vpc {
   count = var.provision && var.enabled ? 1 : 0
 
   name                        = local.vpc_name
-  resource_group              = var.resource_group_id
+  resource_group              = data.ibm_resource_group.resource_group.id
   address_prefix_management   = local.ipv4_cidr_provided ? "manual" : "auto"
   default_security_group_name = "${local.vpc_name}-default"
   default_network_acl_name    = "${local.vpc_name}-default"
@@ -120,7 +132,7 @@ resource ibm_is_security_group base {
 
   name = local.base_security_group_name
   vpc  = lookup(local.vpc, "id", "")
-  resource_group = var.resource_group_id
+  resource_group = data.ibm_resource_group.resource_group.id
 }
 
 data ibm_is_security_group base {

module.yaml

@@ -17,10 +17,6 @@ versions:
         - source: github.com/cloud-native-toolkit/terraform-ibm-resource-group
           version: ">= 2.1.0"
   variables:
-    - name: resource_group_id
-      moduleRef:
-        id: resource_group
-        output: id
     - name: resource_group_name
       moduleRef:
         id: resource_group

outputs.tf

@@ -48,3 +48,8 @@ output "addresses" {
   value = [for obj in lookup(local.vpc, "cse_source_addresses[*]", []): obj.address]
   description = "The ip address ranges for the VPC"
 }
+
+output "enabled" {
+  value = var.enabled
+  description = "Flag indicating that the module will provision resources"
+}

test/stages/stage2-vpc.tf

@@ -1,7 +1,6 @@
 module "dev_vpc" {
   source = "./module"
 
-  resource_group_id    = module.resource_group.id
   resource_group_name  = module.resource_group.name
   region               = var.region
   name_prefix          = var.name_prefix

variables.tf

@@ -1,9 +1,4 @@
 # Resource Group Variables
-variable "resource_group_id" {
-  type        = string
-  description = "The id of the IBM Cloud resource group where the VPC instance will be created."
-}
-
 variable "resource_group_name" {
   type        = string
   description = "The name of the IBM Cloud resource group where the VPC instance will be created."