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

Commit 416a385

Browse files
terraform-ibm-modules-opsterraform-ibm-modules-ops
authored
fix(deps): update terraform-module (#234)
1 parent b51f6ab commit 416a385

File tree

4 files changed

+25
-26
lines changed

4 files changed

+25
-26
lines changed

‎solutions/instances/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ This solution supports provisioning and configuring the following infrastructure
2525

2626
| Name | Source | Version |
2727
|------|--------|---------|
28-
| <a name="module_buckets"></a> [buckets](#module\_buckets) | terraform-ibm-modules/cos/ibm//modules/buckets | 8.15.1 |
29-
| <a name="module_cos"></a> [cos](#module\_cos) | terraform-ibm-modules/cos/ibm//modules/fscloud | 8.15.1 |
30-
| <a name="module_create_profile_attachment"></a> [create\_profile\_attachment](#module\_create\_profile\_attachment) | terraform-ibm-modules/scc/ibm//modules/attachment | 1.8.23 |
28+
| <a name="module_buckets"></a> [buckets](#module\_buckets) | terraform-ibm-modules/cos/ibm//modules/buckets | 8.16.5 |
29+
| <a name="module_cos"></a> [cos](#module\_cos) | terraform-ibm-modules/cos/ibm//modules/fscloud | 8.16.5 |
30+
| <a name="module_create_profile_attachment"></a> [create\_profile\_attachment](#module\_create\_profile\_attachment) | terraform-ibm-modules/scc/ibm//modules/attachment | 1.8.36 |
3131
| <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 |
3232
| <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 |
3333
| <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 |
3434
| <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 |
3535
| <a name="module_existing_scc_crn_parser"></a> [existing\_scc\_crn\_parser](#module\_existing\_scc\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.1.0 |
36-
| <a name="module_kms"></a> [kms](#module\_kms) | terraform-ibm-modules/kms-all-inclusive/ibm | 4.16.11 |
36+
| <a name="module_kms"></a> [kms](#module\_kms) | terraform-ibm-modules/kms-all-inclusive/ibm | 4.19.2 |
3737
| <a name="module_resource_group"></a> [resource\_group](#module\_resource\_group) | terraform-ibm-modules/resource-group/ibm | 1.1.6 |
38-
| <a name="module_scc"></a> [scc](#module\_scc) | terraform-ibm-modules/scc/ibm | 1.8.23 |
39-
| <a name="module_scc_wp"></a> [scc\_wp](#module\_scc\_wp) | terraform-ibm-modules/scc-workload-protection/ibm | 1.4.2 |
38+
| <a name="module_scc"></a> [scc](#module\_scc) | terraform-ibm-modules/scc/ibm | 1.8.36 |
39+
| <a name="module_scc_wp"></a> [scc\_wp](#module\_scc\_wp) | terraform-ibm-modules/scc-workload-protection/ibm | 1.4.3 |
4040

4141
### Resources
4242

‎solutions/instances/main.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ module "kms" {
115115
}
116116
count = var.existing_scc_cos_kms_key_crn != null || var.existing_scc_cos_bucket_name != null || var.existing_scc_instance_crn != null ? 0 : 1 # no need to create any KMS resources if passing an existing key or bucket, or SCC instance
117117
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
118-
version = "4.16.11"
118+
version = "4.19.2"
119119
create_key_protect_instance = false
120120
region = local.kms_region
121121
existing_kms_instance_crn = var.existing_kms_instance_crn
@@ -187,7 +187,7 @@ module "cos" {
187187
}
188188
count = var.existing_scc_cos_bucket_name == null && var.existing_scc_instance_crn == null ? 1 : 0 # no need to call COS module if consumer is passing existing SCC instance or COS bucket
189189
source = "terraform-ibm-modules/cos/ibm//modules/fscloud"
190-
version = "8.15.1"
190+
version = "8.16.5"
191191
resource_group_id = module.resource_group.resource_group_id
192192
create_cos_instance = var.existing_cos_instance_crn == null ? true : false # don't create instance if existing one passed in
193193
cos_instance_name = local.cos_instance_name
@@ -206,7 +206,7 @@ module "buckets" {
206206
count = local.create_cross_account_auth_policy ? 1 : 0
207207
depends_on = [time_sleep.wait_for_authorization_policy[0]]
208208
source = "terraform-ibm-modules/cos/ibm//modules/buckets"
209-
version = "8.15.1"
209+
version = "8.16.5"
210210
bucket_configs = local.bucket_config
211211
}
212212

@@ -234,7 +234,7 @@ moved {
234234
module "scc" {
235235
source = "terraform-ibm-modules/scc/ibm"
236236
existing_scc_instance_crn = var.existing_scc_instance_crn
237-
version = "1.8.23"
237+
version = "1.8.36"
238238
resource_group_id = module.resource_group.resource_group_id
239239
region = local.scc_instance_region
240240
instance_name = local.scc_instance_name
@@ -301,7 +301,7 @@ data "ibm_iam_account_settings" "iam_account_settings" {}
301301

302302
module "create_profile_attachment" {
303303
source = "terraform-ibm-modules/scc/ibm//modules/attachment"
304-
version = "1.8.23"
304+
version = "1.8.36"
305305
for_each = {
306306
for idx, profile_attachment in var.profile_attachments :
307307
profile_attachment => idx
@@ -322,7 +322,7 @@ module "create_profile_attachment" {
322322
module "scc_wp" {
323323
count = var.provision_scc_workload_protection && var.existing_scc_instance_crn == null ? 1 : 0
324324
source = "terraform-ibm-modules/scc-workload-protection/ibm"
325-
version = "1.4.2"
325+
version = "1.4.3"
326326
name = local.scc_workload_protection_instance_name
327327
region = var.scc_region
328328
resource_group_id = module.resource_group.resource_group_id

‎tests/pr_test.go‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ func TestRunUpgradeInstances(t *testing.T) {
114114
// A test to pass existing resources to the SCC instances DA
115115
func TestRunExistingResourcesInstances(t *testing.T) {
116116
t.Parallel()
117-
118117
// ------------------------------------------------------------------------------------
119118
// Provision COS, Sysdig and EN first
120119
// ------------------------------------------------------------------------------------
@@ -151,28 +150,26 @@ func TestRunExistingResourcesInstances(t *testing.T) {
151150
} else {
152151

153152
// ------------------------------------------------------------------------------------
154-
// Deploy SCC instances DA passing in existing COS instance, bucket, Sysdig and EN details
153+
// Deploy SCC instances DA passing in existing COS instance (not bucket), KMS key and Sysdig
155154
// ------------------------------------------------------------------------------------
156155

157156
options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
158157
Testing: t,
159158
TerraformDir: instanceFlavorDir,
160159
// Do not hard fail the test if the implicit destroy steps fail to allow a full destroy of resource to occur
161160
ImplicitRequired: false,
162-
Region: region,
163161
TerraformVars: map[string]interface{}{
164162
"prefix": prefix,
165163
"cos_region": region,
166164
"scc_region": region,
167165
"resource_group_name": terraform.Output(t, existingTerraformOptions, "resource_group_name"),
168166
"use_existing_resource_group": true,
169167
"existing_monitoring_crn": terraform.Output(t, existingTerraformOptions, "monitoring_crn"),
170-
"existing_scc_cos_bucket_name": terraform.Output(t, existingTerraformOptions, "bucket_name"),
168+
"existing_kms_instance_crn": permanentResources["hpcs_south_crn"],
169+
"kms_endpoint_type": "public",
170+
"provider_visibility": "public",
171171
"existing_cos_instance_crn": terraform.Output(t, existingTerraformOptions, "cos_crn"),
172172
"management_endpoint_type_for_bucket": "public",
173-
"provider_visibility": "public",
174-
"existing_en_crn": terraform.Output(t, existingTerraformOptions, "en_crn"),
175-
"en_source_name": prefix, // This name must be unique per SCC instance that is integrated with the Event Notifications instance.
176173
},
177174
})
178175

@@ -181,26 +178,28 @@ func TestRunExistingResourcesInstances(t *testing.T) {
181178
assert.NotNil(t, output, "Expected some output")
182179

183180
// ------------------------------------------------------------------------------------
184-
// Deploy SCC instances DA passing in existing COS instance (not bucket), KMS key and Sysdig
181+
// Deploy SCC instances DA passing in existing COS instance, bucket, Sysdig and EN details
185182
// ------------------------------------------------------------------------------------
186183

187184
options2 := testhelper.TestOptionsDefault(&testhelper.TestOptions{
188185
Testing: t,
189186
TerraformDir: instanceFlavorDir,
190187
// Do not hard fail the test if the implicit destroy steps fail to allow a full destroy of resource to occur
191188
ImplicitRequired: false,
189+
Region: region,
192190
TerraformVars: map[string]interface{}{
193191
"prefix": prefix,
194192
"cos_region": region,
195193
"scc_region": region,
196194
"resource_group_name": terraform.Output(t, existingTerraformOptions, "resource_group_name"),
197195
"use_existing_resource_group": true,
198196
"existing_monitoring_crn": terraform.Output(t, existingTerraformOptions, "monitoring_crn"),
199-
"existing_kms_instance_crn": permanentResources["hpcs_south_crn"],
200-
"kms_endpoint_type": "public",
201-
"provider_visibility": "public",
197+
"existing_scc_cos_bucket_name": terraform.Output(t, existingTerraformOptions, "bucket_name"),
202198
"existing_cos_instance_crn": terraform.Output(t, existingTerraformOptions, "cos_crn"),
203199
"management_endpoint_type_for_bucket": "public",
200+
"provider_visibility": "public",
201+
"existing_en_crn": terraform.Output(t, existingTerraformOptions, "en_crn"),
202+
"en_source_name": prefix, // This name must be unique per SCC instance that is integrated with the Event Notifications instance.
204203
},
205204
})
206205

‎tests/resources/existing-resources/instances/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module "resource_group" {
1616

1717
module "cos" {
1818
source = "terraform-ibm-modules/cos/ibm"
19-
version = "8.15.1"
19+
version = "8.16.5"
2020
resource_group_id = module.resource_group.resource_group_id
2121
region = var.region
2222
cos_instance_name = "${var.prefix}-cos"
@@ -32,7 +32,7 @@ module "cos" {
3232

3333
module "cloud_monitoring" {
3434
source = "terraform-ibm-modules/observability-instances/ibm//modules/cloud_monitoring"
35-
version = "3.3.1"
35+
version = "3.4.0"
3636
resource_group_id = module.resource_group.resource_group_id
3737
region = var.region
3838
instance_name = "${var.prefix}-mon"
@@ -46,7 +46,7 @@ module "cloud_monitoring" {
4646

4747
module "event_notifications" {
4848
source = "terraform-ibm-modules/event-notifications/ibm"
49-
version = "1.14.9"
49+
version = "1.15.14"
5050
resource_group_id = module.resource_group.resource_group_id
5151
name = "${var.prefix}-en"
5252
tags = var.resource_tags

0 commit comments

Comments
 (0)