Moves flow-log logic and variables to separate module (#32)

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

Author: Sean Sundberg

main.tf

@@ -14,15 +14,6 @@ locals {
   provision_cidr     = var.provision && local.ipv4_cidr_provided
 }
 
-resource null_resource print_values {
-  provisioner "local-exec" {
-    command = "echo 'Bucket name: ${var.flow_log_cos_bucket_name != null ? var.flow_log_cos_bucket_name : ""}'"
-  }
-  provisioner "local-exec" {
-    command = "echo 'Auth policy id: ${var.auth_id}'"
-  }
-}
-
 resource ibm_is_vpc vpc {
   count = var.provision ? 1 : 0
 
@@ -128,16 +119,3 @@ resource ibm_is_security_group_rule private_dns_2 {
     port_max = 53
   }
 }
-
-resource ibm_is_flow_log flowlog_instance {
-  count = length(var.flow_log_cos_bucket_name) > 0 ? 1 : 0
-  depends_on = [ibm_is_vpc.vpc, null_resource.print_values]
-
-  name = "${local.vpc_name}-flowlog"
-  active = true
-  //target can be VPC or Virtual Server Instance or Subnet or Primary Network Interface or Secondary Network Interface 
-  target = data.ibm_is_vpc.vpc.id
-  resource_group = var.resource_group_id
-  storage_bucket = var.flow_log_cos_bucket_name
-}
-

module.yaml

@@ -11,14 +11,6 @@ versions:
       refs:
         - source: github.com/cloud-native-toolkit/terraform-ibm-resource-group
           version: ">= 2.1.0"
-    - id: cos_bucket
-      refs:
-        - source: github.com/cloud-native-toolkit/terraform-ibm-object-storage-bucket
-          version: ">= 0.0.1"
-      optional: true
-    - id: auth
-      refs: []
-      optional: true
   variables:
     - name: resource_group_id
       moduleRef:
@@ -36,13 +28,3 @@ versions:
       scope: global
     - name: ibmcloud_api_key
       scope: global
-    - name: flow_log_cos_bucket_name
-      moduleRef:
-        id: cos_bucket
-        output: bucket_name
-      optional: true
-    - name: auth_id
-      moduleRef:
-        id: auth
-        output: id
-      optional: true

test/stages/stage1-cos.tf

@@ -8,6 +8,4 @@ module "dev_vpc" {
   ibmcloud_api_key    = var.ibmcloud_api_key
   address_prefix_count = var.address_prefix_count
   address_prefixes = tolist(setsubtract(split(",", var.address_prefixes), [""]))
-  auth_id             = module.flow-log-auth.id
-  flow_log_cos_bucket_name = module.dev_cos_bucket.bucket_name
 }

test/stages/stage1-flow-log-auth.tf

@@ -36,12 +36,6 @@ variable "provision" {
   default     = true
 }
 
-variable "flow_log_cos_bucket_name" {
-  type        = string
-  description = "Cloud Object Storage bucket id for flow logs (optional)"
-  default     = ""
-}
-
 variable "address_prefix_count" {
   type        = number
   description = "The number of ipv4_cidr_blocks"
@@ -53,9 +47,3 @@ variable "address_prefixes" {
   description = "List of ipv4 cidr blocks for the address prefixes (e.g. ['10.10.10.0/24']). If you are providing cidr blocks then a value must be provided for each of the subnets. If you don't provide cidr blocks for each of the subnets then values will be generated using the {ipv4_address_count} value."
   default     = []
 }
-
-variable "auth_id" {
-  type        = string
-  description = "The id of the authorization policy that allows the Flow Log to access the Object Storage bucket. This is optional and provided to sequence the authorization before the flow log creation."
-  default     = ""
-}