Skip to content

Commit d102a5e

Browse files
rajatagarwal-ibmrajatagarwal-ibm
committed
Merge branch 'main' of github.com:terraform-ibm-modules/terraform-ibm-secrets-manager
2 parents 6b96129 + fdd0add commit d102a5e

File tree

15 files changed

+37
-29
lines changed

15 files changed

+37
-29
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ You need the following permissions to run this module.
7575

7676
| Name | Source | Version |
7777
|------|--------|---------|
78-
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.31.0 |
79-
| <a name="module_kms_key_crn_parser"></a> [kms\_key\_crn\_parser](#module\_kms\_key\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.1.0 |
78+
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.32.3 |
79+
| <a name="module_kms_key_crn_parser"></a> [kms\_key\_crn\_parser](#module\_kms\_key\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.2.0 |
8080
| <a name="module_secrets"></a> [secrets](#module\_secrets) | ./modules/secrets | n/a |
8181

8282
### Resources

‎common-dev-assets‎

‎examples/basic/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module "resource_group" {
22
source = "terraform-ibm-modules/resource-group/ibm"
3-
version = "1.2.0"
3+
version = "1.2.1"
44
# if an existing resource group is not set (null) create a new one using prefix
55
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
66
existing_resource_group_name = var.resource_group

‎examples/complete/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ This examples handles the provisioning of a new Secrets Manager instance.
1515

1616
| Name | Source | Version |
1717
|------|--------|---------|
18-
| <a name="module_event_notification"></a> [event\_notification](#module\_event\_notification) | terraform-ibm-modules/event-notifications/ibm | 2.3.12 |
19-
| <a name="module_key_protect"></a> [key\_protect](#module\_key\_protect) | terraform-ibm-modules/kms-all-inclusive/ibm | 5.1.7 |
20-
| <a name="module_resource_group"></a> [resource\_group](#module\_resource\_group) | terraform-ibm-modules/resource-group/ibm | 1.2.0 |
18+
| <a name="module_event_notification"></a> [event\_notification](#module\_event\_notification) | terraform-ibm-modules/event-notifications/ibm | 2.4.17 |
19+
| <a name="module_key_protect"></a> [key\_protect](#module\_key\_protect) | terraform-ibm-modules/kms-all-inclusive/ibm | 5.1.11 |
20+
| <a name="module_resource_group"></a> [resource\_group](#module\_resource\_group) | terraform-ibm-modules/resource-group/ibm | 1.2.1 |
2121
| <a name="module_secrets_manager"></a> [secrets\_manager](#module\_secrets\_manager) | ../.. | n/a |
2222

2323
### Resources

‎examples/complete/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module "resource_group" {
22
source = "terraform-ibm-modules/resource-group/ibm"
3-
version = "1.2.0"
3+
version = "1.2.1"
44
# if an existing resource group is not set (null) create a new one using prefix
55
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
66
existing_resource_group_name = var.resource_group
77
}
88

99
module "key_protect" {
1010
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
11-
version = "5.1.7"
11+
version = "5.1.11"
1212
key_protect_instance_name = "${var.prefix}-key-protect"
1313
resource_group_id = module.resource_group.resource_group_id
1414
region = var.region
@@ -27,7 +27,7 @@ module "key_protect" {
2727

2828
module "event_notification" {
2929
source = "terraform-ibm-modules/event-notifications/ibm"
30-
version = "2.3.12"
30+
version = "2.4.17"
3131
resource_group_id = module.resource_group.resource_group_id
3232
name = "${var.prefix}-en"
3333
tags = var.resource_tags

‎examples/fscloud/main.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
##############################################################################
44
module "resource_group" {
55
source = "terraform-ibm-modules/resource-group/ibm"
6-
version = "1.2.0"
6+
version = "1.2.1"
77
# if an existing resource group is not set (null) create a new one using prefix
88
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
99
existing_resource_group_name = var.resource_group
@@ -30,7 +30,7 @@ resource "ibm_is_vpc" "vpc" {
3030
##############################################################################
3131
module "cbr_zone" {
3232
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
33-
version = "1.31.0"
33+
version = "1.32.3"
3434
name = "${var.prefix}-CBR-zone"
3535
zone_description = "CBR Network zone representing VPC"
3636
account_id = data.ibm_iam_account_settings.iam_account_settings.account_id
@@ -42,7 +42,7 @@ module "cbr_zone" {
4242

4343
module "event_notification" {
4444
source = "terraform-ibm-modules/event-notifications/ibm"
45-
version = "2.3.12"
45+
version = "2.4.17"
4646
resource_group_id = module.resource_group.resource_group_id
4747
name = "${var.prefix}-en"
4848
tags = var.resource_tags
@@ -57,7 +57,7 @@ module "event_notification" {
5757

5858
module "kms_key_crn_parser" {
5959
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
60-
version = "1.1.0"
60+
version = "1.2.0"
6161
crn = var.kms_key_crn
6262
}
6363

‎ibm_catalog.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@
110110
"displayname": "Dallas (us-south)",
111111
"value": "us-south"
112112
},
113+
{
114+
"displayname": "Montreal (ca-mon)",
115+
"value": "ca-mon"
116+
},
113117
{
114118
"displayname": "Toronto (ca-tor)",
115119
"value": "ca-tor"
@@ -571,6 +575,10 @@
571575
"displayname": "Dallas (us-south)",
572576
"value": "us-south"
573577
},
578+
{
579+
"displayname": "Montreal (ca-mon)",
580+
"value": "ca-mon"
581+
},
574582
{
575583
"displayname": "Toronto (ca-tor)",
576584
"value": "ca-tor"

‎main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ locals {
8181
module "kms_key_crn_parser" {
8282
count = local.create_kms_auth_policy ? 1 : 0
8383
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
84-
version = "1.1.0"
84+
version = "1.2.0"
8585
crn = var.kms_key_crn
8686
}
8787

@@ -163,7 +163,7 @@ locals {
163163
module "cbr_rule" {
164164
count = length(var.cbr_rules) > 0 ? length(var.cbr_rules) : 0
165165
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module"
166-
version = "1.31.0"
166+
version = "1.32.3"
167167
rule_description = var.cbr_rules[count.index].description
168168
enforcement_mode = var.cbr_rules[count.index].enforcement_mode
169169
rule_contexts = var.cbr_rules[count.index].rule_contexts

‎modules/secrets/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ module "secrets_manager" {
5050

5151
| Name | Source | Version |
5252
|------|--------|---------|
53-
| <a name="module_secret_groups"></a> [secret\_groups](#module\_secret\_groups) | terraform-ibm-modules/secrets-manager-secret-group/ibm | 1.3.7 |
53+
| <a name="module_secret_groups"></a> [secret\_groups](#module\_secret\_groups) | terraform-ibm-modules/secrets-manager-secret-group/ibm | 1.3.10 |
5454
| <a name="module_secrets"></a> [secrets](#module\_secrets) | terraform-ibm-modules/secrets-manager-secret/ibm | 1.7.0 |
5555

5656
### Resources

‎modules/secrets/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ data "ibm_sm_secret_groups" "existing_secret_groups" {
2525
module "secret_groups" {
2626
for_each = { for obj in local.secret_groups : obj.secret_group_name => obj }
2727
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
28-
version = "1.3.7"
28+
version = "1.3.10"
2929
region = var.existing_sm_instance_region
3030
secrets_manager_guid = var.existing_sm_instance_guid
3131
secret_group_name = each.value.secret_group_name

0 commit comments

Comments
 (0)