fix(deps): update terraform-module (#429)

terraform-ibm-modules-ops · renovate-bot · Steve Peggs · web-flow · commit d7bf2fb6f77c · 2023-09-12T06:22:26.000-04:00
* fix(deps): update terraform-module

* fix: observability and CBR changes req for modules

---------

Co-authored-by: Renovate Bot &lt;renovate@whitesourcesoftware.com&gt;
Co-authored-by: Steve Peggs &lt;peggs@uk.ibm.com&gt;
diff --git a/README.md b/README.md
@@ -146,8 +146,8 @@ You need the following permissions to run this module.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_bucket_cbr_rule"></a> [bucket\_cbr\_rule](#module\_bucket\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//cbr-rule-module | 1.2.0 |
-| <a name="module_instance_cbr_rule"></a> [instance\_cbr\_rule](#module\_instance\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//cbr-rule-module | 1.2.0 |
+| <a name="module_bucket_cbr_rule"></a> [bucket\_cbr\_rule](#module\_bucket\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.9.0 |
+| <a name="module_instance_cbr_rule"></a> [instance\_cbr\_rule](#module\_instance\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.9.0 |
 
 ### Resources
 
diff --git a/examples/basic/main.tf b/examples/basic/main.tf
@@ -4,7 +4,7 @@
 
 module "resource_group" {
   source  = "terraform-ibm-modules/resource-group/ibm"
-  version = "1.0.5"
+  version = "1.0.6"
   # if an existing resource group is not set (null) create a new one using prefix
   resource_group_name          = var.resource_group == null ? "${var.prefix}-resource-group" : null
   existing_resource_group_name = var.resource_group
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -4,7 +4,7 @@
 
 module "resource_group" {
   source  = "terraform-ibm-modules/resource-group/ibm"
-  version = "1.0.5"
+  version = "1.0.6"
   # if an existing resource group is not set (null) create a new one using prefix
   resource_group_name          = var.resource_group == null ? "${var.prefix}-resource-group" : null
   existing_resource_group_name = var.resource_group
@@ -39,24 +39,24 @@ locals {
 # Create Sysdig and Activity Tracker instance
 module "observability_instances" {
   source  = "terraform-ibm-modules/observability-instances/ibm"
-  version = "2.7.0"
+  version = "2.9.0"
   providers = {
     logdna.at = logdna.at
     logdna.ld = logdna.ld
   }
   region                         = var.region
   resource_group_id              = module.resource_group.resource_group_id
-  sysdig_instance_name           = "${var.prefix}-sysdig"
-  sysdig_plan                    = "graduated-tier"
+  cloud_monitoring_instance_name = "${var.prefix}-sysdig"
+  cloud_monitoring_plan          = "graduated-tier"
   enable_platform_logs           = false
   enable_platform_metrics        = false
-  logdna_provision               = false
+  log_analysis_provision         = false
   activity_tracker_instance_name = "${var.prefix}-at"
   activity_tracker_tags          = var.resource_tags
   activity_tracker_plan          = "7-day"
   activity_tracker_provision     = !local.existing_at
-  logdna_tags                    = var.resource_tags
-  sysdig_tags                    = var.resource_tags
+  log_analysis_tags              = var.resource_tags
+  cloud_monitoring_tags          = var.resource_tags
 }
 
 ##############################################################################
@@ -92,8 +92,8 @@ data "ibm_iam_account_settings" "iam_account_settings" {
 # Create CBR Zone
 ##############################################################################
 module "cbr_zone" {
-  source           = "terraform-ibm-modules/cbr/ibm//cbr-zone-module"
-  version          = "1.2.0"
+  source           = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
+  version          = "1.9.0"
   name             = "${var.prefix}-VPC-network-zone"
   zone_description = "CBR Network zone containing VPC"
   account_id       = data.ibm_iam_account_settings.iam_account_settings.account_id
@@ -120,7 +120,7 @@ module "cos_bucket1" {
   management_endpoint_type_for_bucket = var.management_endpoint_type_for_bucket
   existing_kms_instance_guid          = module.key_protect_all_inclusive.key_protect_guid
   kms_key_crn                         = module.key_protect_all_inclusive.keys["${local.key_ring_name}.${local.key_name}"].crn
-  sysdig_crn                          = module.observability_instances.sysdig_crn
+  sysdig_crn                          = module.observability_instances.cloud_monitoring_crn
   # disable retention for test environments - enable for stage/prod
   retention_enabled    = false
   activity_tracker_crn = local.at_crn
@@ -185,7 +185,7 @@ module "cos_bucket2" {
   region                              = null
   cross_region_location               = var.cross_region_location
   archive_days                        = null
-  sysdig_crn                          = module.observability_instances.sysdig_crn
+  sysdig_crn                          = module.observability_instances.cloud_monitoring_crn
   activity_tracker_crn                = local.at_crn
   create_cos_instance                 = false
   existing_cos_instance_id            = module.cos_bucket1.cos_instance_id
diff --git a/examples/complete/providers.tf b/examples/complete/providers.tf
@@ -30,6 +30,6 @@ provider "logdna" {
 
 provider "logdna" {
   alias      = "ld"
-  servicekey = module.observability_instances.logdna_resource_key != null ? module.observability_instances.logdna_resource_key : ""
+  servicekey = module.observability_instances.log_analysis_resource_key != null ? module.observability_instances.log_analysis_resource_key : ""
   url        = local.at_endpoint
 }
diff --git a/examples/existing-resources/main.tf b/examples/existing-resources/main.tf
@@ -4,7 +4,7 @@
 
 module "resource_group" {
   source  = "terraform-ibm-modules/resource-group/ibm"
-  version = "1.0.5"
+  version = "1.0.6"
   # if an existing resource group is not set (null) create a new one using prefix
   resource_group_name          = var.resource_group == null ? "${var.prefix}-resource-group" : null
   existing_resource_group_name = var.resource_group
diff --git a/examples/fscloud/main.tf b/examples/fscloud/main.tf
@@ -4,7 +4,7 @@
 
 module "resource_group" {
   source  = "terraform-ibm-modules/resource-group/ibm"
-  version = "1.0.5"
+  version = "1.0.6"
   # if an existing resource group is not set (null) create a new one using prefix
   resource_group_name          = var.resource_group == null ? "${var.prefix}-resource-group" : null
   existing_resource_group_name = var.resource_group
@@ -39,24 +39,24 @@ locals {
 # Create Sysdig and Activity Tracker instance
 module "observability_instances" {
   source  = "terraform-ibm-modules/observability-instances/ibm"
-  version = "2.7.0"
+  version = "2.9.0"
   providers = {
     logdna.at = logdna.at
     logdna.ld = logdna.ld
   }
   region                         = var.region
   resource_group_id              = module.resource_group.resource_group_id
-  sysdig_instance_name           = "${var.prefix}-sysdig"
-  sysdig_plan                    = "graduated-tier"
+  cloud_monitoring_instance_name = "${var.prefix}-sysdig"
+  cloud_monitoring_plan          = "graduated-tier"
   enable_platform_logs           = false
   enable_platform_metrics        = false
-  logdna_provision               = false
+  log_analysis_provision         = false
   activity_tracker_instance_name = "${var.prefix}-at"
   activity_tracker_tags          = var.resource_tags
   activity_tracker_plan          = "7-day"
   activity_tracker_provision     = !local.existing_at
-  logdna_tags                    = var.resource_tags
-  sysdig_tags                    = var.resource_tags
+  log_analysis_tags              = var.resource_tags
+  cloud_monitoring_tags          = var.resource_tags
 }
 
 ##############################################################################
@@ -70,8 +70,8 @@ data "ibm_iam_account_settings" "iam_account_settings" {
 # Create CBR Zone
 ##############################################################################
 module "cbr_zone" {
-  source           = "terraform-ibm-modules/cbr/ibm//cbr-zone-module"
-  version          = "1.2.0"
+  source           = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
+  version          = "1.9.0"
   name             = "${var.prefix}-VPC-network-zone"
   zone_description = "CBR Network zone containing VPC"
   account_id       = data.ibm_iam_account_settings.iam_account_settings.account_id
@@ -94,7 +94,7 @@ module "cos_fscloud" {
   secondary_existing_hpcs_instance_guid = var.secondary_existing_hpcs_instance_guid
   secondary_region                      = var.secondary_region
   secondary_hpcs_key_crn                = var.secondary_hpcs_key_crn
-  sysdig_crn                            = module.observability_instances.sysdig_crn
+  sysdig_crn                            = module.observability_instances.cloud_monitoring_crn
   activity_tracker_crn                  = local.at_crn
   access_tags                           = var.access_tags
   bucket_cbr_rules = [
diff --git a/examples/fscloud/providers.tf b/examples/fscloud/providers.tf
@@ -15,6 +15,6 @@ provider "logdna" {
 
 provider "logdna" {
   alias      = "ld"
-  servicekey = module.observability_instances.logdna_resource_key != null ? module.observability_instances.logdna_resource_key : ""
+  servicekey = module.observability_instances.log_analysis_resource_key != null ? module.observability_instances.log_analysis_resource_key : ""
   url        = local.at_endpoint
 }
diff --git a/examples/one-rate-plan/main.tf b/examples/one-rate-plan/main.tf
@@ -4,7 +4,7 @@
 
 module "resource_group" {
   source  = "terraform-ibm-modules/resource-group/ibm"
-  version = "1.0.5"
+  version = "1.0.6"
   # if an existing resource group is not set (null) create a new one using prefix
   resource_group_name          = var.resource_group == null ? "${var.prefix}-resource-group" : null
   existing_resource_group_name = var.resource_group
diff --git a/examples/replication/main.tf b/examples/replication/main.tf
@@ -4,7 +4,7 @@
 
 module "resource_group" {
   source  = "terraform-ibm-modules/resource-group/ibm"
-  version = "1.0.5"
+  version = "1.0.6"
   # if an existing resource group is not set (null) create a new one using prefix
   resource_group_name          = var.resource_group == null ? "${var.prefix}-resource-group" : null
   existing_resource_group_name = var.resource_group
diff --git a/main.tf b/main.tf
@@ -268,8 +268,8 @@ locals {
 
 module "bucket_cbr_rule" {
   count            = (length(var.bucket_cbr_rules) > 0 && var.create_cos_bucket) ? length(var.bucket_cbr_rules) : 0
-  source           = "terraform-ibm-modules/cbr/ibm//cbr-rule-module"
-  version          = "1.2.0"
+  source           = "terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module"
+  version          = "1.9.0"
   rule_description = var.bucket_cbr_rules[count.index].description
   enforcement_mode = var.bucket_cbr_rules[count.index].enforcement_mode
   rule_contexts    = var.bucket_cbr_rules[count.index].rule_contexts
@@ -303,8 +303,8 @@ module "bucket_cbr_rule" {
 
 module "instance_cbr_rule" {
   count            = length(var.instance_cbr_rules)
-  source           = "terraform-ibm-modules/cbr/ibm//cbr-rule-module"
-  version          = "1.2.0"
+  source           = "terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module"
+  version          = "1.9.0"
   rule_description = var.instance_cbr_rules[count.index].description
   enforcement_mode = var.instance_cbr_rules[count.index].enforcement_mode
   rule_contexts    = var.instance_cbr_rules[count.index].rule_contexts
diff --git a/module-metadata.json b/module-metadata.json
@@ -747,8 +747,8 @@
   "module_calls": {
     "bucket_cbr_rule": {
       "name": "bucket_cbr_rule",
-      "source": "terraform-ibm-modules/cbr/ibm//cbr-rule-module",
-      "version": "1.2.0",
+      "source": "terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module",
+      "version": "1.9.0",
       "attributes": {
         "count": "bucket_cbr_rules",
         "enforcement_mode": "bucket_cbr_rules",
@@ -770,7 +770,7 @@
             "name": "ibm"
           },
           "pos": {
-            "filename": ".terraform/modules/bucket_cbr_rule/cbr-rule-module/main.tf",
+            "filename": ".terraform/modules/bucket_cbr_rule/modules/cbr-rule-module/main.tf",
             "line": 7
           }
         }
@@ -782,7 +782,7 @@
           "description": "CBR rule resource instance crn",
           "value": "ibm_cbr_rule.cbr_rule.crn",
           "pos": {
-            "filename": ".terraform/modules/bucket_cbr_rule/cbr-rule-module/outputs.tf",
+            "filename": ".terraform/modules/bucket_cbr_rule/modules/cbr-rule-module/outputs.tf",
             "line": 15
           },
           "type": "TypeString",
@@ -793,7 +793,7 @@
           "description": "CBR rule resource instance description",
           "value": "ibm_cbr_rule.cbr_rule.description",
           "pos": {
-            "filename": ".terraform/modules/bucket_cbr_rule/cbr-rule-module/outputs.tf",
+            "filename": ".terraform/modules/bucket_cbr_rule/modules/cbr-rule-module/outputs.tf",
             "line": 5
           },
           "type": "TypeString"
@@ -803,7 +803,7 @@
           "description": "CBR rule resource href",
           "value": "ibm_cbr_rule.cbr_rule.href",
           "pos": {
-            "filename": ".terraform/modules/bucket_cbr_rule/cbr-rule-module/outputs.tf",
+            "filename": ".terraform/modules/bucket_cbr_rule/modules/cbr-rule-module/outputs.tf",
             "line": 20
           },
           "type": "TypeString"
@@ -813,7 +813,7 @@
           "description": "CBR rule resource instance id",
           "value": "ibm_cbr_rule.cbr_rule.id",
           "pos": {
-            "filename": ".terraform/modules/bucket_cbr_rule/cbr-rule-module/outputs.tf",
+            "filename": ".terraform/modules/bucket_cbr_rule/modules/cbr-rule-module/outputs.tf",
             "line": 10
           }
         }
@@ -825,8 +825,8 @@
     },
     "instance_cbr_rule": {
       "name": "instance_cbr_rule",
-      "source": "terraform-ibm-modules/cbr/ibm//cbr-rule-module",
-      "version": "1.2.0",
+      "source": "terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module",
+      "version": "1.9.0",
       "attributes": {
         "count": "instance_cbr_rules",
         "enforcement_mode": "instance_cbr_rules",
@@ -848,7 +848,7 @@
             "name": "ibm"
           },
           "pos": {
-            "filename": ".terraform/modules/instance_cbr_rule/cbr-rule-module/main.tf",
+            "filename": ".terraform/modules/instance_cbr_rule/modules/cbr-rule-module/main.tf",
             "line": 7
           }
         }
@@ -860,7 +860,7 @@
           "description": "CBR rule resource instance crn",
           "value": "ibm_cbr_rule.cbr_rule.crn",
           "pos": {
-            "filename": ".terraform/modules/instance_cbr_rule/cbr-rule-module/outputs.tf",
+            "filename": ".terraform/modules/instance_cbr_rule/modules/cbr-rule-module/outputs.tf",
             "line": 15
           },
           "type": "TypeString",
@@ -871,7 +871,7 @@
           "description": "CBR rule resource instance description",
           "value": "ibm_cbr_rule.cbr_rule.description",
           "pos": {
-            "filename": ".terraform/modules/instance_cbr_rule/cbr-rule-module/outputs.tf",
+            "filename": ".terraform/modules/instance_cbr_rule/modules/cbr-rule-module/outputs.tf",
             "line": 5
           },
           "type": "TypeString"
@@ -881,7 +881,7 @@
           "description": "CBR rule resource href",
           "value": "ibm_cbr_rule.cbr_rule.href",
           "pos": {
-            "filename": ".terraform/modules/instance_cbr_rule/cbr-rule-module/outputs.tf",
+            "filename": ".terraform/modules/instance_cbr_rule/modules/cbr-rule-module/outputs.tf",
             "line": 20
           },
           "type": "TypeString"
@@ -891,7 +891,7 @@
           "description": "CBR rule resource instance id",
           "value": "ibm_cbr_rule.cbr_rule.id",
           "pos": {
-            "filename": ".terraform/modules/instance_cbr_rule/cbr-rule-module/outputs.tf",
+            "filename": ".terraform/modules/instance_cbr_rule/modules/cbr-rule-module/outputs.tf",
             "line": 10
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ provider "logdna" {`
`30`	`30`
`31`	`31`	`provider "logdna" {`
`32`	`32`	`alias = "ld"`
`33`		`- servicekey = module.observability_instances.logdna_resource_key != null ? module.observability_instances.logdna_resource_key : ""`
	`33`	`+ servicekey = module.observability_instances.log_analysis_resource_key != null ? module.observability_instances.log_analysis_resource_key : ""`
`34`	`34`	`url = local.at_endpoint`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ provider "logdna" {`
`15`	`15`
`16`	`16`	`provider "logdna" {`
`17`	`17`	`alias = "ld"`
`18`		`- servicekey = module.observability_instances.logdna_resource_key != null ? module.observability_instances.logdna_resource_key : ""`
	`18`	`+ servicekey = module.observability_instances.log_analysis_resource_key != null ? module.observability_instances.log_analysis_resource_key : ""`
`19`	`19`	`url = local.at_endpoint`
`20`	`20`	`}`