From ba43cf2a55454e0cfd56ad7c9c4b0ccd1832c995 Mon Sep 17 00:00:00 2001
From: Rajat Agrawal <108140212+rajatagarwal-ibm@users.noreply.github.com>
Date: Mon, 29 Apr 2024 12:10:00 +0100
Subject: [PATCH] fix: outputs and ci pipeline flag (#49)

---
 solutions/banking/outputs.tf    | 12 ++++++------
 tests/scripts/pre-validation.sh |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/solutions/banking/outputs.tf b/solutions/banking/outputs.tf
index 3bbaf4f..e637c2d 100644
--- a/solutions/banking/outputs.tf
+++ b/solutions/banking/outputs.tf
@@ -1,19 +1,19 @@
-output "project_id" {
+output "watsonx_project_id" {
   description = "ID of the created WatsonX project."
   value       = module.configure_project.project_id
 }
 
-output "project_url" {
+output "watsonx_project_url" {
   description = "WatsonX project ID URL."
   value       = "https://dataplatform.cloud.ibm.com/projects/${module.configure_project.project_id}"
 }
 
-output "watsonx_assistant_url" {
+output "watsonx_assistant_api_url" {
   description = "WatsonX Assistant URL."
   value       = local.watsonx_assistant_url
 }
 
-output "watsonx_discovery_url" {
+output "watsonx_discovery_api_url" {
   description = "WatsonX Discovery URL."
   value       = local.watsonx_discovery_url
 }
@@ -23,12 +23,12 @@ output "cos_instance_crn" {
   value       = module.cos.cos_instance_crn
 }
 
-output "assistant_integration_id" {
+output "watsonx_assistant_integration_id" {
   description = "WatsonX assistant integration ID."
   value       = data.external.assistant_get_integration_id.result.assistant_integration_id
 }
 
-output "discovery_project_id" {
+output "watsonx_discovery_project_id" {
   description = "WatsonX Discovery Project ID."
   value       = data.external.discovery_project_id.result.discovery_project_id
 }
diff --git a/tests/scripts/pre-validation.sh b/tests/scripts/pre-validation.sh
index 64b6a46..eaadb2d 100755
--- a/tests/scripts/pre-validation.sh
+++ b/tests/scripts/pre-validation.sh
@@ -44,6 +44,7 @@ TF_VARS_FILE="terraform.tfvars"
   secrets_manager_guid_var_name="secrets_manager_guid"
   secrets_manager_region_var_name="secrets_manager_region"
   signing_key_var_name="signing_key"
+  trigger_ci_pipeline_run_var_name="trigger_ci_pipeline_run"
 
   resource_group_name_value=$(terraform output -state=terraform.tfstate -raw resource_group_name)
   toolchain_resource_group_value=$(terraform output -state=terraform.tfstate -raw resource_group_name)
@@ -58,6 +59,7 @@ TF_VARS_FILE="terraform.tfvars"
   create_continuous_delivery_service_instance_value=false
   secrets_manager_guid_value=$(terraform output -state=terraform.tfstate -raw secrets_manager_guid)
   signing_key_value=$(terraform output -state=terraform.tfstate -raw signing_key)
+  trigger_ci_pipeline_run_value=false
 
   echo "Appending required input variable values to ${JSON_FILE}.."
 
@@ -98,6 +100,8 @@ TF_VARS_FILE="terraform.tfvars"
         --arg secrets_manager_guid_value "${secrets_manager_guid_value}" \
         --arg signing_key_var_name "${signing_key_var_name}" \
         --arg signing_key_value "${signing_key_value}" \
+        --arg trigger_ci_pipeline_run_var_name "${trigger_ci_pipeline_run_var_name}" \
+        --arg trigger_ci_pipeline_run_value "${trigger_ci_pipeline_run_value}" \
         '. + {($prefix_var_name): $prefix_value,
           ($resource_group_name_var_name): $resource_group_name_value,
           ($toolchain_region_var_name): $toolchain_region_value,
@@ -115,6 +119,7 @@ TF_VARS_FILE="terraform.tfvars"
           ($watson_machine_learning_instance_resource_name_var_name): $watson_machine_learning_instance_resource_name_value,
           ($secrets_manager_guid_var_name): $secrets_manager_guid_value,
           ($secrets_manager_region_var_name): $secrets_manager_region_value,
+          ($trigger_ci_pipeline_run_var_name): $trigger_ci_pipeline_run_value,
           ($signing_key_var_name): $signing_key_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1
 
   echo "Pre-validation complete successfully"