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

Commit 30b91b1

Browse files
chore(deps): update terraform-module (#152)
1 parent a90e4de commit 30b91b1

File tree

6 files changed

+20
-14
lines changed

6 files changed

+20
-14
lines changed

cra-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ CRA_TARGETS:
66
PROFILE_ID: "bfacb71d-4b84-41ac-9825-e8a3a3eb7405" # SCC profile ID (currently set to IBM Cloud Framework for Financial Services 1.6.0 profile).
77
CRA_ENVIRONMENT_VARIABLES:
88
TF_VAR_resource_group_name: "test"
9-
TF_VAR_existing_kms_instance_crn: "crn:v1:bluemix:public:hs-crypto:us-south:a/xxx:xxxx::"
9+
TF_VAR_existing_kms_instance_crn: "crn:v1:bluemix:public:hs-crypto:us-south:a/abac0df06b644a9cabc6e44f55b3880e:e6dce284-e80f-46e1-a3c1-830f7adff7a9::"

solutions/instances/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ This solution supports provisioning and configuring the following infrastructure
2424

2525
| Name | Source | Version |
2626
|------|--------|---------|
27-
| <a name="module_cos"></a> [cos](#module\_cos) | terraform-ibm-modules/cos/ibm//modules/fscloud | 8.6.2 |
28-
| <a name="module_create_profile_attachment"></a> [create\_profile\_attachment](#module\_create\_profile\_attachment) | terraform-ibm-modules/scc/ibm//modules/attachment | 1.6.3 |
29-
| <a name="module_kms"></a> [kms](#module\_kms) | terraform-ibm-modules/kms-all-inclusive/ibm | 4.13.4 |
27+
| <a name="module_cos"></a> [cos](#module\_cos) | terraform-ibm-modules/cos/ibm//modules/fscloud | 8.10.7 |
28+
| <a name="module_create_profile_attachment"></a> [create\_profile\_attachment](#module\_create\_profile\_attachment) | terraform-ibm-modules/scc/ibm//modules/attachment | 1.8.2 |
29+
| <a name="module_kms"></a> [kms](#module\_kms) | terraform-ibm-modules/kms-all-inclusive/ibm | 4.15.9 |
3030
| <a name="module_resource_group"></a> [resource\_group](#module\_resource\_group) | terraform-ibm-modules/resource-group/ibm | 1.1.6 |
31-
| <a name="module_scc"></a> [scc](#module\_scc) | terraform-ibm-modules/scc/ibm | 1.6.3 |
31+
| <a name="module_scc"></a> [scc](#module\_scc) | terraform-ibm-modules/scc/ibm | 1.8.2 |
3232
| <a name="module_scc_wp"></a> [scc\_wp](#module\_scc\_wp) | terraform-ibm-modules/scc-workload-protection/ibm | 1.3.1 |
3333

3434
### Resources

solutions/instances/main.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ module "kms" {
4747
}
4848
count = var.existing_scc_cos_kms_key_crn != null || var.existing_scc_cos_bucket_name != null ? 0 : 1 # no need to create any KMS resources if passing an existing key, or bucket
4949
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
50-
version = "4.13.4"
50+
version = "4.15.9"
5151
create_key_protect_instance = false
5252
region = local.kms_region
53-
existing_kms_instance_guid = local.existing_kms_guid
53+
existing_kms_instance_crn = var.existing_kms_instance_crn
5454
key_ring_endpoint_type = var.kms_endpoint_type
5555
key_endpoint_type = var.kms_endpoint_type
5656
keys = [
@@ -88,7 +88,7 @@ module "cos" {
8888
}
8989
count = var.existing_scc_cos_bucket_name == null ? 1 : 0 # no need to call COS module if consumer is passing existing COS bucket
9090
source = "terraform-ibm-modules/cos/ibm//modules/fscloud"
91-
version = "8.6.2"
91+
version = "8.10.7"
9292
resource_group_id = module.resource_group.resource_group_id
9393
create_cos_instance = var.existing_cos_instance_crn == null ? true : false # don't create instance if existing one passed in
9494
cos_instance_name = local.cos_instance_name
@@ -152,7 +152,7 @@ data "ibm_resource_instance" "scc_instance" {
152152
module "scc" {
153153
count = var.existing_scc_instance_crn == null ? 1 : 0
154154
source = "terraform-ibm-modules/scc/ibm"
155-
version = "1.6.3"
155+
version = "1.8.2"
156156
resource_group_id = module.resource_group.resource_group_id
157157
region = local.scc_instance_region
158158
instance_name = local.scc_instance_name
@@ -217,7 +217,7 @@ data "ibm_iam_account_settings" "iam_account_settings" {}
217217

218218
module "create_profile_attachment" {
219219
source = "terraform-ibm-modules/scc/ibm//modules/attachment"
220-
version = "1.6.3"
220+
version = "1.8.2"
221221
for_each = {
222222
for idx, profile_attachment in var.profile_attachments :
223223
profile_attachment => idx

tests/pr_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,8 @@ func TestRunUpgradeInstances(t *testing.T) {
183183
"existing_kms_instance_crn": permanentResources["hpcs_south_crn"],
184184
"kms_endpoint_type": "public",
185185
"management_endpoint_type_for_bucket": "public",
186+
// Temp workaround for https://github.com/IBM-Cloud/terraform-provider-ibm/issues/5586
187+
"profile_attachments": []string{"SOC 2"},
186188
}
187189

188190
output, err := options.RunTestUpgrade()
@@ -251,6 +253,8 @@ func TestRunExistingResourcesInstances(t *testing.T) {
251253
"existing_cos_instance_crn": terraform.Output(t, existingTerraformOptions, "cos_crn"),
252254
"management_endpoint_type_for_bucket": "public",
253255
"existing_en_crn": terraform.Output(t, existingTerraformOptions, "en_crn"),
256+
// Temp workaround for https://github.com/IBM-Cloud/terraform-provider-ibm/issues/5586
257+
"profile_attachments": []string{"SOC 2"},
254258
},
255259
})
256260

@@ -277,6 +281,8 @@ func TestRunExistingResourcesInstances(t *testing.T) {
277281
"kms_endpoint_type": "public",
278282
"existing_cos_instance_crn": terraform.Output(t, existingTerraformOptions, "cos_crn"),
279283
"management_endpoint_type_for_bucket": "public",
284+
// Temp workaround for https://github.com/IBM-Cloud/terraform-provider-ibm/issues/5586
285+
"profile_attachments": []string{"SOC 2"},
280286
},
281287
})
282288

tests/resources/existing-resources/agents/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module "resource_group" {
1515
##############################################################################
1616

1717
module "landing_zone" {
18-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone//patterns//roks//module?ref=v5.25.1"
18+
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone//patterns//roks//module?ref=v5.29.1"
1919
region = var.region
2020
prefix = var.prefix
2121
tags = var.resource_tags

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.6.2"
19+
version = "8.10.7"
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 = "2.13.2"
35+
version = "2.14.1"
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.6.9"
49+
version = "1.10.3"
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)