Skip to content
Closed
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
2 changes: 1 addition & 1 deletion solutions/fully-configurable/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ variable "existing_postgresql_instance_crn" {
variable "postgresql_version" {
description = "The version of the PostgreSQL instance. If no value is specified, the current preferred version of PostgreSQL is used."
type = string
default = null
default = "18"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you change this back to null please - we override the default in the ibm_catalog,json

}

variable "remote_leader_crn" {
Expand Down
4 changes: 2 additions & 2 deletions solutions/security-enforced/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ variable "existing_postgresql_instance_crn" {
}

variable "postgresql_version" {
description = "The version of the Databases for Redis instance."
description = "Version of the PostgreSQL instance. If no value is passed, the current preferred version of IBM Cloud Databases is used."
type = string
default = null
default = "18"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you change this back to null please - we override the default in the ibm_catalog.json

}

variable "remote_leader_crn" {
Expand Down
2 changes: 1 addition & 1 deletion tests/pr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
const fscloudExampleTerraformDir = "examples/fscloud"
const fullyConfigurableSolutionTerraformDir = "solutions/fully-configurable"
const securityEnforcedSolutionTerraformDir = "solutions/security-enforced"
const latestVersion = "17"
const latestVersion = "18"

// Use existing resource group
const resourceGroup = "geretain-test-postgres"
Expand Down
3 changes: 2 additions & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ variable "postgresql_version" {
validation {
condition = anytrue([
var.postgresql_version == null,
var.postgresql_version == "18",
var.postgresql_version == "17",
var.postgresql_version == "16",
var.postgresql_version == "15",
var.postgresql_version == "14",
var.postgresql_version == "13",
])
error_message = "Version must be 13, 14, 15, 16 or 17. If no value passed, the current ICD preferred version is used."
error_message = "Version must be 13, 14, 15, 16, 17 or 18. If no value passed, the current ICD preferred version is used."
}
}

Expand Down