0.0.12 (#53)

* feat: bump submodule

* feat: bump versions

* feat: update stack reference architecture

* docs: remove documentation around manual steps

* fix: fix issue causing clashes in code engine names

* feat: bump to rag app da v1.5.0

* chore: bump to Secret Manager to version v1.12.0 Security Compliance Center to version v1.6.3

* feat: allow to pass crn to existing secret manager instance

* feat: add input wrt platform metrics and logging

* chore: bump DA versions

* chore: bump DA versions

* fix: obs to use resource group

* fix: missing secret manager region

* fix: reverse sm config

* feat: bump sm to v1.12.2

* fix: some minor improvements to deploy-many scripts

* fix: missing rg config in sm stack

* docs: update doc with new options

* fix: point to correct region for existing sm

* feat: bump versions

* feat: change name of ALM config

* fix: update references to accomodate config change

* chore: bump sm

* dev: update deploy-many.sh

* fix: adjust variable name

* feat: default secret manager to trial

* docs: add description for stack inputs

* docs: add description for stack inputs

Author: vburckhardt

ibm_catalog.json

@@ -133,54 +133,89 @@
 						{
 							"key": "prefix",
 							"type": "string",
+							"default_value": "rag",
+							"description": "A prefix added to the name of all resources created by this solution. Used to avoid name clashes in the target account.",
 							"required": true
 						},
 						{
-							"name": "ibmcloud_api_key",
-							"required": true,
-							"type": "password",
-							"hidden": false
+							"key": "enable_platform_logs_metrics",
+							"type": "boolean",
+							"default_value": false,
+							"description": "Whether to provision logging and monitoring instances are configured to receive all platform logs and metrics in the target region. There can only be one instance per region provisioned for platform logs/metrics.",
+							"required": false
 						},
 						{
-							"name": "watsonx_admin_api_key",
-							"required": false,
+							"key": "existing_secrets_manager_crn",
+							"type": "string",
+							"default_value": "__NULL__",
+							"description": "The CRN of an existing secret manager instance to use in this solution. If not set, a new secret manager instance is provisioned. ",
+							"required": false
+						},
+						{
+							"key": "ibmcloud_api_key",
 							"type": "password",
-							"hidden": false
+							"description": "The API Key used to provision all resources created in this solution.",
+							"required": true
 						},
 						{
-							"name": "resource_group_name",
-							"required": false,
+							"key": "region",
 							"type": "string",
-							"hidden": false,
-							"default_value": "stack-service-rg"
+							"default_value": "us-south",
+							"description": "The region in which all resources are deployed.",
+							"required": false,
+							"options": [
+								{
+									"displayname": "Option 1",
+									"value": "us-south"
+								},
+								{
+									"displayname": "Option 2",
+									"value": "eu-de"
+								}
+							]
 						},
 						{
-							"name": "region",
-							"required": false,
+							"key": "resource_group_name",
 							"type": "string",
-							"hidden": false,
-							"default": "us-south"
+							"default_value": "__NULL__",
+							"description": "The name of the resource group that is created by this solution. The actual name is prefixed with the value of the input 'prefix'.  All resources created by this solution are deployed in this resource group. ",
+							"required": false
 						},
 						{
-							"name": "sample_app_git_url",
-							"required": false,
+							"key": "sample_app_git_url",
 							"type": "string",
-							"hidden": false,
-							"default_value": "https://github.com/IBM/gen-ai-rag-watsonx-sample-application"
+							"default_value": "https://github.com/IBM/gen-ai-rag-watsonx-sample-application",
+							"description": "The URL to the public git repository containing the sample rag application code.",
+							"required": false
 						},
 						{
-							"name": "signing_key",
+							"key": "secret_manager_service_plan",
+							"type": "string",
+							"default_value": "trial",
+							"description": "The service/pricing plan to use when provisioning a new Secrets Manager instance. Allowed values: 'standard' and 'trial'. Only one trial instance is allowed per account.",
 							"required": false,
+							"options": [
+								{
+									"displayname": "Option 1",
+									"value": "trial"
+								},
+								{
+									"displayname": "Option 2",
+									"value": "standard"
+								}
+							]
+						},
+						{
+							"key": "signing_key",
 							"type": "password",
-							"hidden": false,
-							"default_value": "replace"
+							"description": "The key used to sign the application image built by the CI pipeline deployed in this solution.",
+							"required": false
 						},
 						{
-							"name": "enable_platform_logs_metrics",
-							"required": false,
-							"type": "boolean",
-							"hidden": false,
-							"default_value": false
+							"key": "watsonx_admin_api_key",
+							"type": "password",
+							"description": "The API Key used to provision the watson project resources. If not set, the ibmcloud_api_key is used.",
+							"required": false
 						}
 					],
 					"install_type": "fullstack"

stack_definition.json

@@ -7,6 +7,13 @@
       "hidden": false,
       "default": "rag-stack"
     },
+    {
+      "name": "secret_manager_service_plan",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "trial"
+    },
     {
       "name": "ibmcloud_api_key",
       "required": true,
@@ -139,7 +146,7 @@
     },
     {
       "name": "2b - Security Service - Secret Manager",
-      "version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.2bc1285e-9979-4903-98ae-537c08d50eb1",
+      "version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.4c4b156f-22ff-47be-8519-a09d5fb80d9c",
       "inputs": [
         {
           "name": "prefix",
@@ -284,7 +291,7 @@
           "value": "plus"
         },
         {
-          "name": "watson_assistant_plan",
+          "name": "watsonx_assistant_plan",
           "value": "plus"
         },
         {
@@ -417,7 +424,7 @@
         },
         {
           "name": "watson_discovery_instance_id",
-          "value": "ref:../4 - WatsonX SaaS services/outputs/watsonx_discovery_guid"
+          "value": "ref:../4 - WatsonX SaaS services/outputs/watson_discovery_guid"
         },
         {
           "name": "watson_assistant_region",