Adds dependency on cos_bucket for flow_log_cos_bucket_name (#25)

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

Author: Sean Sundberg

main.tf

@@ -108,13 +108,13 @@ resource ibm_is_security_group_rule private_dns_2 {
 }
 
 resource ibm_is_flow_log flowlog_instance {
-  count = length(var.flow-log-cos-bucket-name) > 0 ? 1 : 0
+  count = length(var.flow_log_cos_bucket_name) > 0 ? 1 : 0
   depends_on = [ibm_is_vpc.vpc]
   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
+  storage_bucket = var.flow_log_cos_bucket_name
 }
 

module.yaml

@@ -11,6 +11,11 @@ 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
   variables:
     - name: resource_group_id
       moduleRef:
@@ -28,3 +33,8 @@ versions:
       scope: global
     - name: ibmcloud_api_key
       scope: global
+    - name: flow_log_cos_bucket_name
+      moduleRef:
+        id: cos_bucket
+        output: bucket_name
+      optional: true

test/stages/stage3-vpc-flow-log.tf

@@ -13,21 +13,14 @@ resource null_resource print_cos_id {
   }
 }
 
-resource "ibm_iam_authorization_policy" "policy" {
-    source_service_name = "is"
-    source_resource_type = "flow-log-collector"
-    target_service_name = "cloud-object-storage"
-    roles = ["Writer"] 
-}
-
 module "dev_cos_bucket" {
   source = "github.com/cloud-native-toolkit/terraform-ibm-object-storage-bucket.git"
 
   resource_group_name = module.resource_group.name
   cos_instance_id     = module.cos.id
   name_prefix         = var.name_prefix
   ibmcloud_api_key    = var.ibmcloud_api_key
-  name                = "fl-testing-gsi"
+  name                = "fl-testing-gsi2"
   region              = var.region
 }
 
@@ -48,5 +41,5 @@ module "dev_vpc_with_flowlog" {
   name_prefix         = var.name_prefix
   name                = "vpc-with-fl-${module.cos.name}-${length(null_resource.print_bucket)}"
   ibmcloud_api_key    = var.ibmcloud_api_key
-  flow-log-cos-bucket-name = module.dev_cos_bucket.bucket_name
+  flow_log_cos_bucket_name = module.dev_cos_bucket.bucket_name
 }

variables.tf

@@ -36,8 +36,8 @@ variable "provision" {
   default     = true
 }
 
-variable "flow-log-cos-bucket-name" {
+variable "flow_log_cos_bucket_name" {
   type        = string
   description = "Cloud Object Storage bucket id for flow logs (optional)"
   default     = ""
-}
+}