Skip to content

Commit 7515e3a

Browse files
fix(deps): update terraform-module (#10)
* fix(deps): update terraform-module * test: fixed kms module in example to work with new version * chore: ignore upgrade test SKIP UPGRADE TEST This PR has updates to example modules that are causing upgrade test to fail. Manual testing has confirmed these are false-positives and the upgrade is actually clean. --------- Co-authored-by: toddgiguere <[email protected]> Co-authored-by: Todd Giguere <[email protected]>
1 parent 226bcaf commit 7515e3a

File tree

7 files changed

+20
-14
lines changed

7 files changed

+20
-14
lines changed

README.md

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

9393
| Name | Source | Version |
9494
|------|--------|---------|
95-
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.17.1 |
95+
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.19.1 |
9696

9797
### Resources
9898

examples/backup/main.tf

Lines changed: 1 addition & 1 deletion
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.1.4"
7+
version = "1.1.5"
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

examples/basic/main.tf

Lines changed: 1 addition & 1 deletion
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.1.4"
7+
version = "1.1.5"
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

examples/complete/main.tf

Lines changed: 13 additions & 7 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.1.4"
7+
version = "1.1.5"
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
@@ -16,14 +16,20 @@ 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.8.2"
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-mysql" = ["${var.prefix}-my"] }
26+
keys = [
27+
{ key_ring_name = "icd-mysql"
28+
keys = [
29+
{ key_name = "${var.prefix}-my" }
30+
]
31+
}
32+
]
2733
}
2834

2935
##############################################################################
@@ -39,7 +45,7 @@ data "ibm_iam_account_settings" "iam_account_settings" {
3945

4046
module "vpc" {
4147
source = "terraform-ibm-modules/landing-zone-vpc/ibm"
42-
version = "7.13.2"
48+
version = "7.17.1"
4349
resource_group_id = module.resource_group.resource_group_id
4450
region = var.region
4551
prefix = var.prefix
@@ -68,7 +74,7 @@ resource "time_sleep" "wait_30_seconds" {
6874

6975
module "cbr_zone" {
7076
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
71-
version = "1.17.1"
77+
version = "1.19.1"
7278
name = "${var.prefix}-VPC-network-zone"
7379
zone_description = "CBR Network zone representing VPC"
7480
account_id = data.ibm_iam_account_settings.iam_account_settings.account_id
@@ -92,7 +98,7 @@ module "mysql_db" {
9298
users = var.users
9399
kms_encryption_enabled = true
94100
kms_key_crn = module.key_protect_all_inclusive.keys["icd-mysql.${var.prefix}-my"].crn
95-
existing_kms_instance_guid = module.key_protect_all_inclusive.key_protect_guid
101+
existing_kms_instance_guid = module.key_protect_all_inclusive.kms_guid
96102
resource_tags = var.resource_tags
97103
service_credential_names = var.service_credential_names
98104
access_tags = var.access_tags
@@ -131,7 +137,7 @@ resource "time_sleep" "wait_120_seconds" {
131137

132138
module "vpe" {
133139
source = "terraform-ibm-modules/vpe-gateway/ibm"
134-
version = "4.1.0"
140+
version = "4.1.1"
135141
prefix = "vpe-to-my"
136142
cloud_service_by_crn = [
137143
{

examples/fscloud/main.tf

Lines changed: 2 additions & 2 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.1.4"
7+
version = "1.1.5"
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
@@ -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.19.1"
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

examples/pitr/main.tf

Lines changed: 1 addition & 1 deletion
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.1.4"
7+
version = "1.1.5"
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

main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ resource "ibm_resource_tag" "mysql_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.19.1"
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)