Skip to content

fix: remove enforced validation for stacks use cases #567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 6, 2025
Merged

fix: remove enforced validation for stacks use cases #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9a3351
fix: remove enforced validation for stacks use cases
ocofaigh Oct 6, 2025
d917eae
Update variables.tf
ocofaigh Oct 6, 2025
fc1fd06
Update variables.tf
ocofaigh Oct 6, 2025
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
15 changes: 0 additions & 15 deletions solutions/fully-configurable/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,6 @@ variable "kms_encryption_enabled" {
condition = var.kms_encryption_enabled == true ? (var.existing_kms_instance_crn != null || var.existing_kms_root_key_crn != null) && length(var.kms_endpoint_url) > 0 : true
error_message = "You must provide at least one of 'existing_kms_instance_crn' or 'existing_kms_root_key_crn' and also set the 'kms_endpoint_url' variable if 'kms_encryption_enabled' is set to true."
}

validation {
condition = var.kms_encryption_enabled == false ? (var.existing_kms_root_key_crn == null && var.existing_kms_instance_crn == null && var.kms_endpoint_url == null) : true
error_message = "If 'kms_encryption_enabled' is set to false. You should not pass values for 'existing_kms_instance_crn', 'existing_kms_root_key_crn' or 'kms_endpoint_url'."
}
}

variable "existing_kms_instance_crn" {
Expand All @@ -152,22 +147,12 @@ variable "existing_kms_instance_crn" {
])
error_message = "The provided KMS instance CRN in the input 'existing_kms_instance_crn' in not valid."
}

validation {
condition = var.existing_kms_instance_crn != null ? var.existing_event_notifications_instance_crn == null : true
error_message = "A value should not be passed for 'existing_kms_instance_crn' when passing an existing EN instance using the 'existing_event_notifications_instance_crn' input."
}
}

variable "kms_endpoint_url" {
type = string
description = "The KMS endpoint URL to use when you configure KMS encryption. When set to true, a value must be passed for either `existing_kms_root_key_crn` or `existing_kms_instance_crn` (to create a new key). The Hyper Protect Crypto Services endpoint URL format is `https://api.private.<REGION>.hs-crypto.cloud.ibm.com:<port>` and the Key Protect endpoint URL format is `https://<REGION>.kms.cloud.ibm.com`. Not required if passing an existing instance using the `existing_event_notifications_instance_crn` input."
default = null

validation {
condition = var.kms_endpoint_url != null ? var.existing_event_notifications_instance_crn == null : true
error_message = "A value should not be passed for 'kms_endpoint_url' when passing an existing EN instance using the 'existing_event_notifications_instance_crn' input."
}
}

variable "existing_kms_root_key_crn" {
Expand Down
15 changes: 0 additions & 15 deletions solutions/security-enforced/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,34 +93,19 @@ variable "existing_kms_instance_crn" {
])
error_message = "The provided KMS instance CRN in the input 'existing_kms_instance_crn' in not valid."
}

validation {
condition = var.existing_kms_instance_crn != null ? var.existing_event_notifications_instance_crn == null : true
error_message = "A value should not be passed for 'existing_kms_instance_crn' when passing an existing EN instance using the 'existing_event_notifications_instance_crn' input."
}
}

variable "kms_endpoint_url" {
type = string
description = "The KMS endpoint URL to use when you configure KMS encryption. When set to true, a value must be passed for either `existing_kms_root_key_crn` or `existing_kms_instance_crn` (to create a new key). The Hyper Protect Crypto Services endpoint URL format is `https://api.private.<REGION>.hs-crypto.cloud.ibm.com:<port>` and the Key Protect endpoint URL format is `https://<REGION>.kms.cloud.ibm.com`. Not required if passing an existing instance using the `existing_event_notifications_instance_crn` input."
default = null

validation {
condition = var.kms_endpoint_url != null ? var.existing_event_notifications_instance_crn == null : true
error_message = "A value should not be passed for 'kms_endpoint_url' when passing an existing EN instance using the 'existing_event_notifications_instance_crn' input."
}
}

variable "existing_kms_root_key_crn" {
type = string
description = "The key CRN of a root key which will be used to encrypt the data. To use an existing key you must also provide a value for 'kms_endpoint_url' and 'existing_kms_instance_crn' should be null. If no value passed, a new key will be created in the instance provided in the `existing_kms_instance_crn` input."
default = null

validation {
condition = var.existing_kms_root_key_crn != null ? var.existing_event_notifications_instance_crn == null : true
error_message = "A value should not be passed for 'existing_kms_root_key_crn' when passing an existing EN instance using the 'existing_event_notifications_instance_crn' input."
}

validation {
condition = var.existing_kms_root_key_crn != null ? var.existing_kms_instance_crn == null : true
error_message = "A value should not be passed for 'existing_kms_instance_crn' when passing an existing key value using the 'existing_kms_root_key_crn' input."
Expand Down