Skip to content
This repository was archived by the owner on Mar 19, 2025. It is now read-only.

Commit 489f93d

Browse files
authored
fix(deps): add fix for Event Notifications integration<br>- bump to ibm provider version 1.76.0 (#260)
1 parent c828039 commit 489f93d

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

solutions/instances/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This solution supports provisioning and configuring the following infrastructure
1818
| Name | Version |
1919
|------|---------|
2020
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.4.0 |
21-
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.75.2 |
21+
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.76.0 |
2222
| <a name="requirement_time"></a> [time](#requirement\_time) | 0.12.1 |
2323

2424
### Modules
@@ -42,14 +42,14 @@ This solution supports provisioning and configuring the following infrastructure
4242

4343
| Name | Type |
4444
|------|------|
45-
| [ibm_en_subscription_email.email_subscription](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.75.2/docs/resources/en_subscription_email) | resource |
46-
| [ibm_en_topic.en_topic](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.75.2/docs/resources/en_topic) | resource |
47-
| [ibm_iam_authorization_policy.cos_kms_policy](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.75.2/docs/resources/iam_authorization_policy) | resource |
45+
| [ibm_en_subscription_email.email_subscription](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.0/docs/resources/en_subscription_email) | resource |
46+
| [ibm_en_topic.en_topic](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.0/docs/resources/en_topic) | resource |
47+
| [ibm_iam_authorization_policy.cos_kms_policy](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.0/docs/resources/iam_authorization_policy) | resource |
4848
| [time_sleep.wait_for_authorization_policy](https://registry.terraform.io/providers/hashicorp/time/0.12.1/docs/resources/sleep) | resource |
4949
| [time_sleep.wait_for_scc](https://registry.terraform.io/providers/hashicorp/time/0.12.1/docs/resources/sleep) | resource |
50-
| [ibm_en_destinations.en_destinations](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.75.2/docs/data-sources/en_destinations) | data source |
51-
| [ibm_iam_account_settings.iam_account_settings](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.75.2/docs/data-sources/iam_account_settings) | data source |
52-
| [ibm_resource_group.group](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.75.2/docs/data-sources/resource_group) | data source |
50+
| [ibm_en_destinations.en_destinations](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.0/docs/data-sources/en_destinations) | data source |
51+
| [ibm_iam_account_settings.iam_account_settings](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.0/docs/data-sources/iam_account_settings) | data source |
52+
| [ibm_resource_group.group](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.0/docs/data-sources/resource_group) | data source |
5353

5454
### Inputs
5555

solutions/instances/main.tf

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -241,24 +241,25 @@ moved {
241241
}
242242

243243
module "scc" {
244-
source = "terraform-ibm-modules/scc/ibm"
245-
existing_scc_instance_crn = var.existing_scc_instance_crn
246-
version = "1.11.2"
247-
resource_group_id = module.resource_group.resource_group_id
248-
region = local.scc_instance_region
249-
instance_name = local.scc_instance_name
250-
plan = var.scc_service_plan
251-
cos_bucket = local.scc_cos_bucket_name
252-
cos_instance_crn = local.cos_instance_crn
253-
en_instance_crn = var.existing_event_notifications_crn
254-
en_source_name = var.event_notifications_source_name
255-
en_source_description = var.event_notifications_source_description
256-
skip_cos_iam_authorization_policy = var.skip_scc_cos_iam_auth_policy
257-
resource_tags = var.scc_instance_tags
258-
attach_wp_to_scc_instance = var.provision_scc_workload_protection && var.existing_scc_instance_crn == null
259-
wp_instance_crn = var.provision_scc_workload_protection && var.existing_scc_instance_crn == null ? module.scc_wp[0].crn : null
260-
skip_scc_wp_auth_policy = var.skip_scc_workload_protection_iam_auth_policy
261-
cbr_rules = var.scc_instance_cbr_rules
244+
source = "terraform-ibm-modules/scc/ibm"
245+
existing_scc_instance_crn = var.existing_scc_instance_crn
246+
version = "1.11.2"
247+
resource_group_id = module.resource_group.resource_group_id
248+
region = local.scc_instance_region
249+
instance_name = local.scc_instance_name
250+
plan = var.scc_service_plan
251+
cos_bucket = local.scc_cos_bucket_name
252+
cos_instance_crn = local.cos_instance_crn
253+
enable_event_notifications_integration = var.existing_event_notifications_crn == null ? false : true
254+
en_instance_crn = var.existing_event_notifications_crn
255+
en_source_name = var.event_notifications_source_name
256+
en_source_description = var.event_notifications_source_description
257+
skip_cos_iam_authorization_policy = var.skip_scc_cos_iam_auth_policy
258+
resource_tags = var.scc_instance_tags
259+
attach_wp_to_scc_instance = var.provision_scc_workload_protection && var.existing_scc_instance_crn == null
260+
wp_instance_crn = var.provision_scc_workload_protection && var.existing_scc_instance_crn == null ? module.scc_wp[0].crn : null
261+
skip_scc_wp_auth_policy = var.skip_scc_workload_protection_iam_auth_policy
262+
cbr_rules = var.scc_instance_cbr_rules
262263
}
263264

264265
#######################################################################################################################

solutions/instances/version.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
ibm = {
66
source = "IBM-Cloud/ibm"
7-
version = "1.75.2"
7+
version = "1.76.0"
88
}
99
time = {
1010
source = "hashicorp/time"

tests/pr_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,8 @@ func TestRunExistingResourcesInstances(t *testing.T) {
198198
"existing_cos_instance_crn": terraform.Output(t, existingTerraformOptions, "cos_crn"),
199199
"management_endpoint_type_for_bucket": "public",
200200
"provider_visibility": "public",
201-
// Temporarily removed because of provider issue: https://github.com/IBM-Cloud/terraform-provider-ibm/issues/5890
202-
// "existing_event_notifications_crn": terraform.Output(t, existingTerraformOptions, "en_crn"),
203-
// "event_notifications_source_name": prefix, // This name must be unique per SCC instance that is integrated with the Event Notifications instance.
201+
"existing_event_notifications_crn": terraform.Output(t, existingTerraformOptions, "en_crn"),
202+
"event_notifications_source_name": prefix, // This name must be unique per SCC instance that is integrated with the Event Notifications instance.
204203
},
205204
})
206205

0 commit comments

Comments
 (0)