Skip to content

Commit 54a3c60

Browse files
committed
fix: pre-commit format fixes post conflict merge
1 parent da7480f commit 54a3c60

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

ibm_catalog.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
"key": "existing_rabbitmq_instance_crn"
335335
},
336336
{
337-
"key": "configuration"
337+
"key": "configuration"
338338
}
339339
]
340340
}

main.tf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,14 @@ resource "time_sleep" "wait_for_backup_kms_authorization_policy" {
165165
########################################################################################################################
166166

167167
resource "ibm_database" "rabbitmq_database" {
168-
depends_on = [time_sleep.wait_for_authorization_policy, time_sleep.wait_for_backup_kms_authorization_policy]
169-
name = var.name
170-
plan = var.plan
171-
location = var.region
172-
service = "messages-for-rabbitmq"
173-
version = var.rabbitmq_version
174-
resource_group_id = var.resource_group_id
175-
service_endpoints = var.service_endpoints
168+
depends_on = [time_sleep.wait_for_authorization_policy, time_sleep.wait_for_backup_kms_authorization_policy]
169+
name = var.name
170+
plan = var.plan
171+
location = var.region
172+
service = "messages-for-rabbitmq"
173+
version = var.rabbitmq_version
174+
resource_group_id = var.resource_group_id
175+
service_endpoints = var.service_endpoints
176176
# remove elements with null values: see https://github.com/terraform-ibm-modules/terraform-ibm-icd-postgresql/issues/273
177177
configuration = var.configuration != null ? jsonencode({ for k, v in var.configuration : k => v if v != null }) : null
178178
tags = var.tags

0 commit comments

Comments
 (0)