Skip to content

Commit 049883b

Browse files
terraform-ibm-modules-opsSteve Peggs
andauthored
fix(deps): update terraform-module (#336)
* fix(deps): update terraform-module * fix: inputs and outputs on kms * fix: revert landing-zone-vpc bump * SKIP UPGRADE TEST --------- Co-authored-by: Steve Peggs <peggs@uk.ibm.com>
1 parent c00858c commit 049883b

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ To attach access management tags to resources in this module, you need the follo
6565

6666
| Name | Source | Version |
6767
|------|--------|---------|
68-
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.17.1 |
68+
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.18.0 |
6969

7070
### Resources
7171

examples/complete/main.tf

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,23 @@ module "resource_group" {
1616

1717
module "key_protect_all_inclusive" {
1818
source = "terraform-ibm-modules/key-protect-all-inclusive/ibm"
19-
version = "4.4.2"
19+
version = "4.6.0"
2020
resource_group_id = module.resource_group.resource_group_id
2121
# Note: Database instance and Key Protect must be created in the same region when using BYOK
2222
# See https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-key-protect&interface=ui#key-byok
2323
region = var.region
2424
key_protect_instance_name = "${var.prefix}-kp"
2525
resource_tags = var.resource_tags
26-
key_map = { "icd-pg" = ["${var.prefix}-pg"] }
26+
keys = [
27+
{
28+
key_ring_name = "icd-pg"
29+
keys = [
30+
{
31+
key_name = "${var.prefix}-pg"
32+
}
33+
]
34+
}
35+
]
2736
}
2837

2938
##############################################################################
@@ -68,7 +77,7 @@ resource "time_sleep" "wait_30_seconds" {
6877

6978
module "cbr_zone" {
7079
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
71-
version = "1.17.1"
80+
version = "1.18.0"
7281
name = "${var.prefix}-VPC-network-zone"
7382
zone_description = "CBR Network zone representing VPC"
7483
account_id = data.ibm_iam_account_settings.iam_account_settings.account_id
@@ -92,7 +101,7 @@ module "postgresql_db" {
92101
users = var.users
93102
kms_encryption_enabled = true
94103
kms_key_crn = module.key_protect_all_inclusive.keys["icd-pg.${var.prefix}-pg"].crn
95-
existing_kms_instance_guid = module.key_protect_all_inclusive.key_protect_guid
104+
existing_kms_instance_guid = module.key_protect_all_inclusive.kms_guid
96105
resource_tags = var.resource_tags
97106
service_credential_names = var.service_credential_names
98107
access_tags = var.access_tags
@@ -131,7 +140,7 @@ resource "time_sleep" "wait_120_seconds" {
131140

132141
module "vpe" {
133142
source = "terraform-ibm-modules/vpe-gateway/ibm"
134-
version = "4.1.0"
143+
version = "4.1.1"
135144
prefix = "vpe-to-pg"
136145
cloud_service_by_crn = [
137146
{

examples/fscloud/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ resource "ibm_is_subnet" "testacc_subnet" {
3939
##############################################################################
4040
module "cbr_zone" {
4141
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
42-
version = "1.17.1"
42+
version = "1.18.0"
4343
name = "${var.prefix}-VPC-network-zone"
4444
zone_description = "CBR Network zone representing VPC"
4545
account_id = data.ibm_iam_account_settings.iam_account_settings.account_id

main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ resource "ibm_resource_tag" "postgresql_tag" {
153153
module "cbr_rule" {
154154
count = length(var.cbr_rules) > 0 ? length(var.cbr_rules) : 0
155155
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module"
156-
version = "1.17.1"
156+
version = "1.18.0"
157157
rule_description = var.cbr_rules[count.index].description
158158
enforcement_mode = var.cbr_rules[count.index].enforcement_mode
159159
rule_contexts = var.cbr_rules[count.index].rule_contexts

0 commit comments

Comments
 (0)