From 2a8e449eba7cb894c497bcca3a96fd5673556a96 Mon Sep 17 00:00:00 2001 From: "akocbek@ie.ibm.com" Date: Tue, 20 Aug 2024 16:25:16 +0100 Subject: [PATCH 1/5] fix: update architecture diagrams --- .../RAG Pattern v2-part-2.svg | 5 +- reference-architecture/rag-stack.svg | 5 +- sample_deploy_config.json | 8 +- solutions/basic/stack_definition.json | 188 +++++++++--------- 4 files changed, 106 insertions(+), 100 deletions(-) diff --git a/reference-architecture/RAG Pattern v2-part-2.svg b/reference-architecture/RAG Pattern v2-part-2.svg index 9074551..6c9861c 100644 --- a/reference-architecture/RAG Pattern v2-part-2.svg +++ b/reference-architecture/RAG Pattern v2-part-2.svg @@ -1 +1,4 @@ -
IBM Cloud
IBM Cloud
IBM Cloud (Saas)
IBM Cloud (Saas)
Client Workload
Client Workload
User
User
GenAI App
GenA...
Watsonx Assistant
Wats...
Watsonx.ai
Wats...
Watson Discovery
Wats...
3
3
4
4
2
2
6
6
1
1
5
5


1. User asks natural language question

2. GenAI app routes question to Watsonx Assistant for conversational flow

3. Watsonx assistant semantic search for relevant content on Watson Discovery

4. Watsonx Assistant queries Watsonx.ai for generating summary of relevant content

5. Watsonx Assistant response to the GenAI app

6. Generated summarized response received by user

1. Use...Viewer does not support full SVG 1.1 \ No newline at end of file + + + + \ No newline at end of file diff --git a/reference-architecture/rag-stack.svg b/reference-architecture/rag-stack.svg index eed3ac3..d5da991 100644 --- a/reference-architecture/rag-stack.svg +++ b/reference-architecture/rag-stack.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + +
Primary Region (Multi Zone)
5
Client Workload
Gen AI App
Data Processing
watsonx Assistant or watsonx.ai
SaaS
Cloud Object Storagewatsonx.ai In-memoryICD Elasticsearch or Watson Discovery
LLM 
(Embedded)
6
IBM Cloud
1. Raw client data is stored in Object Storage 
2. Data is processed utilizing custom tools or data preparation and transformation features available in watsonx.ai or watsonx Asssitant. 
    Machine learning models create vector indexes/embeddings and store 'in-memory' watsonx.ai or Elasticsearch vector db. Alternatively 
    create and store keyword indexes in Watson Discovery.
