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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ You need the following permissions to run this module.

| Name | Source | Version |
|------|--------|---------|
| <a name="module_backup_key_crn_parser"></a> [backup\_key\_crn\_parser](#module\_backup\_key\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.3.3 |
| <a name="module_backup_key_crn_parser"></a> [backup\_key\_crn\_parser](#module\_backup\_key\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.3.5 |
| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.34.0 |
| <a name="module_kms_key_crn_parser"></a> [kms\_key\_crn\_parser](#module\_kms\_key\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.3.3 |
| <a name="module_kms_key_crn_parser"></a> [kms\_key\_crn\_parser](#module\_kms\_key\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.3.5 |

### Resources

Expand Down
2 changes: 1 addition & 1 deletion common-dev-assets
2 changes: 1 addition & 1 deletion examples/backup-restore/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.4"
version = "1.4.6"
# 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
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.4"
version = "1.4.6"
# 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/complete/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ locals {

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.4.4"
version = "1.4.6"
# 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 Expand Up @@ -137,7 +137,7 @@ module "icd_mongodb" {
module "secrets_manager" {
count = var.existing_secrets_manager_instance_guid == null ? 1 : 0
source = "terraform-ibm-modules/secrets-manager/ibm"
version = "2.12.3"
version = "2.12.4"
resource_group_id = module.resource_group.resource_group_id
region = var.region
secrets_manager_name = "${var.prefix}-secrets-manager"
Expand All @@ -149,7 +149,7 @@ module "secrets_manager" {
# Add a Secrets Group to the secret manager instance
module "secrets_manager_secrets_group" {
source = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
version = "1.3.25"
version = "1.3.26"
region = local.secrets_manager_region
secrets_manager_guid = local.secrets_manager_guid
#tfsec:ignore:general-secrets-no-plaintext-exposure
Expand Down
2 changes: 1 addition & 1 deletion 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.4"
version = "1.4.6"
# 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
4 changes: 2 additions & 2 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ locals {
module "kms_key_crn_parser" {
count = local.parse_kms_key ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.3"
version = "1.3.5"
crn = var.kms_key_crn
}

module "backup_key_crn_parser" {
count = local.parse_backup_kms_key ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.3"
version = "1.3.5"
crn = local.backup_encryption_key_crn
}

Expand Down
14 changes: 7 additions & 7 deletions solutions/fully-configurable/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ locals {

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

Expand Down Expand Up @@ -62,21 +62,21 @@ module "kms" {
module "kms_instance_crn_parser" {
count = var.existing_kms_instance_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.3"
version = "1.3.5"
crn = var.existing_kms_instance_crn
}

module "kms_key_crn_parser" {
count = var.existing_kms_key_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.3"
version = "1.3.5"
crn = var.existing_kms_key_crn
}

module "kms_backup_key_crn_parser" {
count = var.existing_backup_kms_key_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.3"
version = "1.3.5"
crn = var.existing_backup_kms_key_crn
}

Expand Down Expand Up @@ -239,7 +239,7 @@ locals {
module "mongodb_instance_crn_parser" {
count = var.existing_mongodb_instance_crn != null ? 1 : 0
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.3.3"
version = "1.3.5"
crn = var.existing_mongodb_instance_crn
}

Expand Down Expand Up @@ -328,7 +328,7 @@ locals {
module "secrets_manager_instance_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.3"
version = "1.3.5"
crn = var.existing_secrets_manager_instance_crn
}

Expand Down Expand Up @@ -399,7 +399,7 @@ locals {
module "secrets_manager_service_credentials" {
count = length(local.service_credential_secrets) > 0 ? 1 : 0
source = "terraform-ibm-modules/secrets-manager/ibm//modules/secrets"
version = "2.12.3"
version = "2.12.4"
# converted into implicit dependency and removed explicit depends_on time_sleep.wait_for_mongodb_authorization_policy for this module because of issue https://github.com/terraform-ibm-modules/terraform-ibm-icd-redis/issues/608
existing_sm_instance_guid = local.create_secrets_manager_auth_policy > 0 ? time_sleep.wait_for_mongodb_authorization_policy[0].triggers["secrets_manager_guid"] : local.existing_secrets_manager_instance_guid
existing_sm_instance_region = local.create_secrets_manager_auth_policy > 0 ? time_sleep.wait_for_mongodb_authorization_policy[0].triggers["secrets_manager_region"] : local.existing_secrets_manager_instance_region
Expand Down
2 changes: 1 addition & 1 deletion tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/google/uuid v1.6.0
github.com/gruntwork-io/terratest v0.54.0
github.com/stretchr/testify v1.11.1
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.63.1
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.63.2
)

require (
Expand Down
4 changes: 2 additions & 2 deletions tests/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.63.1 h1:OfAXXOucAQtzhQrRZx3q6tdore8XH0LkRqCbgipt/1Y=
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.63.1/go.mod h1:HqX0S0Ue19y7TJRGR5+Np2Aq0xElgw3mM3zZCWwQc1I=
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.63.2 h1:nvVWXM78z1qBxmaSbSDd+66N37liZiKJWl/UecvJ6LY=
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.63.2/go.mod h1:HqX0S0Ue19y7TJRGR5+Np2Aq0xElgw3mM3zZCWwQc1I=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=
github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=
Expand Down