Skip to content

Commit 179ad4f

Browse files
rajatagarwal-ibmrajatagarwal-ibm
committed
Merge branch 'main' of github.com:terraform-ibm-modules/terraform-ibm-event-notifications into en-addon-migration
2 parents ade1874 + b53fc14 commit 179ad4f

File tree

18 files changed

+162
-64
lines changed

18 files changed

+162
-64
lines changed

‎.secrets.baseline

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.sum|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2025-05-07T17:56:08Z",
6+
"generated_at": "2025-05-12T16:40:05Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -92,7 +92,7 @@
9292
"hashed_secret": "99046450b7d19bfd57bfe3773719f57af84c7f12",
9393
"is_secret": false,
9494
"is_verified": false,
95-
"line_number": 91,
95+
"line_number": 92,
9696
"type": "Secret Keyword",
9797
"verified_result": null
9898
}
@@ -102,7 +102,7 @@
102102
"hashed_secret": "99046450b7d19bfd57bfe3773719f57af84c7f12",
103103
"is_secret": false,
104104
"is_verified": false,
105-
"line_number": 67,
105+
"line_number": 68,
106106
"type": "Secret Keyword",
107107
"verified_result": null
108108
}

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ To create service credentials, access the Event Notifications service, and acces
108108
| <a name="input_kms_endpoint_url"></a> [kms\_endpoint\_url](#input\_kms\_endpoint\_url) | The URL of the KMS endpoint to use when configuring KMS encryption. The Hyper Protect Crypto Services endpoint URL format can be found at https://cloud.ibm.com/docs/hs-crypto?topic=hs-crypto-regions#new-service-endpoints, and the Key Protect endpoint URL format can be found here https://cloud.ibm.com/docs/key-protect?topic=key-protect-regions#service-endpoints. | `string` | `null` | no |
109109
| <a name="input_name"></a> [name](#input\_name) | The name of the Event Notifications instance that is created by this module. | `string` | n/a | yes |
110110
| <a name="input_plan"></a> [plan](#input\_plan) | The pricing plan of the Event Notifications instance. Possible values: `Lite`, `Standard` | `string` | `"standard"` | no |
111-
| <a name="input_region"></a> [region](#input\_region) | The IBM Cloud region where the Event Notifications resource is created. Possible values: `us-south` (Dallas), `eu-gb` (London), `eu-de` (Frankfurt), `au-syd` (Sydney), `eu-es` (Madrid) | `string` | `"us-south"` | no |
111+
| <a name="input_region"></a> [region](#input\_region) | The IBM Cloud region where the Event Notifications resource is created. Possible values: `jp-osa` (Osaka), `au-syd` (Sydney), `jp-tok` (Tokyo), `eu-de` (Frankfurt), `eu-gb` (London), `eu-es` (Madrid), `eu-fr2` (BNPP), `us-south` (Dallas), `ca-tor` (Toronto), `br-sao` (Sao Paulo) | `string` | `"us-south"` | no |
112112
| <a name="input_resource_group_id"></a> [resource\_group\_id](#input\_resource\_group\_id) | The ID of the resource group where the Event Notifications instance is created. | `string` | n/a | yes |
113113
| <a name="input_root_key_id"></a> [root\_key\_id](#input\_root\_key\_id) | The key ID of a root key, existing in the KMS instance passed in `var.existing_kms_instance_crn`, which will be used to encrypt the data encryption keys which are then used to encrypt the data. Required only if `var.kms_encryption_enabled` is set to `true`. | `string` | `null` | no |
114114
| <a name="input_service_credential_names"></a> [service\_credential\_names](#input\_service\_credential\_names) | The mapping of names and roles for service credentials that you want to create for the Event Notifications instance. | `map(string)` | `{}` | no |

‎examples/complete/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ locals {
2121

2222
module "key_protect_all_inclusive" {
2323
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
24-
version = "5.0.2"
24+
version = "5.1.2"
2525
resource_group_id = module.resource_group.resource_group_id
2626
region = var.region
2727
key_protect_instance_name = "${var.prefix}-kp"
@@ -45,7 +45,7 @@ locals {
4545

4646
module "cos" {
4747
source = "terraform-ibm-modules/cos/ibm"
48-
version = "8.21.20"
48+
version = "8.21.21"
4949
resource_group_id = module.resource_group.resource_group_id
5050
region = var.region
5151
cos_instance_name = "${var.prefix}-cos"

‎examples/fscloud/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ locals {
7777

7878
module "cos" {
7979
source = "terraform-ibm-modules/cos/ibm//modules/fscloud"
80-
version = "8.21.20"
80+
version = "8.21.21"
8181
resource_group_id = module.resource_group.resource_group_id
8282
create_cos_instance = true
8383
cos_instance_name = "${var.prefix}-cos"

‎ibm_catalog.json

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,40 @@
8383
"required": true,
8484
"options": [
8585
{
86+
"displayname": "Osaka (jp-osa)",
87+
"value": "jp-osa"
88+
},
89+
{
90+
"displayname": "Sydney (au-syd)",
8691
"value": "au-syd"
8792
},
8893
{
94+
"displayname": "Tokyo (jp-tok)",
95+
"value": "jp-tok"
96+
},
97+
{
98+
"displayname": "Frankfurt (eu-de)",
8999
"value": "eu-de"
90100
},
91101
{
102+
"displayname": "London (eu-gb)",
92103
"value": "eu-gb"
93104
},
94105
{
106+
"displayname": "Madrid (eu-es)",
95107
"value": "eu-es"
96108
},
97109
{
110+
"displayname": "Dallas (us-south)",
98111
"value": "us-south"
112+
},
113+
{
114+
"displayname": "Toronto (ca-tor)",
115+
"value": "ca-tor"
116+
},
117+
{
118+
"displayname": "Sao Paulo (br-sao)",
119+
"value": "br-sao"
99120
}
100121
]
101122
},
@@ -107,6 +128,9 @@
107128
"key": "kms_endpoint_url",
108129
"required": true
109130
},
131+
{
132+
"key": "existing_monitoring_crn"
133+
},
110134
{
111135
"key": "event_notifications_instance_name"
112136
},
@@ -250,32 +274,58 @@
250274
"required": true,
251275
"options": [
252276
{
277+
"displayname": "Osaka (jp-osa)",
278+
"value": "jp-osa"
279+
},
280+
{
281+
"displayname": "Sydney (au-syd)",
253282
"value": "au-syd"
254283
},
255284
{
285+
"displayname": "Tokyo (jp-tok)",
286+
"value": "jp-tok"
287+
},
288+
{
289+
"displayname": "Frankfurt (eu-de)",
256290
"value": "eu-de"
257291
},
258292
{
293+
"displayname": "London (eu-gb)",
259294
"value": "eu-gb"
260295
},
261296
{
297+
"displayname": "Madrid (eu-es)",
262298
"value": "eu-es"
263299
},
264300
{
301+
"displayname": "Dallas (us-south)",
265302
"value": "us-south"
303+
},
304+
{
305+
"displayname": "Toronto (ca-tor)",
306+
"value": "ca-tor"
307+
},
308+
{
309+
"displayname": "Sao Paulo (br-sao)",
310+
"value": "br-sao"
266311
}
267312
]
268313
},
314+
{
315+
"key": "existing_monitoring_crn"
316+
},
269317
{
270318
"key": "event_notifications_instance_name"
271319
},
272320
{
273321
"key": "service_plan",
274322
"options": [
275323
{
324+
"displayname": "lite",
276325
"value": "lite"
277326
},
278327
{
328+
"displayname": "standard",
279329
"value": "standard"
280330
}
281331
]
@@ -284,9 +334,11 @@
284334
"key": "service_endpoints",
285335
"options": [
286336
{
337+
"displayname": "public",
287338
"value": "public"
288339
},
289340
{
341+
"displayname": "public-and-private",
290342
"value": "public-and-private"
291343
}
292344
]
@@ -317,9 +369,11 @@
317369
"hidden": true,
318370
"options": [
319371
{
372+
"displayname": "public",
320373
"value": "public"
321374
},
322375
{
376+
"displayname": "private",
323377
"value": "private"
324378
}
325379
]
@@ -329,12 +383,15 @@
329383
"hidden": true,
330384
"options": [
331385
{
386+
"displayname": "private",
332387
"value": "private"
333388
},
334389
{
390+
"displayname": "public",
335391
"value": "public"
336392
},
337393
{
394+
"displayname": "public-and-private",
338395
"value": "public-and-private"
339396
}
340397
]
@@ -385,12 +442,15 @@
385442
"key": "management_endpoint_type_for_bucket",
386443
"options": [
387444
{
445+
"displayname": "private",
388446
"value": "private"
389447
},
390448
{
449+
"displayname": "public",
391450
"value": "public"
392451
},
393452
{
453+
"displayname": "direct",
394454
"value": "direct"
395455
}
396456
]
@@ -402,9 +462,11 @@
402462
"key": "existing_secrets_manager_endpoint_type",
403463
"options": [
404464
{
465+
"displayname": "private",
405466
"value": "private"
406467
},
407468
{
469+
"displayname": "public",
408470
"value": "public"
409471
}
410472
]

‎modules/fscloud/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ No resources.
8989
| <a name="input_existing_kms_instance_crn"></a> [existing\_kms\_instance\_crn](#input\_existing\_kms\_instance\_crn) | The CRN of the Hyper Protect Crypto Services or Key Protect instance. To ensure compliance with IBM Cloud Framework for Financial Services standards, it is required to use Hyper Protect Crypto Services only. | `string` | n/a | yes |
9090
| <a name="input_kms_endpoint_url"></a> [kms\_endpoint\_url](#input\_kms\_endpoint\_url) | The KMS endpoint URL to use when you configure KMS encryption. | `string` | n/a | yes |
9191
| <a name="input_name"></a> [name](#input\_name) | The name of the Event Notifications instance that is created by this module. | `string` | n/a | yes |
92-
| <a name="input_region"></a> [region](#input\_region) | The IBM Cloud region where the Event Notifications resource is created. Possible values: `us-south` (Dallas), `eu-gb` (London), `eu-de` (Frankfurt), `au-syd` (Sydney), `eu-es` (Madrid) | `string` | `"us-south"` | no |
92+
| <a name="input_region"></a> [region](#input\_region) | The IBM Cloud region where the Event Notifications resource is created. Possible values: `jp-osa` (Osaka), `au-syd` (Sydney), `jp-tok` (Tokyo), `eu-de` (Frankfurt), `eu-gb` (London), `eu-es` (Madrid), `eu-fr2` (BNPP), `us-south` (Dallas), `ca-tor` (Toronto), `br-sao` (Sao Paulo) | `string` | `"us-south"` | no |
9393
| <a name="input_resource_group_id"></a> [resource\_group\_id](#input\_resource\_group\_id) | The resource group ID to use when creating the Event Notifications instance. | `string` | n/a | yes |
9494
| <a name="input_root_key_id"></a> [root\_key\_id](#input\_root\_key\_id) | The key ID of a root key, existing in the KMS instance passed in `var.existing_kms_instance_crn`, which will be used to encrypt the data encryption keys which are then used to encrypt the data. | `string` | n/a | yes |
9595
| <a name="input_service_credential_names"></a> [service\_credential\_names](#input\_service\_credential\_names) | The mapping of names and roles for service credentials that you want to create for the Event Notifications instance. | `map(string)` | `{}` | no |

‎modules/fscloud/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ variable "access_tags" {
3333

3434
variable "region" {
3535
type = string
36-
description = "The IBM Cloud region where the Event Notifications resource is created. Possible values: `us-south` (Dallas), `eu-gb` (London), `eu-de` (Frankfurt), `au-syd` (Sydney), `eu-es` (Madrid)"
36+
description = "The IBM Cloud region where the Event Notifications resource is created. Possible values: `jp-osa` (Osaka), `au-syd` (Sydney), `jp-tok` (Tokyo), `eu-de` (Frankfurt), `eu-gb` (London), `eu-es` (Madrid), `eu-fr2` (BNPP), `us-south` (Dallas), `ca-tor` (Toronto), `br-sao` (Sao Paulo)"
3737
default = "us-south"
3838
}
3939

‎solutions/fully-configurable/README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ When `existing_en_instance_crn` is passed, this solution ignores ALL other input
3232

3333
| Name | Source | Version |
3434
|------|--------|---------|
35-
| <a name="module_cos_buckets"></a> [cos\_buckets](#module\_cos\_buckets) | terraform-ibm-modules/cos/ibm//modules/buckets | 8.21.8 |
35+
| <a name="module_cos_buckets"></a> [cos\_buckets](#module\_cos\_buckets) | terraform-ibm-modules/cos/ibm//modules/buckets | 8.21.21 |
3636
| <a name="module_cos_kms_key_crn_parser"></a> [cos\_kms\_key\_crn\_parser](#module\_cos\_kms\_key\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.1.0 |
3737
| <a name="module_event_notifications"></a> [event\_notifications](#module\_event\_notifications) | ../.. | n/a |
3838
| <a name="module_existing_cos_crn_parser"></a> [existing\_cos\_crn\_parser](#module\_existing\_cos\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.1.0 |
3939
| <a name="module_existing_en_crn_parser"></a> [existing\_en\_crn\_parser](#module\_existing\_en\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.1.0 |
4040
| <a name="module_existing_kms_crn_parser"></a> [existing\_kms\_crn\_parser](#module\_existing\_kms\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.1.0 |
4141
| <a name="module_existing_kms_key_crn_parser"></a> [existing\_kms\_key\_crn\_parser](#module\_existing\_kms\_key\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.1.0 |
4242
| <a name="module_existing_sm_crn_parser"></a> [existing\_sm\_crn\_parser](#module\_existing\_sm\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.1.0 |
43-
| <a name="module_kms"></a> [kms](#module\_kms) | terraform-ibm-modules/kms-all-inclusive/ibm | 5.0.2 |
44-
| <a name="module_resource_group"></a> [resource\_group](#module\_resource\_group) | terraform-ibm-modules/resource-group/ibm | 1.1.6 |
43+
| <a name="module_kms"></a> [kms](#module\_kms) | terraform-ibm-modules/kms-all-inclusive/ibm | 5.1.2 |
44+
| <a name="module_resource_group"></a> [resource\_group](#module\_resource\_group) | terraform-ibm-modules/resource-group/ibm | 1.2.0 |
4545
| <a name="module_secrets_manager_service_credentials"></a> [secrets\_manager\_service\_credentials](#module\_secrets\_manager\_service\_credentials) | terraform-ibm-modules/secrets-manager/ibm//modules/secrets | 2.2.6 |
4646

4747
### Resources
@@ -75,6 +75,7 @@ When `existing_en_instance_crn` is passed, this solution ignores ALL other input
7575
| <a name="input_existing_event_notifications_instance_crn"></a> [existing\_event\_notifications\_instance\_crn](#input\_existing\_event\_notifications\_instance\_crn) | The CRN of existing Event Notifications instance. If not supplied, a new instance is created. | `string` | `null` | no |
7676
| <a name="input_existing_kms_instance_crn"></a> [existing\_kms\_instance\_crn](#input\_existing\_kms\_instance\_crn) | The CRN of the KMS instance (Hyper Protect Crypto Services or Key Protect instance). If the KMS instance is in different account you must also provide a value for `ibmcloud_kms_api_key`. To use an existing kms instance you must also provide a value for 'kms\_endpoint\_url' and 'existing\_kms\_root\_key\_crn' should be null. A value should not be passed passing existing EN instance using the `existing_event_notifications_instance_crn` input. | `string` | `null` | no |
7777
| <a name="input_existing_kms_root_key_crn"></a> [existing\_kms\_root\_key\_crn](#input\_existing\_kms\_root\_key\_crn) | The key CRN of a root key which will be used to encrypt the data. To use an existing key you must also provide a value for 'kms\_endpoint\_url' and 'existing\_kms\_instance\_crn' should be null. If no value passed, a new key will be created in the instance provided in the `existing_kms_instance_crn` input. | `string` | `null` | no |
78+
| <a name="input_existing_monitoring_crn"></a> [existing\_monitoring\_crn](#input\_existing\_monitoring\_crn) | The CRN of an IBM Cloud Monitoring instance used to monitor the IBM Cloud Object Storage bucket that is used for storing failed events. If no value passed, metrics are sent to the instance associated to the container's location unless otherwise specified in the Metrics Router service configuration. | `string` | `null` | no |
7879
| <a name="input_existing_resource_group_name"></a> [existing\_resource\_group\_name](#input\_existing\_resource\_group\_name) | The name of an existing resource group to provision the resources. | `string` | `"Default"` | no |
7980
| <a name="input_existing_secrets_manager_endpoint_type"></a> [existing\_secrets\_manager\_endpoint\_type](#input\_existing\_secrets\_manager\_endpoint\_type) | The endpoint type to use if `existing_secrets_manager_instance_crn` is specified. Possible values: public, private. | `string` | `"private"` | no |
8081
| <a name="input_existing_secrets_manager_instance_crn"></a> [existing\_secrets\_manager\_instance\_crn](#input\_existing\_secrets\_manager\_instance\_crn) | The CRN of existing secrets manager to use to create service credential secrets for Event Notification instance. | `string` | `null` | no |

‎solutions/fully-configurable/main.tf

Lines changed: 7 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.1.6"
7+
version = "1.2.0"
88
existing_resource_group_name = var.existing_resource_group_name
99
}
1010

@@ -63,7 +63,7 @@ module "kms" {
6363
}
6464
count = local.create_kms_keys ? 1 : 0
6565
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
66-
version = "5.0.2"
66+
version = "5.1.2"
6767
create_key_protect_instance = false
6868
region = local.kms_region
6969
existing_kms_instance_crn = var.existing_kms_instance_crn
@@ -219,14 +219,17 @@ locals {
219219
storage_class = var.cos_bucket_class
220220
resource_instance_id = var.existing_cos_instance_crn
221221
region_location = local.cos_bucket_region
222-
force_delete = true
222+
metrics_monitoring = {
223+
metrics_monitoring_crn = var.existing_monitoring_crn
224+
}
225+
force_delete = true
223226
}]
224227
}
225228

226229
module "cos_buckets" {
227230
count = var.enable_collecting_failed_events && var.existing_event_notifications_instance_crn == null ? 1 : 0
228231
source = "terraform-ibm-modules/cos/ibm//modules/buckets"
229-
version = "8.21.8"
232+
version = "8.21.21"
230233
bucket_configs = local.bucket_config
231234
}
232235

‎solutions/fully-configurable/variables.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ variable "region" {
3030
default = "us-south"
3131
}
3232

33+
variable "existing_monitoring_crn" {
34+
type = string
35+
nullable = true
36+
default = null
37+
description = "The CRN of an IBM Cloud Monitoring instance used to monitor the IBM Cloud Object Storage bucket that is used for storing failed events. If no value passed, metrics are sent to the instance associated to the container's location unless otherwise specified in the Metrics Router service configuration."
38+
}
39+
3340
variable "prefix" {
3441
type = string
3542
description = "Prefix to add to all resources created by this solution. To not use any prefix value, you can set this value to `null` or an empty string."

0 commit comments

Comments
 (0)