Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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 ibm_catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@
"value": "__NULL__"
},
{
"displayname": "6.0",
"value": "6.0"
"displayname": "7.0",
"value": "7.0"
}

]
Expand Down
2 changes: 1 addition & 1 deletion solutions/standard/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ variable "users" {
}))
default = []
sensitive = true
description = "A list of users that you want to create on the database. Users block is supported by MongoDB version >= 6.0. Multiple blocks are allowed. The user password must be in the range of 10-32 characters. Be warned that in most case using IAM service credentials (via the var.service_credential_names) is sufficient to control access to the MongoDB instance. This blocks creates native MongoDB database users. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-icd-mongodb/blob/main/solutions/standard/DA-types.md#users)"
description = "A list of users that you want to create on the database. Users block is supported by MongoDB version >= 7.0. Multiple blocks are allowed. The user password must be in the range of 10-32 characters. Be warned that in most case using IAM service credentials (via the var.service_credential_names) is sufficient to control access to the MongoDB instance. This blocks creates native MongoDB database users. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-icd-mongodb/blob/main/solutions/standard/DA-types.md#users)"
}

variable "tags" {
Expand Down
2 changes: 1 addition & 1 deletion tests/other_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func TestRunFSCloudExample(t *testing.T) {
TerraformVars: map[string]interface{}{
"access_tags": permanentResources["accessTags"],
"kms_key_crn": permanentResources["hpcs_south_root_key_crn"],
"mongodb_version": "6.0", // Always lock this test into the latest supported MongoDB version
"mongodb_version": "7.0", // Always lock this test into the latest supported MongoDB version
},
CloudInfoService: sharedInfoSvc,
})
Expand Down
4 changes: 2 additions & 2 deletions tests/pr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func TestRunStandardSolutionSchematics(t *testing.T) {
{Name: "access_tags", Value: permanentResources["accessTags"], DataType: "list(string)"},
{Name: "existing_kms_instance_crn", Value: permanentResources["hpcs_south_crn"], DataType: "string"},
{Name: "kms_endpoint_type", Value: "private", DataType: "string"},
{Name: "mongodb_version", Value: "6.0", DataType: "string"}, // Always lock this test into the latest supported MongoDB version
{Name: "mongodb_version", Value: "7.0", DataType: "string"}, // Always lock this test into the latest supported MongoDB version
{Name: "resource_group_name", Value: options.Prefix, DataType: "string"},
{Name: "existing_secrets_manager_instance_crn", Value: permanentResources["secretsManagerCRN"], DataType: "string"},
{Name: "service_credential_secrets", Value: serviceCredentialSecrets, DataType: "list(object)"},
Expand Down Expand Up @@ -251,7 +251,7 @@ func TestPlanValidation(t *testing.T) {
options.TerraformOptions.Vars = map[string]interface{}{
"prefix": options.Prefix,
"region": "us-south",
"mongodb_version": "6.0",
"mongodb_version": "7.0",
"provider_visibility": "public",
"resource_group_name": options.Prefix,
}
Expand Down
3 changes: 2 additions & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ variable "mongodb_version" {
condition = anytrue([
var.mongodb_version == null,
var.mongodb_version == "6.0",
var.mongodb_version == "7.0",
])
error_message = "Version must be 6.0. If no value is passed, the current preferred version of IBM Cloud Databases is used."
error_message = "Version must be either 6.0 or 7.0. If no value is passed, the current preferred version of IBM Cloud Databases is used."
}
}

Expand Down