Skip to content

Commit 1581e6c

Browse files
feat(deps): update terraform-module and add support for new inputs expire_filter_prefix and archive_filter_prefix (#376)
1 parent fd17247 commit 1581e6c

File tree

6 files changed

+27
-7
lines changed

6 files changed

+27
-7
lines changed

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 = "4.19.2"
24+
version = "4.19.5"
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.16.5"
48+
version = "8.19.2"
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.16.5"
80+
version = "8.19.2"
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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,12 @@
296296
},
297297
{
298298
"key":"cbr_rules"
299+
},
300+
{
301+
"key":"archive_filter_prefix"
302+
},
303+
{
304+
"key":"expire_filter_prefix"
299305
}
300306
],
301307
"iam_permissions": [

solutions/standard/main.tf

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ module "kms" {
200200
}
201201
count = local.create_kms_keys ? 1 : 0
202202
source = "terraform-ibm-modules/kms-all-inclusive/ibm"
203-
version = "4.19.2"
203+
version = "4.19.5"
204204
create_key_protect_instance = false
205205
region = local.kms_region
206206
existing_kms_instance_crn = var.existing_kms_instance_crn
@@ -248,7 +248,7 @@ locals {
248248
module "cos" {
249249
count = local.create_cos_bucket ? 1 : 0
250250
source = "terraform-ibm-modules/cos/ibm"
251-
version = "8.16.5"
251+
version = "8.19.2"
252252
create_cos_instance = var.existing_cos_instance_crn == null ? true : false
253253
create_cos_bucket = local.create_cos_bucket
254254
existing_cos_instance_id = var.existing_cos_instance_crn
@@ -268,6 +268,8 @@ module "cos" {
268268
monitoring_crn = var.existing_monitoring_crn
269269
retention_enabled = var.retention_enabled
270270
archive_days = var.archive_days
271+
expire_filter_prefix = var.expire_filter_prefix
272+
archive_filter_prefix = var.archive_filter_prefix
271273
}
272274

273275

@@ -390,7 +392,7 @@ module "secrets_manager_service_credentials" {
390392
count = length(local.service_credential_secrets) > 0 ? 1 : 0
391393
depends_on = [time_sleep.wait_for_en_authorization_policy]
392394
source = "terraform-ibm-modules/secrets-manager/ibm//modules/secrets"
393-
version = "1.22.0"
395+
version = "1.23.3"
394396
existing_sm_instance_guid = local.existing_secrets_manager_instance_guid
395397
existing_sm_instance_region = local.existing_secrets_manager_instance_region
396398
endpoint_type = var.existing_secrets_manager_endpoint_type

solutions/standard/variables.tf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,18 @@ variable "existing_cos_endpoint" {
294294
default = null
295295
}
296296

297+
variable "expire_filter_prefix" {
298+
type = string
299+
description = "Apply expire lifecycle rule to only objects with the following prefix. Defaults to apply to all objects."
300+
default = null
301+
}
302+
303+
variable "archive_filter_prefix" {
304+
type = string
305+
description = "Apply archive lifecycle rule to only objects with the following prefix. Defaults to apply to all objects."
306+
default = null
307+
}
308+
297309
##############################################################################
298310
## Secrets Manager Service Credentials
299311
##############################################################################

tests/existing-resources/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module "event_notification" {
1818

1919
module "cos" {
2020
source = "terraform-ibm-modules/cos/ibm"
21-
version = "8.16.5"
21+
version = "8.19.2"
2222
resource_group_id = module.resource_group.resource_group_id
2323
region = var.region
2424
cos_instance_name = "${var.prefix}-cos"

0 commit comments

Comments
 (0)