Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ on:

jobs:
call-terraform-release-pipeline:
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.23.2
uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.24.0
secrets: inherit
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ This module is used to create an IBM Cloud Event Notifications instance to filte
* [Submodules](./modules)
* [fscloud](./modules/fscloud)
* [Examples](./examples)
* <div style="display: inline-block;"><a href="./examples/advanced">Advanced example with BYOK encryption and CBR rules</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=en-advanced-example&repository=github.com/terraform-ibm-modules/terraform-ibm-event-notifications/tree/main/examples/advanced" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
* <div style="display: inline-block;"><a href="./examples/basic">Basic example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=en-basic-example&repository=github.com/terraform-ibm-modules/terraform-ibm-event-notifications/tree/main/examples/basic" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
* <div style="display: inline-block;"><a href="./examples/fscloud">Financial Services Cloud profile example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=en-fscloud-example&repository=github.com/terraform-ibm-modules/terraform-ibm-event-notifications/tree/main/examples/fscloud" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
* <div style="display: inline-block;"><a href="./examples/advanced">Advanced example with BYOK encryption and CBR rules</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=en-advanced-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-event-notifications/tree/main/examples/advanced" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
* <div style="display: inline-block;"><a href="./examples/basic">Basic example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=en-basic-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-event-notifications/tree/main/examples/basic" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
* <div style="display: inline-block;"><a href="./examples/fscloud">Financial Services Cloud profile example</a></div> <div style="display: inline-block; vertical-align: middle;"><a href="https://cloud.ibm.com/schematics/workspaces/create?workspace_name=en-fscloud-example&repository=https://github.com/terraform-ibm-modules/terraform-ibm-event-notifications/tree/main/examples/fscloud" target="_blank"><img src="https://cloud.ibm.com/media/docs/images/icons/Deploy_to_cloud.svg" alt="Deploy to IBM Cloud button"></a></div>
* [Contributing](#contributing)
<!-- END OVERVIEW HOOK -->

Expand Down Expand Up @@ -76,7 +76,7 @@ To create service credentials, access the Event Notifications service, and acces

| Name | Source | Version |
|------|--------|---------|
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.33.8 |
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.34.0 |

### Resources

Expand Down
6 changes: 3 additions & 3 deletions examples/advanced/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.3"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand All @@ -21,7 +21,7 @@ locals {

module "key_protect_all_inclusive" {
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
version = "5.4.10"
version = "5.5.3"
resource_group_id = module.resource_group.resource_group_id
region = var.region
key_protect_instance_name = "${var.prefix}-kp"
Expand All @@ -45,7 +45,7 @@ locals {

module "cos" {
source = "terraform-ibm-modules/cos/ibm"
version = "10.5.8"
version = "10.7.0"
resource_group_id = module.resource_group.resource_group_id
region = var.region
cos_instance_name = "${var.prefix}-cos"
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.3"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand Down
6 changes: 3 additions & 3 deletions examples/fscloud/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.3"
# if an existing resource group is not set (null) create a new one using prefix
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
Expand All @@ -23,7 +23,7 @@ data "ibm_iam_account_settings" "iam_account_settings" {

module "cbr_zone_schematics" {
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
version = "1.33.8"
version = "1.34.0"
name = "${var.prefix}-schematics-zone"
zone_description = "CBR Network zone containing Schematics"
account_id = data.ibm_iam_account_settings.iam_account_settings.account_id
Expand All @@ -48,7 +48,7 @@ locals {

module "cos" {
source = "terraform-ibm-modules/cos/ibm//modules/fscloud"
version = "10.5.8"
version = "10.7.0"
resource_group_id = module.resource_group.resource_group_id
create_cos_instance = true
cos_instance_name = "${var.prefix}-cos"
Expand Down
54 changes: 48 additions & 6 deletions ibm_catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"index": 2,
"install_type": "fullstack",
"working_directory": "solutions/security-enforced",
"short_description": "This architecture deploys and configures an IBM Cloud Event Notifications instance with a required Object Storage service and bucket for undelivered events. Both the Event Notifications instance and storage bucket use key management–based encryption by default. Optional integration with IBM Cloud Secrets Manager enables secure storage of service credentials.",
"configuration": [
{
"key": "ibmcloud_api_key"
Expand Down Expand Up @@ -240,11 +241,26 @@
"custom_config": {
"type": "code_editor",
"grouping": "deployment",
"original_grouping": "deployment"
"original_grouping": "deployment",
"config_constraints": {
"supportedLanguages": [
"hcl"
]
}
}
},
{
"key": "service_credential_names"
"key": "service_credential_names",
"custom_config": {
"type": "code_editor",
"grouping": "deployment",
"original_grouping": "deployment",
"config_constraints": {
"supportedLanguages": [
"hcl"
]
}
}
},
{
"key": "existing_event_notifications_instance_crn",
Expand All @@ -262,7 +278,12 @@
"custom_config": {
"type": "code_editor",
"grouping": "deployment",
"original_grouping": "deployment"
"original_grouping": "deployment",
"config_constraints": {
"supportedLanguages": [
"hcl"
]
}
}
}
],
Expand Down Expand Up @@ -343,6 +364,7 @@
"index": 1,
"install_type": "fullstack",
"working_directory": "solutions/fully-configurable",
"short_description": "This architecture deploys and configures an IBM Cloud Event Notifications instance with a required Object Storage bucket for undelivered events. It supports optional encryption through a key management service, integration with Cloud Monitoring for operational insights, and Secrets Manager for secure credential storage.",
"configuration": [
{
"key": "ibmcloud_api_key"
Expand Down Expand Up @@ -644,19 +666,39 @@
"custom_config": {
"type": "code_editor",
"grouping": "deployment",
"original_grouping": "deployment"
"original_grouping": "deployment",
"config_constraints": {
"supportedLanguages": [
"hcl"
]
}
}
},
{
"key": "service_credential_names"
"key": "service_credential_names",
"custom_config": {
"type": "code_editor",
"grouping": "deployment",
"original_grouping": "deployment",
"config_constraints": {
"supportedLanguages": [
"hcl"
]
}
}
},
{
"key": "cbr_rules",
"type": "array",
"custom_config": {
"type": "code_editor",
"grouping": "deployment",
"original_grouping": "deployment"
"original_grouping": "deployment",
"config_constraints": {
"supportedLanguages": [
"hcl"
]
}
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ resource "time_sleep" "wait_for_kms_authorization_policy" {
module "cbr_rule" {
count = length(var.cbr_rules) > 0 ? length(var.cbr_rules) : 0
source = "terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module"
version = "1.33.8"
version = "1.34.0"
rule_description = var.cbr_rules[count.index].description
enforcement_mode = var.cbr_rules[count.index].enforcement_mode
rule_contexts = var.cbr_rules[count.index].rule_contexts
Expand Down
20 changes: 10 additions & 10 deletions solutions/fully-configurable/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.3"
existing_resource_group_name = var.existing_resource_group_name
}

Expand All @@ -16,15 +16,15 @@ module "resource_group" {
module "existing_kms_crn_parser" {
count = var.existing_kms_instance_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.0"
version = "1.3.3"
crn = var.existing_kms_instance_crn
}

# If existing KMS root key CRN passed, parse details from it
module "existing_kms_key_crn_parser" {
count = var.existing_kms_root_key_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.0"
version = "1.3.3"
crn = var.existing_kms_root_key_crn
}

Expand Down Expand Up @@ -63,7 +63,7 @@ module "kms" {
}
count = local.create_kms_keys ? 1 : 0
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
version = "5.4.10"
version = "5.5.3"
create_key_protect_instance = false
region = local.kms_region
existing_kms_instance_crn = var.existing_kms_instance_crn
Expand Down Expand Up @@ -96,7 +96,7 @@ module "kms" {
module "cos_kms_key_crn_parser" {
count = (local.create_kms_keys || var.existing_kms_root_key_crn != null) ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.0"
version = "1.3.3"
crn = local.cos_kms_key_crn
}

Expand Down Expand Up @@ -190,7 +190,7 @@ resource "ibm_iam_authorization_policy" "en_kms_policy" {
module "existing_cos_crn_parser" {
count = var.existing_cos_instance_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.0"
version = "1.3.3"
crn = var.existing_cos_instance_crn
}

Expand Down Expand Up @@ -236,7 +236,7 @@ locals {
module "cos_buckets" {
count = var.enable_collecting_failed_events && var.existing_event_notifications_instance_crn == null ? 1 : 0
source = "terraform-ibm-modules/cos/ibm//modules/buckets"
version = "10.5.8"
version = "10.7.0"
bucket_configs = local.bucket_config
}

Expand All @@ -248,7 +248,7 @@ module "cos_buckets" {
module "existing_en_crn_parser" {
count = var.existing_event_notifications_instance_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.0"
version = "1.3.3"
crn = var.existing_event_notifications_instance_crn
}

Expand Down Expand Up @@ -307,7 +307,7 @@ module "event_notifications" {
module "existing_sm_crn_parser" {
count = var.existing_secrets_manager_instance_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.0"
version = "1.3.3"
crn = var.existing_secrets_manager_instance_crn
}

Expand Down Expand Up @@ -361,7 +361,7 @@ module "secrets_manager_service_credentials" {
count = length(local.service_credential_secrets) > 0 ? 1 : 0
depends_on = [time_sleep.wait_for_en_authorization_policy]
source = "terraform-ibm-modules/secrets-manager/ibm//modules/secrets"
version = "2.11.9"
version = "2.12.3"
existing_sm_instance_guid = local.existing_secrets_manager_instance_guid
existing_sm_instance_region = local.existing_secrets_manager_instance_region
endpoint_type = var.existing_secrets_manager_endpoint_type
Expand Down
2 changes: 1 addition & 1 deletion solutions/fully-configurable/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.85.0"
version = "1.86.0"
}
time = {
source = "hashicorp/time"
Expand Down
8 changes: 4 additions & 4 deletions tests/existing-resources/main.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.0"
version = "1.4.3"
resource_group_name = var.resource_group == null ? "${var.prefix}-resource-group" : null
existing_resource_group_name = var.resource_group
}
Expand All @@ -18,7 +18,7 @@ module "event_notification" {

module "cos" {
source = "terraform-ibm-modules/cos/ibm"
version = "10.5.8"
version = "10.7.0"
resource_group_id = module.resource_group.resource_group_id
region = var.region
cos_instance_name = "${var.prefix}-cos"
Expand All @@ -30,7 +30,7 @@ module "cos" {

module "cloud_monitoring" {
source = "terraform-ibm-modules/cloud-monitoring/ibm"
version = "1.10.8"
version = "1.11.0"
resource_group_id = module.resource_group.resource_group_id
region = var.region
resource_tags = var.resource_tags
Expand All @@ -39,7 +39,7 @@ module "cloud_monitoring" {

module "kms_key" {
source = "terraform-ibm-modules/kms-key/ibm"
version = "1.4.2"
version = "1.4.9"
kms_instance_id = "crn:v1:bluemix:public:hs-crypto:us-south:a/abac0df06b644a9cabc6e44f55b3880e:e6dce284-e80f-46e1-a3c1-830f7adff7a9::"
key_name = "${var.prefix}-root-key"
force_delete = true # Setting it to true for testing purpose
Expand Down
Loading