fix: DA updates:<br>- existing_user_name input has been removed<br>- user_email output has been removed<br>- fix added for incorrect validation logic (#62)

shemau · web-flow · commit a201610053a6 · 2024-11-29T12:58:40.000Z
diff --git a/ibm_catalog.json b/ibm_catalog.json
@@ -120,9 +120,6 @@
               {
                 "key": "user_name"
               },
-              {
-                "key": "existing_user_name"
-              },
               {
                 "key": "user_email"
               },
diff --git a/solutions/standard/main.tf b/solutions/standard/main.tf
@@ -16,10 +16,11 @@ locals {
   create_queue_manager = var.existing_queue_manager_name == null ? true : false
 
   # Application
-  create_application = var.existing_application_name == null ? true : false
+  create_application = var.application_name == null ? false : true
+  lookup_application = var.existing_application_name == null ? false : true
 
   # User
-  create_user = var.existing_user_name == null ? true : false
+  create_user = var.user_name == null ? false : true
 
   # Certificate, only supports looking up the existing default certificate
   create_certificate = false
@@ -94,15 +95,10 @@ module "experimental_connection" {
   href             = local.queue_manager_href
 }
 
-
 ########################################################################################################################
 # MQ queue configuraton
 ########################################################################################################################
 
-# Need to pass the user (local.user_name) and the application api key (module.experimental_api_key.api_key)
-# Need to pass the queue manager administrator href (local.queue_manager_administrator_api_endpoint_url)
-
-
 ########################################################################################################################
 # MQ application
 ########################################################################################################################
@@ -115,14 +111,15 @@ module "application" {
 }
 
 data "ibm_mqcloud_application" "application" {
-  count                 = local.create_application ? 0 : 1
+  count                 = local.lookup_application ? 1 : 0
   name                  = var.existing_application_name
   service_instance_guid = local.mq_deployment_guid
 }
 
 locals {
-  application_create_api_key_uri = local.create_application ? module.application[0].create_api_key_uri : data.ibm_mqcloud_application.application[0].applications[0].create_api_key_uri
-  application_href               = local.create_application ? module.application[0].href : data.ibm_mqcloud_application.application[0].applications[0].href
+  application_create_api_key_uri = local.create_application ? module.application[0].create_api_key_uri : local.lookup_application ? data.ibm_mqcloud_application.application[0].applications[0].create_api_key_uri : null
+  application_href               = local.create_application ? module.application[0].href : local.lookup_application ? data.ibm_mqcloud_application.application[0].applications[0].href : null
+  application_id                 = local.create_application ? module.application[0].id : local.lookup_application ? data.ibm_mqcloud_application.application[0].applications[0].id : null
 }
 
 ########################################################################################################################
@@ -137,11 +134,6 @@ module "user" {
   service_instance_crn = local.mq_deployment_crn
 }
 
-# For a new user, add them and use; for an existing user just use supplied name
-locals {
-  user = local.create_user ? var.user_email : var.existing_user_name
-}
-
 ########################################################################################################################
 # MQ CA certificate
 ########################################################################################################################
diff --git a/solutions/standard/outputs.tf b/solutions/standard/outputs.tf
@@ -140,7 +140,7 @@ output "connection_app_type" {
 
 output "application_id" {
   description = "The unique identifier of the mqcloud_application."
-  value       = local.create_application ? module.application[0].id : data.ibm_mqcloud_application.application[0].applications[0].id
+  value       = local.application_id
 }
 
 output "application_create_api_key_uri" {
@@ -167,15 +167,6 @@ output "truststore_root_certificate" {
   sensitive   = true
 }
 
-########################################################################################################################
-# User
-########################################################################################################################
-
-output "user_email" {
-  description = "name"
-  value       = local.user
-}
-
 ########################################################################################################################
 # Secrets
 ########################################################################################################################
diff --git a/solutions/standard/variables.tf b/solutions/standard/variables.tf
@@ -120,12 +120,6 @@ variable "user_name" {
   default     = null
 }
 
-variable "existing_user_name" {
-  type        = string
-  description = "The name of an existing user."
-  default     = null
-}
-
 variable "user_email" {
   type        = string
   description = "The email address to given to the new user."
diff --git a/tests/pr_test.go b/tests/pr_test.go
@@ -48,7 +48,7 @@ func setupOptions(t *testing.T, prefix string, dir string) *testhelper.TestOptio
 }
 
 func TestRunAdvancedExample(t *testing.T) {
-	t.Parallel()
+	// t.Parallel()
 
 	options := setupOptions(t, "mqoc", advancedExampleDir)
 
@@ -58,26 +58,29 @@ func TestRunAdvancedExample(t *testing.T) {
 }
 
 func TestRunUpgradeExample(t *testing.T) {
-	t.Parallel()
+	// t.Parallel()
 
 	options := testhelper.TestOptionsDefaultWithVars(&testhelper.TestOptions{
 		Testing:      t,
 		TerraformDir: standardSolutionTerraformDir,
 		Prefix:       "mq",
 		Region:       "us-east",
-		TerraformVars: map[string]interface{}{
-			"existing_mq_capacity_crn":   permanentResources["mq_capacity_crn"],
-			"deployment_name":            "da-upg-instance",
-			"queue_manager_name":         "da_upg",
-			"queue_manager_display_name": "da-upg-display",
-			"queue_manager_size":         "xsmall",
-			"resource_group_name":        "mq",
-			"application_name":           "app",
-			"user_email":                 "mq-user@exmaple.com",
-			"user_name":                  "mq-user",
-		},
 	})
 
+	terraformVars := map[string]interface{}{
+		"existing_mq_capacity_crn":   permanentResources["mq_capacity_crn"],
+		"deployment_name":            "da-upg-instance",
+		"queue_manager_name":         "da_upg",
+		"queue_manager_display_name": "da-upg-display",
+		"queue_manager_size":         "xsmall",
+		"resource_group_name":        options.Prefix,
+		"application_name":           "app",
+		"user_email":                 "mq-user@exmaple.com",
+		"user_name":                  "mq-user",
+	}
+
+	options.TerraformVars = terraformVars
+
 	// TODO: Once this test is on main, make this RunTestUpgrade
 	output, err := options.RunTestConsistency()
 	if !options.UpgradeTestSkipped {
@@ -86,8 +89,38 @@ func TestRunUpgradeExample(t *testing.T) {
 	}
 }
 
+// Run the DA in minimal configuration, valid logic for options
+// used in catalog pipeline
+func TestRunInstanceOnlyExample(t *testing.T) {
+	// t.Parallel()
+
+	options := testhelper.TestOptionsDefaultWithVars(&testhelper.TestOptions{
+		Testing:      t,
+		TerraformDir: standardSolutionTerraformDir,
+		Prefix:       "mqi",
+		Region:       "us-east",
+	})
+
+	terraformVars := map[string]interface{}{
+		"existing_mq_capacity_crn":   permanentResources["mq_capacity_crn"],
+		"deployment_name":            "instance-only",
+		"queue_manager_name":         "inst",
+		"queue_manager_display_name": "instance-display",
+		"queue_manager_size":         "xsmall",
+		"resource_group_name":        options.Prefix,
+	}
+
+	options.TerraformVars = terraformVars
+
+	output, err := options.RunTestConsistency()
+	if !options.UpgradeTestSkipped {
+		assert.Nil(t, err, "This should not have errored")
+		assert.NotNil(t, output, "Expected some output")
+	}
+}
+
 func TestRunStandardSolutionSchematics(t *testing.T) {
-	t.Parallel()
+	// t.Parallel()
 
 	options := testschematic.TestSchematicOptionsDefault(&testschematic.TestSchematicOptions{
 		Testing: t,

Original file line number	Diff line number	Diff line change
`@@ -120,9 +120,6 @@`
`120`	`120`	`{`
`121`	`121`	`"key": "user_name"`
`122`	`122`	`},`
`123`		`- {`
`124`		`- "key": "existing_user_name"`
`125`		`- },`
`126`	`123`	`{`
`127`	`124`	`"key": "user_email"`
`128`	`125`	`},`