Skip to content

Commit e42f365

Browse files
terraform-ibm-modules-opsmaheshwarishikhaShikha Maheshwari
authored
fix(deps): update terraform dependencies (#392)
* fix(deps): update terraform dependencies * fix: Update event_notification input to match with cloud_logs inputs (#423) * fix precommit --------- Co-authored-by: Shikha Maheshwari <[email protected]> Co-authored-by: Shikha Maheshwari <[email protected]>
1 parent 64a2bcd commit e42f365

File tree

5 files changed

+22
-30
lines changed

5 files changed

+22
-30
lines changed

solutions/agents/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ data "ibm_container_cluster_config" "cluster_config" {
1414

1515
module "observability_agents" {
1616
source = "terraform-ibm-modules/observability-agents/ibm"
17-
version = "2.7.3"
17+
version = "2.8.3"
1818
cluster_id = var.cluster_id
1919
cluster_resource_group_id = var.cluster_resource_group_id
2020
cluster_config_endpoint_type = var.cluster_config_endpoint_type

solutions/instances/main.tf

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ locals {
166166

167167
module "resource_group" {
168168
source = "terraform-ibm-modules/resource-group/ibm"
169-
version = "1.2.0"
169+
version = "1.2.1"
170170
resource_group_name = var.use_existing_resource_group == false ? (try("${local.prefix}-${var.resource_group_name}", var.resource_group_name)) : null
171171
existing_resource_group_name = var.use_existing_resource_group == true ? var.resource_group_name : null
172172
}
@@ -177,7 +177,7 @@ module "cos_resource_group" {
177177
ibm = ibm.cos
178178
}
179179
source = "terraform-ibm-modules/resource-group/ibm"
180-
version = "1.2.0"
180+
version = "1.2.1"
181181
resource_group_name = try("${local.prefix}-${var.cos_resource_group_name}", var.cos_resource_group_name)
182182
}
183183

@@ -235,24 +235,17 @@ resource "ibm_iam_authorization_policy" "cos_policy" {
235235
}
236236
}
237237

238-
module "en_crn_parser" {
239-
count = length(local.cloud_logs_existing_en_instances)
240-
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
241-
version = "1.1.0"
242-
crn = local.cloud_logs_existing_en_instances[count.index]["instance_crn"]
243-
}
244-
245238
module "cloud_monitoring_crn_parser" {
246239
count = var.existing_cloud_monitoring_crn != null ? 1 : 0
247240
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
248-
version = "1.1.0"
241+
version = "1.2.0"
249242
crn = var.existing_cloud_monitoring_crn
250243
}
251244

252245
module "cloud_monitoring" {
253246
count = var.cloud_monitoring_provision ? 1 : 0
254247
source = "terraform-ibm-modules/cloud-monitoring/ibm"
255-
version = "1.2.13"
248+
version = "1.4.0"
256249
region = var.region
257250
resource_group_id = module.resource_group.resource_group_id
258251
instance_name = local.cloud_monitoring_instance_name
@@ -266,7 +259,7 @@ module "cloud_monitoring" {
266259
module "cloud_logs" {
267260
count = var.cloud_logs_provision ? 1 : 0
268261
source = "terraform-ibm-modules/cloud-logs/ibm"
269-
version = "1.3.8"
262+
version = "1.5.6"
270263
region = var.region
271264
resource_group_id = module.resource_group.resource_group_id
272265
instance_name = local.cloud_logs_instance_name
@@ -300,10 +293,9 @@ module "cloud_logs" {
300293
}
301294
} : null
302295
existing_event_notifications_instances = [for index, _ in local.cloud_logs_existing_en_instances : {
303-
en_instance_id = module.en_crn_parser[index]["service_instance"]
304-
en_region = module.en_crn_parser[index]["region"]
305-
en_integration_name = try("${local.prefix}-${local.cloud_logs_existing_en_instances[index]["integration_name"]}", local.cloud_logs_existing_en_instances[index]["integration_name"])
306-
skip_en_auth_policy = local.cloud_logs_existing_en_instances[index]["skip_en_auth_policy"]
296+
crn = local.cloud_logs_existing_en_instances[index]["instance_crn"]
297+
integration_name = try("${local.prefix}-${local.cloud_logs_existing_en_instances[index]["integration_name"]}", local.cloud_logs_existing_en_instances[index]["integration_name"])
298+
skip_iam_auth_policy = local.cloud_logs_existing_en_instances[index]["skip_en_auth_policy"]
307299
}]
308300
logs_routing_tenant_regions = var.logs_routing_tenant_regions
309301
skip_logs_routing_auth_policy = var.skip_logs_routing_auth_policy
@@ -312,7 +304,7 @@ module "cloud_logs" {
312304

313305
module "metrics_router" {
314306
source = "terraform-ibm-modules/cloud-monitoring/ibm//modules/metrics_routing"
315-
version = "1.2.13"
307+
version = "1.4.0"
316308
metrics_router_targets = var.enable_metrics_routing_to_cloud_monitoring ? [
317309
{
318310
destination_crn = var.cloud_monitoring_provision ? module.cloud_monitoring[0].crn : var.existing_cloud_monitoring_crn
@@ -328,7 +320,7 @@ module "metrics_router" {
328320
module "activity_tracker" {
329321
depends_on = [time_sleep.wait_for_atracker_cos_authorization_policy]
330322
source = "terraform-ibm-modules/activity-tracker/ibm"
331-
version = "1.0.0"
323+
version = "1.1.4"
332324
cos_targets = var.enable_at_event_routing_to_cos_bucket ? [
333325
{
334326
bucket_name = local.cos_target_bucket_name
@@ -374,7 +366,7 @@ resource "ibm_iam_authorization_policy" "atracker_cos" {
374366
module "kms_instance_crn_parser" {
375367
count = var.existing_kms_instance_crn != null ? 1 : 0
376368
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
377-
version = "1.1.0"
369+
version = "1.2.0"
378370
crn = var.existing_kms_instance_crn
379371
}
380372

@@ -384,7 +376,7 @@ module "kms" {
384376
}
385377
count = (var.existing_cos_kms_key_crn != null || (length(coalesce(local.buckets_config, [])) == 0)) ? 0 : 1 # no need to create any KMS resources if passing an existing key, or bucket
386378
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
387-
version = "5.1.7"
379+
version = "5.1.11"
388380
create_key_protect_instance = false
389381
region = local.kms_region
390382
existing_kms_instance_crn = var.existing_kms_instance_crn

solutions/logs-routing/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module "icl_crn_parser" {
22
for_each = { for idx, tenant in var.tenant_configuration : idx => tenant }
33
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
4-
version = "1.1.0"
4+
version = "1.2.0"
55
crn = each.value.log_sink_crn
66
}
77

tests/resources/existing-resources/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
module "resource_group" {
66
source = "terraform-ibm-modules/resource-group/ibm"
7-
version = "1.2.0"
7+
version = "1.2.1"
88
# if an existing resource group is not set (null) create a new one using prefix
99
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
1010
existing_resource_group_name = var.resource_group
@@ -62,7 +62,7 @@ module "cloud_log_buckets" {
6262

6363
module "cloud_monitoring" {
6464
source = "terraform-ibm-modules/cloud-monitoring/ibm"
65-
version = "1.2.13"
65+
version = "1.4.0"
6666
region = var.region
6767
resource_group_id = module.resource_group.resource_group_id
6868
instance_name = var.prefix
@@ -76,7 +76,7 @@ module "cloud_monitoring" {
7676

7777
module "event_notification_1" {
7878
source = "terraform-ibm-modules/event-notifications/ibm"
79-
version = "2.3.7"
79+
version = "2.4.19"
8080
resource_group_id = module.resource_group.resource_group_id
8181
name = "${var.prefix}-en-1"
8282
tags = var.resource_tags
@@ -87,7 +87,7 @@ module "event_notification_1" {
8787

8888
module "event_notification_2" {
8989
source = "terraform-ibm-modules/event-notifications/ibm"
90-
version = "2.3.7"
90+
version = "2.4.19"
9191
resource_group_id = module.resource_group.resource_group_id
9292
name = "${var.prefix}-en-2"
9393
tags = var.resource_tags

tests/resources/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
module "resource_group" {
66
source = "terraform-ibm-modules/resource-group/ibm"
7-
version = "1.2.0"
7+
version = "1.2.1"
88
# if an existing resource group is not set (null) create a new one using prefix
99
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
1010
existing_resource_group_name = var.resource_group
@@ -86,7 +86,7 @@ module "buckets" {
8686

8787
module "cloud_monitoring" {
8888
source = "terraform-ibm-modules/cloud-monitoring/ibm"
89-
version = "1.2.13"
89+
version = "1.4.0"
9090
region = var.region
9191
resource_group_id = module.resource_group.resource_group_id
9292
instance_name = var.prefix
@@ -96,7 +96,7 @@ module "cloud_monitoring" {
9696

9797
module "cloud_logs" {
9898
source = "terraform-ibm-modules/cloud-logs/ibm"
99-
version = "1.3.8"
99+
version = "1.5.6"
100100
region = var.region
101101
resource_group_id = module.resource_group.resource_group_id
102102
instance_name = var.prefix
@@ -178,7 +178,7 @@ locals {
178178

179179
module "ocp_base" {
180180
source = "terraform-ibm-modules/base-ocp-vpc/ibm"
181-
version = "3.49.0"
181+
version = "3.52.0"
182182
resource_group_id = module.resource_group.resource_group_id
183183
region = var.region
184184
tags = var.resource_tags

0 commit comments

Comments
 (0)