fix: update to variable validation (#116)

Author: shemau

examples/advanced/variables.tf

@@ -11,7 +11,7 @@ variable "ibmcloud_api_key" {
 variable "region" {
   type        = string
   description = "Region to provision all resources created by this example"
-  default     = "us-south"
+  default     = "us-east"
 }
 
 variable "prefix" {

examples/basic/variables.tf

@@ -11,7 +11,7 @@ variable "ibmcloud_api_key" {
 variable "region" {
   type        = string
   description = "Region to provision all resources created by this example"
-  default     = "us-south"
+  default     = "us-east"
 }
 
 variable "prefix" {

modules/mq-instance/main.tf

@@ -3,7 +3,6 @@
 #
 # Create an MQ on Cloud SaaS instance
 ##############################################################################
-
 locals {
   # Capacity instance
   split_capacity_crn        = var.existing_mq_capacity_crn != null ? split(":", var.existing_mq_capacity_crn) : []

modules/mq-instance/variables.tf

@@ -27,15 +27,15 @@ variable "existing_mq_capacity_crn" {
   type        = string
   description = "The CRN of an existing capacity service instance, if not specifed, a new capacity plan will be created."
   default     = null
+
+  validation {
+    condition     = (var.existing_mq_capacity_crn != null && var.subscription_id == null) || (var.existing_mq_capacity_crn == null && var.subscription_id != null)
+    error_message = "Exactly one of 'existing_mq_capacity_crn' or 'subscription_id' is required."
+  }
 }
 
 variable "subscription_id" {
   type        = string
   description = "The MQ on Cloud subscription id. Required if `existing_mq_capacity_crn` is not specified."
   default     = null
-
-  validation {
-    condition     = (var.subscription_id == null && var.existing_mq_capacity_crn == null) ? false : true
-    error_message = "Exactly one of 'existing_mq_capacity_crn' or 'subscription_id' is required."
-  }
 }

tests/pr_test.go

@@ -125,7 +125,7 @@ func TestRunStandardSolutionSchematics(t *testing.T) {
 		Prefix:                 "mqoc-da",
 		DeleteWorkspaceOnFail:  false,
 		WaitJobCompleteMinutes: 60,
-		Region:                 "us-south",
+		Region:                 "us-east",
 	})
 
 	options.TerraformVars = []testschematic.TestSchematicTerraformVar{