3. User asks natural language question (Query)
4. Gen AI app routes question through watsonx Assistant (for conversational flow) or through watsonx.ai
5. watsonx Assistant or watsonx.ai queries the vector or keyword indexes to get the relevant content (Retrieval)
6. The received content is sent to LLM to generate a summary (Generation)
7. Generated summary response is sent to the requesting Gen AI app
8. Generated summarized response is received by the user (Response)
UserAI EngineerClient Data
7
2
3
4
8
1
 \ No newline at end of file diff --git a/sample_deploy_config.json b/sample_deploy_config.json index bfb8b05..8f54f27 100644 --- a/sample_deploy_config.json +++ b/sample_deploy_config.json @@ -5,15 +5,15 @@ "stack_api_key_env": "IBMCLOUD_API_KEY", "config_order": [ "1 - Account Infrastructure Base", - "2a - Security Service - Key Management", - "2b - WatsonX SaaS services", + "2 - Security Service - Key Management", "3a - Observability - Logging Monitoring Activity Tracker", "3b - Databases for Elasticsearch", "4 - Event Notifications", "5a - Security Service - Secret Manager", "5b - Security Service - Security Compliance Center", - "6 - Sample RAG app - Application Lifecycle Management", - "7 - Sample RAG app configuration" + "6 - WatsonX SaaS services", + "7 - Sample RAG app - Application Lifecycle Management", + "8 - Sample RAG app configuration" ], "stack_inputs": { "prefix": "", diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json index 8fd5a88..9533c96 100644 --- a/solutions/basic/stack_definition.json +++ b/solutions/basic/stack_definition.json @@ -212,7 +212,7 @@ ] }, { - "name": "2a - Security Service - Key Management", + "name": "2 - Security Service - Key Management", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a58250eb-8af0-4874-842e-88e66f5ffbb8-global", "inputs": [ { @@ -241,80 +241,6 @@ } ] }, - { - "name": "2b - WatsonX SaaS services", - "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.6da72ae0-73c6-43f5-adc5-9d78f08be81d-global", - "inputs": [ - { - "name": "ibmcloud_api_key", - "value": "" - }, - { - "name": "watsonx_admin_api_key", - "value": "ref:../../inputs/watsonx_admin_api_key" - }, - { - "name": "resource_group_name", - "value": "ref:../1 - Account Infrastructure Base/outputs/workload_resource_group_name" - }, - { - "name": "location", - "value": "ref:../../inputs/region" - }, - { - "name": "resource_prefix", - "value": "ref:../../inputs/prefix" - }, - { - "name": "use_existing_resource_group", - "value": true - }, - { - "name": "watson_machine_learning_plan", - "value": "v2-standard" - }, - { - "name": "existing_machine_learning_instance", - "value": "ref:../../inputs/existing_machine_learning_instance" - }, - { - "name": "watson_studio_plan", - "value": "professional-v1" - }, - { - "name": "existing_studio_instance", - "value": "ref:../../inputs/existing_studio_instance" - }, - { - "name": "watson_discovery_plan", - "value": "do not install" - }, - { - "name": "existing_discovery_instance", - "value": "ref:../../inputs/existing_discovery_instance" - }, - { - "name": "watsonx_assistant_plan", - "value": "plus" - }, - { - "name": "existing_assistant_instance", - "value": "ref:../../inputs/existing_assistant_instance" - }, - { - "name": "watsonx_governance_plan", - "value": "do not install" - }, - { - "name": "existing_governance_instance", - "value": "ref:../../inputs/existing_governance_instance" - }, - { - "name": "cos_kms_crn", - "value": "ref:../2a - Security Service - Key Management/outputs/kms_instance_crn" - } - ] - }, { "name": "3a - Observability - Logging Monitoring Activity Tracker", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.6d66c3b4-6b0a-4484-a59e-8f490e3ff8b8-global", @@ -329,7 +255,7 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../2a - Security Service - Key Management/outputs/kms_instance_crn" + "value": "ref:../2 - Security Service - Key Management/outputs/kms_instance_crn" }, { "name": "resource_group_name", @@ -383,7 +309,7 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../../members/2a - Security Service - Key Management/outputs/kms_instance_crn" + "value": "ref:../../members/2 - Security Service - Key Management/outputs/kms_instance_crn" }, { "name": "kms_endpoint_type", @@ -413,11 +339,11 @@ "inputs": [ { "name": "kms_endpoint_url", - "value": "ref:../2a - Security Service - Key Management/outputs/kms_private_endpoint" + "value": "ref:../2 - Security Service - Key Management/outputs/kms_private_endpoint" }, { "name": "existing_kms_instance_crn", - "value": "ref:../2a - Security Service - Key Management/outputs/kms_instance_crn" + "value": "ref:../2 - Security Service - Key Management/outputs/kms_instance_crn" }, { "name": "kms_endpoint_type", @@ -471,7 +397,7 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../2a - Security Service - Key Management/outputs/kms_instance_crn" + "value": "ref:../2 - Security Service - Key Management/outputs/kms_instance_crn" }, { "name": "use_existing_resource_group", @@ -513,7 +439,7 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../2a - Security Service - Key Management/outputs/kms_instance_crn" + "value": "ref:../2 - Security Service - Key Management/outputs/kms_instance_crn" }, { "name": "use_existing_resource_group", @@ -530,7 +456,81 @@ ] }, { - "name": "6 - Sample RAG app - Application Lifecycle Management", + "name": "6 - WatsonX SaaS services", + "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.6da72ae0-73c6-43f5-adc5-9d78f08be81d-global", + "inputs": [ + { + "name": "ibmcloud_api_key", + "value": "" + }, + { + "name": "watsonx_admin_api_key", + "value": "ref:../../inputs/watsonx_admin_api_key" + }, + { + "name": "resource_group_name", + "value": "ref:../1 - Account Infrastructure Base/outputs/workload_resource_group_name" + }, + { + "name": "location", + "value": "ref:../../inputs/region" + }, + { + "name": "resource_prefix", + "value": "ref:../../inputs/prefix" + }, + { + "name": "use_existing_resource_group", + "value": true + }, + { + "name": "watson_machine_learning_plan", + "value": "v2-standard" + }, + { + "name": "existing_machine_learning_instance", + "value": "ref:../../inputs/existing_machine_learning_instance" + }, + { + "name": "watson_studio_plan", + "value": "professional-v1" + }, + { + "name": "existing_studio_instance", + "value": "ref:../../inputs/existing_studio_instance" + }, + { + "name": "watson_discovery_plan", + "value": "do not install" + }, + { + "name": "existing_discovery_instance", + "value": "ref:../../inputs/existing_discovery_instance" + }, + { + "name": "watsonx_assistant_plan", + "value": "plus" + }, + { + "name": "existing_assistant_instance", + "value": "ref:../../inputs/existing_assistant_instance" + }, + { + "name": "watsonx_governance_plan", + "value": "do not install" + }, + { + "name": "existing_governance_instance", + "value": "ref:../../inputs/existing_governance_instance" + }, + { + "name": "cos_kms_crn", + "value": "ref:../2 - Security Service - Key Management/outputs/kms_instance_crn" + } + ] + }, + { + "name": "7 - Sample RAG app - Application Lifecycle Management", "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.3a73ae21-ca89-4120-836a-3d4da7df7ce0-global", "inputs": [ { @@ -628,7 +628,7 @@ ] }, { - "name": "7 - Sample RAG app configuration", + "name": "8 - Sample RAG app configuration", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.d7ea2d8d-b35a-471a-ae83-02b0ea9989b9-global", "inputs": [ { @@ -649,27 +649,27 @@ }, { "name": "watson_assistant_instance_id", - "value": "ref:../2b - WatsonX SaaS services/outputs/watsonx_assistant_guid" + "value": "ref:../6 - WatsonX SaaS services/outputs/watsonx_assistant_guid" }, { "name": "cd_pipeline_id", - "value": "ref:../6 - Sample RAG app - Application Lifecycle Management/outputs/cd_pipeline_id" + "value": "ref:../7 - Sample RAG app - Application Lifecycle Management/outputs/cd_pipeline_id" }, { "name": "ci_pipeline_id", - "value": "ref:../6 - Sample RAG app - Application Lifecycle Management/outputs/ci_pipeline_id" + "value": "ref:../7 - Sample RAG app - Application Lifecycle Management/outputs/ci_pipeline_id" }, { "name": "watson_machine_learning_instance_guid", - "value": "ref:../2b - WatsonX SaaS services/outputs/watson_machine_learning_guid" + "value": "ref:../6 - WatsonX SaaS services/outputs/watson_machine_learning_guid" }, { "name": "watson_machine_learning_instance_resource_name", - "value": "ref:../2b - WatsonX SaaS services/outputs/watson_machine_learning_name" + "value": "ref:../6 - WatsonX SaaS services/outputs/watson_machine_learning_name" }, { "name": "watson_machine_learning_instance_crn", - "value": "ref:../2b - WatsonX SaaS services/outputs/watson_machine_learning_crn" + "value": "ref:../6 - WatsonX SaaS services/outputs/watson_machine_learning_crn" }, { "name": "toolchain_resource_group", @@ -709,7 +709,7 @@ }, { "name": "cos_kms_crn", - "value": "ref:../2a - Security Service - Key Management/outputs/kms_instance_crn" + "value": "ref:../2 - Security Service - Key Management/outputs/kms_instance_crn" } ] } @@ -733,19 +733,19 @@ }, { "name": "watsonx_project_url", - "value": "ref:../7 - Sample RAG app configuration/outputs/watsonx_project_url" + "value": "ref:../8 - Sample RAG app configuration/outputs/watsonx_project_url" }, { "name": "watsonx_project_id", - "value": "ref:../7 - Sample RAG app configuration/outputs/watsonx_project_id" + "value": "ref:../8 - Sample RAG app configuration/outputs/watsonx_project_id" }, { "name": "watson_discovery_api_url", - "value": "ref:../7 - Sample RAG app configuration/outputs/watson_discovery_api_url" + "value": "ref:../8 - Sample RAG app configuration/outputs/watson_discovery_api_url" }, { "name": "watson_discovery_project_id", - "value": "ref:../7 - Sample RAG app configuration/outputs/watson_discovery_project_id" + "value": "ref:../8 - Sample RAG app configuration/outputs/watson_discovery_project_id" } ] } From 479316ce2602d5c3bc1376eec7775ac70e80e2b3 Mon Sep 17 00:00:00 2001 From: Todd Giguere Date: Thu, 22 Aug 2024 14:29:32 -0400 Subject: [PATCH 2/5] fix: remove extra region param in kms --- solutions/basic/stack_definition.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json index 9533c96..87d6040 100644 --- a/solutions/basic/stack_definition.json +++ b/solutions/basic/stack_definition.json @@ -231,10 +231,6 @@ "name": "region", "value": "ref:../../inputs/region" }, - { - "name": "region", - "value": "ref:../../inputs/region" - }, { "name": "existing_kms_instance_crn", "value": "ref:../../inputs/existing_kms_instance_crn" From 2d71254894631e15618429ddd83ad6dfd28339dc Mon Sep 17 00:00:00 2001 From: Todd Giguere Date: Thu, 22 Aug 2024 14:41:48 -0400 Subject: [PATCH 3/5] fix(deps): update to latest version of secret manager --- solutions/basic/stack_definition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json index 87d6040..76a8508 100644 --- a/solutions/basic/stack_definition.json +++ b/solutions/basic/stack_definition.json @@ -373,7 +373,7 @@ }, { "name": "5a - Security Service - Secret Manager", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3ed1f957-f294-422f-be13-d18c4c87e883-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.266ee06f-e0d3-486e-8016-c5ce25845680-global", "inputs": [ { "name": "prefix", From b54e00d9bc79f3e2f116347596e9df292784624e Mon Sep 17 00:00:00 2001 From: Todd Giguere Date: Thu, 22 Aug 2024 15:01:55 -0400 Subject: [PATCH 4/5] refactor: rename and reorder stack members --- sample_deploy_config.json | 24 +-- solutions/basic/stack_definition.json | 204 +++++++++++++------------- 2 files changed, 115 insertions(+), 113 deletions(-) diff --git a/sample_deploy_config.json b/sample_deploy_config.json index 8f54f27..2ce2694 100644 --- a/sample_deploy_config.json +++ b/sample_deploy_config.json @@ -1,19 +1,21 @@ { "project_name": "", "stack_name": "", - "//": ["checkov:skip=CKV_SECRET_6: ignore stack_api_key_env in this file"], + "//": [ + "checkov:skip=CKV_SECRET_6: ignore stack_api_key_env in this file" + ], "stack_api_key_env": "IBMCLOUD_API_KEY", "config_order": [ - "1 - Account Infrastructure Base", - "2 - Security Service - Key Management", - "3a - Observability - Logging Monitoring Activity Tracker", - "3b - Databases for Elasticsearch", - "4 - Event Notifications", - "5a - Security Service - Secret Manager", - "5b - Security Service - Security Compliance Center", - "6 - WatsonX SaaS services", - "7 - Sample RAG app - Application Lifecycle Management", - "8 - Sample RAG app configuration" + "Account Infrastructure Base", + "Baseline Security - Encryption Key Management", + "Baseline Security - Logging Monitoring Activity Tracker", + "Baseline Security - Observability Event Notifications", + "Baseline Security - Secrets Manager", + "Baseline Security - Security Compliance Center", + "Gen AI - Databases for Elasticsearch", + "Gen AI - WatsonX SaaS services", + "Workload - Application Lifecycle Management", + "Workload - Sample RAG App Configuration" ], "stack_inputs": { "prefix": "", diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json index 76a8508..d5303af 100644 --- a/solutions/basic/stack_definition.json +++ b/solutions/basic/stack_definition.json @@ -134,7 +134,7 @@ ], "members": [ { - "name": "1 - Account Infrastructure Base", + "name": "Account Infrastructure Base", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.7546bd0d-010e-4e34-90d5-5bd7d2fa820c-global", "inputs": [ { @@ -212,12 +212,12 @@ ] }, { - "name": "2 - Security Service - Key Management", + "name": "Baseline Security - Encryption Key Management", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a58250eb-8af0-4874-842e-88e66f5ffbb8-global", "inputs": [ { "name": "resource_group_name", - "value": "ref:../1 - Account Infrastructure Base/outputs/security_resource_group_name" + "value": "ref:../Account Infrastructure Base/outputs/security_resource_group_name" }, { "name": "use_existing_resource_group", @@ -238,7 +238,7 @@ ] }, { - "name": "3a - Observability - Logging Monitoring Activity Tracker", + "name": "Baseline Security - Logging Monitoring Activity Tracker", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.6d66c3b4-6b0a-4484-a59e-8f490e3ff8b8-global", "inputs": [ { @@ -251,11 +251,11 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../2 - Security Service - Key Management/outputs/kms_instance_crn" + "value": "ref:../Baseline Security - Encryption Key Management/outputs/kms_instance_crn" }, { "name": "resource_group_name", - "value": "ref:../1 - Account Infrastructure Base/outputs/observability_resource_group_name" + "value": "ref:../Account Infrastructure Base/outputs/observability_resource_group_name" }, { "name": "prefix", @@ -276,70 +276,16 @@ ] }, { - "name": "3b - Databases for Elasticsearch", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2d84cdb9-84a9-4487-880d-574c47482646-global", - "inputs": [ - { - "name": "use_existing_resource_group", - "value": true - }, - { - "name": "resource_group_name", - "value": "ref:../../members/1 - Account Infrastructure Base/outputs/workload_resource_group_name" - }, - { - "name": "region", - "value": "ref:../../inputs/region" - }, - { - "name": "prefix", - "value": "ref:../../inputs/prefix" - }, - { - "name": "plan", - "value": "ref:../../inputs/elasticsearch_plan" - }, - { - "name": "elasticsearch_version", - "value": "8.12" - }, - { - "name": "existing_kms_instance_crn", - "value": "ref:../../members/2 - Security Service - Key Management/outputs/kms_instance_crn" - }, - { - "name": "kms_endpoint_type", - "value": "private" - }, - { - "name": "member_host_flavor", - "value": "b3c.4x16.encrypted" - }, - { - "name": "service_credential_names", - "value": { - "elastic_db_admin": "Administrator", - "wxasst_db_user": "Editor", - "toolchain_db_user": "Editor" - } - }, - { - "name": "existing_db_instance_crn", - "value": "ref:../../inputs/existing_db_instance_crn" - } - ] - }, - { - "name": "4 - Event Notifications", + "name": "Baseline Security - Observability Event Notifications", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.ac3acff3-aa75-41f1-a5db-217d7bf6928a-global", "inputs": [ { "name": "kms_endpoint_url", - "value": "ref:../2 - Security Service - Key Management/outputs/kms_private_endpoint" + "value": "ref:../Baseline Security - Encryption Key Management/outputs/kms_private_endpoint" }, { "name": "existing_kms_instance_crn", - "value": "ref:../2 - Security Service - Key Management/outputs/kms_instance_crn" + "value": "ref:../Baseline Security - Encryption Key Management/outputs/kms_instance_crn" }, { "name": "kms_endpoint_type", @@ -347,7 +293,7 @@ }, { "name": "resource_group_name", - "value": "ref:../1 - Account Infrastructure Base/outputs/observability_resource_group_name" + "value": "ref:../Account Infrastructure Base/outputs/observability_resource_group_name" }, { "name": "use_existing_resource_group", @@ -363,7 +309,7 @@ }, { "name": "existing_monitoring_crn", - "value": "ref:../3a - Observability - Logging Monitoring Activity Tracker/outputs/cloud_monitoring_crn" + "value": "ref:../Baseline Security - Logging Monitoring Activity Tracker/outputs/cloud_monitoring_crn" }, { "name": "existing_en_instance_crn", @@ -372,7 +318,7 @@ ] }, { - "name": "5a - Security Service - Secret Manager", + "name": "Baseline Security - Secrets Manager", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.266ee06f-e0d3-486e-8016-c5ce25845680-global", "inputs": [ { @@ -381,7 +327,7 @@ }, { "name": "resource_group_name", - "value": "ref:../1 - Account Infrastructure Base/outputs/security_resource_group_name" + "value": "ref:../Account Infrastructure Base/outputs/security_resource_group_name" }, { "name": "ibmcloud_api_key", @@ -393,7 +339,7 @@ }, { "name": "existing_kms_instance_crn", - "value": "ref:../2 - Security Service - Key Management/outputs/kms_instance_crn" + "value": "ref:../Baseline Security - Encryption Key Management/outputs/kms_instance_crn" }, { "name": "use_existing_resource_group", @@ -409,12 +355,12 @@ }, { "name": "existing_event_notification_instance_crn", - "value": "ref:../4 - Event Notifications/outputs/crn" + "value": "ref:../Baseline Security - Observability Event Notifications/outputs/crn" } ] }, { - "name": "5b - Security Service - Security Compliance Center", + "name": "Baseline Security - Security Compliance Center", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.86ecc32b-65b6-4cb9-b263-2815138c47bc-global", "inputs": [ { @@ -431,11 +377,11 @@ }, { "name": "resource_group_name", - "value": "ref:../1 - Account Infrastructure Base/outputs/audit_resource_group_name" + "value": "ref:../Account Infrastructure Base/outputs/audit_resource_group_name" }, { "name": "existing_kms_instance_crn", - "value": "ref:../2 - Security Service - Key Management/outputs/kms_instance_crn" + "value": "ref:../Baseline Security - Encryption Key Management/outputs/kms_instance_crn" }, { "name": "use_existing_resource_group", @@ -447,12 +393,66 @@ }, { "name": "existing_en_crn", - "value": "ref:../4 - Event Notifications/outputs/crn" + "value": "ref:../Baseline Security - Observability Event Notifications/outputs/crn" + } + ] + }, + { + "name": "Gen AI - Databases for Elasticsearch", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2d84cdb9-84a9-4487-880d-574c47482646-global", + "inputs": [ + { + "name": "use_existing_resource_group", + "value": true + }, + { + "name": "resource_group_name", + "value": "ref:../../members/Account Infrastructure Base/outputs/workload_resource_group_name" + }, + { + "name": "region", + "value": "ref:../../inputs/region" + }, + { + "name": "prefix", + "value": "ref:../../inputs/prefix" + }, + { + "name": "plan", + "value": "ref:../../inputs/elasticsearch_plan" + }, + { + "name": "elasticsearch_version", + "value": "8.12" + }, + { + "name": "existing_kms_instance_crn", + "value": "ref:../../members/Baseline Security - Encryption Key Management/outputs/kms_instance_crn" + }, + { + "name": "kms_endpoint_type", + "value": "private" + }, + { + "name": "member_host_flavor", + "value": "b3c.4x16.encrypted" + }, + { + "name": "service_credential_names", + "value": { + "elastic_db_admin": "Administrator", + "wxasst_db_user": "Editor", + "toolchain_db_user": "Editor" + } + }, + { + "name": "existing_db_instance_crn", + "value": "ref:../../inputs/existing_db_instance_crn" } ] }, { - "name": "6 - WatsonX SaaS services", + "name": "Gen AI - WatsonX SaaS services", "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.6da72ae0-73c6-43f5-adc5-9d78f08be81d-global", "inputs": [ { @@ -465,7 +465,7 @@ }, { "name": "resource_group_name", - "value": "ref:../1 - Account Infrastructure Base/outputs/workload_resource_group_name" + "value": "ref:../Account Infrastructure Base/outputs/workload_resource_group_name" }, { "name": "location", @@ -521,12 +521,12 @@ }, { "name": "cos_kms_crn", - "value": "ref:../2 - Security Service - Key Management/outputs/kms_instance_crn" + "value": "ref:../Baseline Security - Encryption Key Management/outputs/kms_instance_crn" } ] }, { - "name": "7 - Sample RAG app - Application Lifecycle Management", + "name": "Workload - Application Lifecycle Management", "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.3a73ae21-ca89-4120-836a-3d4da7df7ce0-global", "inputs": [ { @@ -543,19 +543,19 @@ }, { "name": "toolchain_resource_group", - "value": "ref:../1 - Account Infrastructure Base/outputs/devops_resource_group_name" + "value": "ref:../Account Infrastructure Base/outputs/devops_resource_group_name" }, { "name": "sm_resource_group", - "value": "ref:../5a - Security Service - Secret Manager/outputs/resource_group_name" + "value": "ref:../Baseline Security - Secrets Manager/outputs/resource_group_name" }, { "name": "sm_name", - "value": "ref:../5a - Security Service - Secret Manager/outputs/secrets_manager_name" + "value": "ref:../Baseline Security - Secrets Manager/outputs/secrets_manager_name" }, { "name": "sm_location", - "value": "ref:../5a - Security Service - Secret Manager/outputs/secrets_manager_region" + "value": "ref:../Baseline Security - Secrets Manager/outputs/secrets_manager_region" }, { "name": "ci_code_engine_project", @@ -624,7 +624,7 @@ ] }, { - "name": "8 - Sample RAG app configuration", + "name": "Workload - Sample RAG App Configuration", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.d7ea2d8d-b35a-471a-ae83-02b0ea9989b9-global", "inputs": [ { @@ -645,31 +645,31 @@ }, { "name": "watson_assistant_instance_id", - "value": "ref:../6 - WatsonX SaaS services/outputs/watsonx_assistant_guid" + "value": "ref:../Gen AI - WatsonX SaaS services/outputs/watsonx_assistant_guid" }, { "name": "cd_pipeline_id", - "value": "ref:../7 - Sample RAG app - Application Lifecycle Management/outputs/cd_pipeline_id" + "value": "ref:../Workload - Application Lifecycle Management/outputs/cd_pipeline_id" }, { "name": "ci_pipeline_id", - "value": "ref:../7 - Sample RAG app - Application Lifecycle Management/outputs/ci_pipeline_id" + "value": "ref:../Workload - Application Lifecycle Management/outputs/ci_pipeline_id" }, { "name": "watson_machine_learning_instance_guid", - "value": "ref:../6 - WatsonX SaaS services/outputs/watson_machine_learning_guid" + "value": "ref:../Gen AI - WatsonX SaaS services/outputs/watson_machine_learning_guid" }, { "name": "watson_machine_learning_instance_resource_name", - "value": "ref:../6 - WatsonX SaaS services/outputs/watson_machine_learning_name" + "value": "ref:../Gen AI - WatsonX SaaS services/outputs/watson_machine_learning_name" }, { "name": "watson_machine_learning_instance_crn", - "value": "ref:../6 - WatsonX SaaS services/outputs/watson_machine_learning_crn" + "value": "ref:../Gen AI - WatsonX SaaS services/outputs/watson_machine_learning_crn" }, { "name": "toolchain_resource_group", - "value": "ref:../1 - Account Infrastructure Base/outputs/devops_resource_group_name" + "value": "ref:../Account Infrastructure Base/outputs/devops_resource_group_name" }, { "name": "prefix", @@ -677,7 +677,7 @@ }, { "name": "resource_group_name", - "value": "ref:../1 - Account Infrastructure Base/outputs/devops_resource_group_name" + "value": "ref:../Account Infrastructure Base/outputs/devops_resource_group_name" }, { "name": "use_existing_resource_group", @@ -693,19 +693,19 @@ }, { "name": "secrets_manager_guid", - "value": "ref:../5a - Security Service - Secret Manager/outputs/secrets_manager_guid" + "value": "ref:../Baseline Security - Secrets Manager/outputs/secrets_manager_guid" }, { "name": "secrets_manager_region", - "value": "ref:../5a - Security Service - Secret Manager/outputs/secrets_manager_region" + "value": "ref:../Baseline Security - Secrets Manager/outputs/secrets_manager_region" }, { "name": "elastic_instance_crn", - "value": "ref:../3b - Databases for Elasticsearch/outputs/crn" + "value": "ref:../Gen AI - Databases for Elasticsearch/outputs/crn" }, { "name": "cos_kms_crn", - "value": "ref:../2 - Security Service - Key Management/outputs/kms_instance_crn" + "value": "ref:../Baseline Security - Encryption Key Management/outputs/kms_instance_crn" } ] } @@ -713,35 +713,35 @@ "outputs": [ { "name": "elasticsearch_hostname", - "value": "ref:../3b - Databases for Elasticsearch/outputs/hostname" + "value": "ref:../Gen AI - Databases for Elasticsearch/outputs/hostname" }, { "name": "elasticsearch_port", - "value": "ref:../3b - Databases for Elasticsearch/outputs/port" + "value": "ref:../Gen AI - Databases for Elasticsearch/outputs/port" }, { "name": "elasticsearch_service_credentials_json", - "value": "ref:../3b - Databases for Elasticsearch/outputs/service_credentials_json" + "value": "ref:../Gen AI - Databases for Elasticsearch/outputs/service_credentials_json" }, { "name": "elasticsearch_crn", - "value": "ref:../3b - Databases for Elasticsearch/outputs/crn" + "value": "ref:../Gen AI - Databases for Elasticsearch/outputs/crn" }, { "name": "watsonx_project_url", - "value": "ref:../8 - Sample RAG app configuration/outputs/watsonx_project_url" + "value": "ref:../Workload - Sample RAG App Configuration/outputs/watsonx_project_url" }, { "name": "watsonx_project_id", - "value": "ref:../8 - Sample RAG app configuration/outputs/watsonx_project_id" + "value": "ref:../Workload - Sample RAG App Configuration/outputs/watsonx_project_id" }, { "name": "watson_discovery_api_url", - "value": "ref:../8 - Sample RAG app configuration/outputs/watson_discovery_api_url" + "value": "ref:../Workload - Sample RAG App Configuration/outputs/watson_discovery_api_url" }, { "name": "watson_discovery_project_id", - "value": "ref:../8 - Sample RAG app configuration/outputs/watson_discovery_project_id" + "value": "ref:../Workload - Sample RAG App Configuration/outputs/watson_discovery_project_id" } ] } From e6a2d92b4e6f1262dea9fd3d12e8aaa2fcfcd1cf Mon Sep 17 00:00:00 2001 From: Todd Giguere Date: Thu, 22 Aug 2024 15:56:38 -0400 Subject: [PATCH 5/5] chore: fixed checkov skip in json --- sample_deploy_config.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sample_deploy_config.json b/sample_deploy_config.json index 2ce2694..cdaf089 100644 --- a/sample_deploy_config.json +++ b/sample_deploy_config.json @@ -1,9 +1,7 @@ { "project_name": "", "stack_name": "", - "//": [ - "checkov:skip=CKV_SECRET_6: ignore stack_api_key_env in this file" - ], + "//": ["checkov:skip=CKV_SECRET_6: ignore stack_api_key_env in this file"], "stack_api_key_env": "IBMCLOUD_API_KEY", "config_order": [ "Account Infrastructure Base",