From a73f45b7526949c48a1e00bbf96f87fe4047080a Mon Sep 17 00:00:00 2001 From: TIMOperations Date: Wed, 25 Sep 2024 08:14:59 +0000 Subject: [PATCH 01/17] fix(deps): Update stack definition member versions solutions/basic/stack_definition.json solutions/standard/stack_definition.json --- solutions/basic/stack_definition.json | 20 ++++++++++---------- solutions/standard/stack_definition.json | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json index cfe2550..92b91b0 100644 --- a/solutions/basic/stack_definition.json +++ b/solutions/basic/stack_definition.json @@ -128,7 +128,7 @@ "members": [ { "name": "Account Infrastructure Base", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8252b811-2ef8-4bb1-b3b8-2c3e433485dd-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.75f26d78-6e7e-4d83-9822-7777ea101706-global", "inputs": [ { "name": "prefix", @@ -206,7 +206,7 @@ }, { "name": "Essential Security - Encryption Key Management", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.f28afafd-1dd9-4029-af68-4a0046f8b65e-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.7f57ef48-2bb2-4641-8f6e-db27a7eacc38-global", "inputs": [ { "name": "resource_group_name", @@ -236,7 +236,7 @@ }, { "name": "Essential Security - Logging Monitoring Activity Tracker", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a7b3b41f-7da2-40e8-a0e5-6fbdcbda487d-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.eaf90e32-42b4-4cd6-a4c3-ea720f6ea9f7-global", "inputs": [ { "name": "ibmcloud_api_key", @@ -274,7 +274,7 @@ }, { "name": "Essential Security - Observability Event Notifications", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2f638eb6-9702-457f-b72d-62c051101aab-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.5c6b0f97-4152-49ea-9330-a6d2a8989d6e-global", "inputs": [ { "name": "kms_endpoint_url", @@ -316,7 +316,7 @@ }, { "name": "Essential Security - Secrets Manager", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.32c26a0f-bbd2-4693-8846-46fca0598d21-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.03587d2d-38bd-42c3-983b-72469702e038-global", "inputs": [ { "name": "prefix", @@ -362,7 +362,7 @@ }, { "name": "Essential Security - Security Compliance Center", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.69dd48c5-d92c-42b6-8bc2-510c1329c962-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b27fc8c7-f6ec-4f98-890d-4f7ccfd37aaf-global", "inputs": [ { "name": "ibmcloud_api_key", @@ -408,7 +408,7 @@ }, { "name": "Gen AI - Databases for Elasticsearch", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3858adc6-94f5-4f28-97c0-f249cba95e8a-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.800e381f-e1f2-44dc-931b-6f93cb29f5fc-global", "inputs": [ { "name": "use_existing_resource_group", @@ -540,7 +540,7 @@ }, { "name": "Workload - Code Engine Projects", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.45457859-aaf7-4f87-8c1e-09422a0da2b8-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.42a9e379-8a61-4fad-a4c7-09f72a9bfb7c-global", "inputs": [ { "name": "ibmcloud_api_key", @@ -573,7 +573,7 @@ }, { "name": "Workload - Application Lifecycle Management", - "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.fba3ffcb-9f24-4ed8-83a7-5d3f5ac2122d-global", + "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.72e3b0a3-9d6c-4b85-be2c-baed5a5ac732-global", "inputs": [ { "name": "ibmcloud_api_key", @@ -679,7 +679,7 @@ }, { "name": "Workload - Sample RAG App Configuration", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0b549763-7c2e-4136-8b3e-8b9485972232-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.89e63750-f8dc-4537-a825-a06132c445a5-global", "inputs": [ { "name": "toolchain_region", diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json index e0bc1e5..8ed7279 100644 --- a/solutions/standard/stack_definition.json +++ b/solutions/standard/stack_definition.json @@ -128,7 +128,7 @@ "members": [ { "name": "Account Infrastructure Base", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8252b811-2ef8-4bb1-b3b8-2c3e433485dd-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.75f26d78-6e7e-4d83-9822-7777ea101706-global", "inputs": [ { "name": "prefix", @@ -206,7 +206,7 @@ }, { "name": "Essential Security - Encryption Key Management", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.f28afafd-1dd9-4029-af68-4a0046f8b65e-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.7f57ef48-2bb2-4641-8f6e-db27a7eacc38-global", "inputs": [ { "name": "resource_group_name", @@ -236,7 +236,7 @@ }, { "name": "Essential Security - Logging Monitoring Activity Tracker", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.a7b3b41f-7da2-40e8-a0e5-6fbdcbda487d-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.eaf90e32-42b4-4cd6-a4c3-ea720f6ea9f7-global", "inputs": [ { "name": "ibmcloud_api_key", @@ -274,7 +274,7 @@ }, { "name": "Essential Security - Observability Event Notifications", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.2f638eb6-9702-457f-b72d-62c051101aab-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.5c6b0f97-4152-49ea-9330-a6d2a8989d6e-global", "inputs": [ { "name": "kms_endpoint_url", @@ -316,7 +316,7 @@ }, { "name": "Essential Security - Secrets Manager", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.32c26a0f-bbd2-4693-8846-46fca0598d21-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.03587d2d-38bd-42c3-983b-72469702e038-global", "inputs": [ { "name": "prefix", @@ -362,7 +362,7 @@ }, { "name": "Essential Security - Security Compliance Center", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.69dd48c5-d92c-42b6-8bc2-510c1329c962-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b27fc8c7-f6ec-4f98-890d-4f7ccfd37aaf-global", "inputs": [ { "name": "ibmcloud_api_key", @@ -408,7 +408,7 @@ }, { "name": "Gen AI - Databases for Elasticsearch", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3858adc6-94f5-4f28-97c0-f249cba95e8a-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.800e381f-e1f2-44dc-931b-6f93cb29f5fc-global", "inputs": [ { "name": "use_existing_resource_group", @@ -548,7 +548,7 @@ }, { "name": "Workload - Red Hat OpenShift Container Platform on VPC", - "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.afef7128-4e23-426b-bd52-10d2f5e7adee-global", + "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.0cad1271-5dad-4da7-9557-c2019413760d-global", "inputs": [ { "name": "ibmcloud_api_key", @@ -620,7 +620,7 @@ }, { "name": "Workload - Application Lifecycle Management", - "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.c3622dde-a31a-44c2-983b-9fe0a67a4e64-global", + "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.d0d2aff1-8f34-4fa8-bc00-92378edd2226-global", "inputs": [ { "name": "ibmcloud_api_key", @@ -698,7 +698,7 @@ }, { "name": "Workload - Sample RAG App Configuration", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0b549763-7c2e-4136-8b3e-8b9485972232-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.89e63750-f8dc-4537-a825-a06132c445a5-global", "inputs": [ { "name": "toolchain_region", From 6d0ecf69201476ad8cc426fb474d7a591b389d10 Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Wed, 25 Sep 2024 10:05:56 +0100 Subject: [PATCH 02/17] add cluster ignore list --- solutions/standard/stack_definition.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json index 8ed7279..6b3b638 100644 --- a/solutions/standard/stack_definition.json +++ b/solutions/standard/stack_definition.json @@ -565,9 +565,16 @@ { "name": "vpcs", "value": [ + "management", "workload" ] }, + { + "name": "ignore_vpcs_for_cluster_deployment", + "value": [ + "management" + ] + }, { "name": "enable_transit_gateway", "value": false From 954ce40701e722db9eef6c43c48f13dc78cd4990 Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Wed, 25 Sep 2024 10:29:07 +0100 Subject: [PATCH 03/17] cloud logs updates --- ibm_catalog.json | 22 ++++++++++++++++++---- solutions/basic/stack_definition.json | 8 ++++++-- solutions/standard/stack_definition.json | 14 +++++++++----- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 262ea00..8cb1a59 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -287,10 +287,17 @@ "required": false }, { - "key": "enable_platform_logs_metrics", + "key": "enable_platform_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.", + "description": "Whether the monitoring instance is configured to receive all platform metrics in the target region. There can only be one instance per region provisioned for platform metrics.", + "required": false + }, + { + "key": "logs_routing_tenant_regions", + "type": "array", + "default_value": [], + "description": "Pass a list of regions to create a tenant that is targeted to the Cloud Logs instance. To manage platform logs that are generated by IBM Cloud® services in a region of IBM Cloud, you must create a tenant in each region that you operate. Leave the list empty if you don't want to create any tenants.", "required": false }, { @@ -624,10 +631,17 @@ "required": false }, { - "key": "enable_platform_logs_metrics", + "key": "enable_platform_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.", + "description": "Whether the monitoring instance is configured to receive all platform metrics in the target region. There can only be one instance per region provisioned for platform metrics.", + "required": false + }, + { + "key": "logs_routing_tenant_regions", + "type": "array", + "default_value": [], + "description": "Pass a list of regions to create a tenant that is targeted to the Cloud Logs instance. To manage platform logs that are generated by IBM Cloud® services in a region of IBM Cloud, you must create a tenant in each region that you operate. Leave the list empty if you don't want to create any tenants.", "required": false }, { diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json index 92b91b0..7e88244 100644 --- a/solutions/basic/stack_definition.json +++ b/solutions/basic/stack_definition.json @@ -263,8 +263,12 @@ "value": true }, { - "name": "enable_platform_logs", - "value": "ref:../../inputs/enable_platform_logs_metrics" + "name": "existing_en_instance_crn", + "value": "ref:../Essential Security - Observability Event Notifications/outputs/crn" + }, + { + "name": "logs_routing_tenant_regions", + "value": "ref:../../inputs/logs_routing_tenant_regions" }, { "name": "enable_platform_metrics", diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json index 6b3b638..f7a0685 100644 --- a/solutions/standard/stack_definition.json +++ b/solutions/standard/stack_definition.json @@ -76,11 +76,11 @@ "default": null }, { - "name": "enable_platform_logs_metrics", + "name": "logs_routing_tenant_regions", "required": false, - "type": "boolean", + "type": "array", "hidden": false, - "default": false + "default": [] }, { "name": "existing_discovery_instance", @@ -263,8 +263,12 @@ "value": true }, { - "name": "enable_platform_logs", - "value": "ref:../../inputs/enable_platform_logs_metrics" + "name": "existing_en_instance_crn", + "value": "ref:../Essential Security - Observability Event Notifications/outputs/crn" + }, + { + "name": "logs_routing_tenant_regions", + "value": "ref:../../inputs/logs_routing_tenant_regions" }, { "name": "enable_platform_metrics", From 3e0f55fc3a0aae51dc037a0cb303b48fcfdf1840 Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Wed, 25 Sep 2024 10:31:03 +0100 Subject: [PATCH 04/17] add fix --- solutions/basic/stack_definition.json | 4 ++-- solutions/standard/stack_definition.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json index 7e88244..734d77a 100644 --- a/solutions/basic/stack_definition.json +++ b/solutions/basic/stack_definition.json @@ -76,7 +76,7 @@ "default": null }, { - "name": "enable_platform_logs_metrics", + "name": "enable_platform_metrics", "required": false, "type": "boolean", "hidden": false, @@ -272,7 +272,7 @@ }, { "name": "enable_platform_metrics", - "value": "ref:../../inputs/enable_platform_logs_metrics" + "value": "ref:../../inputs/enable_platform_metrics" } ] }, diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json index f7a0685..cc1710b 100644 --- a/solutions/standard/stack_definition.json +++ b/solutions/standard/stack_definition.json @@ -272,7 +272,7 @@ }, { "name": "enable_platform_metrics", - "value": "ref:../../inputs/enable_platform_logs_metrics" + "value": "ref:../../inputs/enable_platform_metrics" } ] }, From 885012fc0305445743af935a564d3937d2d76c10 Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Wed, 25 Sep 2024 10:33:47 +0100 Subject: [PATCH 05/17] update --- solutions/basic/stack_definition.json | 7 +++++++ solutions/standard/stack_definition.json | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json index 734d77a..30b4e0b 100644 --- a/solutions/basic/stack_definition.json +++ b/solutions/basic/stack_definition.json @@ -82,6 +82,13 @@ "hidden": false, "default": false }, + { + "name": "logs_routing_tenant_regions", + "required": false, + "type": "array", + "hidden": false, + "default": [] + }, { "name": "existing_discovery_instance", "required": false, diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json index cc1710b..23fff02 100644 --- a/solutions/standard/stack_definition.json +++ b/solutions/standard/stack_definition.json @@ -75,6 +75,13 @@ "hidden": false, "default": null }, + { + "name": "enable_platform_metrics", + "required": false, + "type": "boolean", + "hidden": false, + "default": false + }, { "name": "logs_routing_tenant_regions", "required": false, From 2c910df018c6559ae2746d47892892978a9dba5a Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Wed, 25 Sep 2024 11:38:29 +0100 Subject: [PATCH 06/17] updated ar in devsecops --- solutions/standard/stack_definition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json index 23fff02..8834113 100644 --- a/solutions/standard/stack_definition.json +++ b/solutions/standard/stack_definition.json @@ -677,7 +677,7 @@ "value": "rag-app" }, { - "name": "ci_app_repo_clone_from_url", + "name": "app_repo_clone_from_url", "value": "ref:../../inputs/sample_app_git_url" }, { From 5061393e9e501cbc08f5e36dc95495c8e37a4864 Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Wed, 25 Sep 2024 11:54:31 +0100 Subject: [PATCH 07/17] revert alm --- solutions/basic/stack_definition.json | 2 +- solutions/standard/stack_definition.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json index 30b4e0b..62d4636 100644 --- a/solutions/basic/stack_definition.json +++ b/solutions/basic/stack_definition.json @@ -584,7 +584,7 @@ }, { "name": "Workload - Application Lifecycle Management", - "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.72e3b0a3-9d6c-4b85-be2c-baed5a5ac732-global", + "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.fba3ffcb-9f24-4ed8-83a7-5d3f5ac2122d-global", "inputs": [ { "name": "ibmcloud_api_key", diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json index 8834113..c26cbfb 100644 --- a/solutions/standard/stack_definition.json +++ b/solutions/standard/stack_definition.json @@ -638,7 +638,7 @@ }, { "name": "Workload - Application Lifecycle Management", - "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.d0d2aff1-8f34-4fa8-bc00-92378edd2226-global", + "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.c3622dde-a31a-44c2-983b-9fe0a67a4e64-global", "inputs": [ { "name": "ibmcloud_api_key", @@ -677,7 +677,7 @@ "value": "rag-app" }, { - "name": "app_repo_clone_from_url", + "name": "ci_app_repo_clone_from_url", "value": "ref:../../inputs/sample_app_git_url" }, { From 53c4c5fc9d2cb48664f6df6359286fceecaa15b9 Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Wed, 25 Sep 2024 12:36:00 +0100 Subject: [PATCH 08/17] revert ES --- solutions/basic/stack_definition.json | 2 +- solutions/standard/stack_definition.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json index 62d4636..09afb6b 100644 --- a/solutions/basic/stack_definition.json +++ b/solutions/basic/stack_definition.json @@ -419,7 +419,7 @@ }, { "name": "Gen AI - Databases for Elasticsearch", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.800e381f-e1f2-44dc-931b-6f93cb29f5fc-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0857b54b-7bd5-46b7-ab4c-89cfc70cde4a-global", "inputs": [ { "name": "use_existing_resource_group", diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json index c26cbfb..43d1e99 100644 --- a/solutions/standard/stack_definition.json +++ b/solutions/standard/stack_definition.json @@ -419,7 +419,7 @@ }, { "name": "Gen AI - Databases for Elasticsearch", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.800e381f-e1f2-44dc-931b-6f93cb29f5fc-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0857b54b-7bd5-46b7-ab4c-89cfc70cde4a-global", "inputs": [ { "name": "use_existing_resource_group", From 9d3813973072e896175e2142682bd053f0225408 Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Wed, 25 Sep 2024 14:56:30 +0100 Subject: [PATCH 09/17] remove circular dep --- solutions/basic/stack_definition.json | 4 ---- solutions/standard/stack_definition.json | 4 ---- 2 files changed, 8 deletions(-) diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json index 09afb6b..589e2b2 100644 --- a/solutions/basic/stack_definition.json +++ b/solutions/basic/stack_definition.json @@ -315,10 +315,6 @@ "name": "prefix", "value": "ref:../../inputs/prefix" }, - { - "name": "existing_monitoring_crn", - "value": "ref:../Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_monitoring_crn" - }, { "name": "existing_en_instance_crn", "value": "ref:../../inputs/existing_event_notification_instance_crn" diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json index 43d1e99..8a0b42d 100644 --- a/solutions/standard/stack_definition.json +++ b/solutions/standard/stack_definition.json @@ -315,10 +315,6 @@ "name": "prefix", "value": "ref:../../inputs/prefix" }, - { - "name": "existing_monitoring_crn", - "value": "ref:../Essential Security - Logging Monitoring Activity Tracker/outputs/cloud_monitoring_crn" - }, { "name": "existing_en_instance_crn", "value": "ref:../../inputs/existing_event_notification_instance_crn" From 83761f49385312c80f6de1e6406840599c860325 Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Wed, 25 Sep 2024 18:04:31 +0100 Subject: [PATCH 10/17] revert EN --- solutions/basic/stack_definition.json | 2 +- solutions/standard/stack_definition.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json index 589e2b2..dcaccb3 100644 --- a/solutions/basic/stack_definition.json +++ b/solutions/basic/stack_definition.json @@ -285,7 +285,7 @@ }, { "name": "Essential Security - Observability Event Notifications", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.5c6b0f97-4152-49ea-9330-a6d2a8989d6e-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b7a7944c-55fa-4196-b995-df8bc085870a-global", "inputs": [ { "name": "kms_endpoint_url", diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json index 8a0b42d..5a61a64 100644 --- a/solutions/standard/stack_definition.json +++ b/solutions/standard/stack_definition.json @@ -285,7 +285,7 @@ }, { "name": "Essential Security - Observability Event Notifications", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.5c6b0f97-4152-49ea-9330-a6d2a8989d6e-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b7a7944c-55fa-4196-b995-df8bc085870a-global", "inputs": [ { "name": "kms_endpoint_url", From 208b7b01de8e877fa06451021ba7692df06fc223 Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Thu, 26 Sep 2024 12:09:54 +0100 Subject: [PATCH 11/17] bump ES and test wrapper --- solutions/basic/stack_definition.json | 2 +- solutions/standard/stack_definition.json | 2 +- tests/go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json index dcaccb3..1da3b2e 100644 --- a/solutions/basic/stack_definition.json +++ b/solutions/basic/stack_definition.json @@ -415,7 +415,7 @@ }, { "name": "Gen AI - Databases for Elasticsearch", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0857b54b-7bd5-46b7-ab4c-89cfc70cde4a-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.aa4a2c9b-8a6a-472d-a9d3-9fc6e97b062f-global", "inputs": [ { "name": "use_existing_resource_group", diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json index 5a61a64..8a83864 100644 --- a/solutions/standard/stack_definition.json +++ b/solutions/standard/stack_definition.json @@ -415,7 +415,7 @@ }, { "name": "Gen AI - Databases for Elasticsearch", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0857b54b-7bd5-46b7-ab4c-89cfc70cde4a-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.aa4a2c9b-8a6a-472d-a9d3-9fc6e97b062f-global", "inputs": [ { "name": "use_existing_resource_group", diff --git a/tests/go.mod b/tests/go.mod index 1365510..40ba26f 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.1 require ( github.com/gruntwork-io/terratest v0.47.1 github.com/stretchr/testify v1.9.0 - github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.38.2 + github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.0 ) require ( From 83274a4064c821f0fb77e990fb7a3b822fc864dc Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Thu, 26 Sep 2024 12:18:26 +0100 Subject: [PATCH 12/17] revert test wrapper version --- common-dev-assets | 2 +- tests/go.mod | 10 +++++----- tests/go.sum | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/common-dev-assets b/common-dev-assets index bab77a8..21cc7c5 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit bab77a815bb32b93e7af3563064005777fbb4edc +Subproject commit 21cc7c5b4d38c170faada1a16308494ad08783c3 diff --git a/tests/go.mod b/tests/go.mod index 40ba26f..e1d297c 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,13 +1,13 @@ module github.com/terraform-ibm-modules/dev-rag -go 1.22 +go 1.22.0 toolchain go1.23.1 require ( github.com/gruntwork-io/terratest v0.47.1 github.com/stretchr/testify v1.9.0 - github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.0 + github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.38.4 ) require ( @@ -17,12 +17,12 @@ require ( cloud.google.com/go/iam v1.1.1 // indirect cloud.google.com/go/storage v1.30.1 // indirect github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect - github.com/IBM-Cloud/power-go-client v1.7.1 // indirect + github.com/IBM-Cloud/power-go-client v1.8.1 // indirect github.com/IBM/cloud-databases-go-sdk v0.7.0 // indirect github.com/IBM/go-sdk-core/v5 v5.17.5 // indirect - github.com/IBM/platform-services-go-sdk v0.69.0 // indirect + github.com/IBM/platform-services-go-sdk v0.69.1 // indirect github.com/IBM/project-go-sdk v0.3.0 // indirect - github.com/IBM/vpc-go-sdk v0.57.0 // indirect + github.com/IBM/vpc-go-sdk v0.58.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/agext/levenshtein v1.2.3 // indirect github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect diff --git a/tests/go.sum b/tests/go.sum index cbe5b4d..acf300d 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -189,18 +189,18 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be h1:USOcBHkYQ4o/ccoEvoHinrba8NQthLJpFXnAoBY+MI4= github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be/go.mod h1:/7hMjdZA6fEpd/dQAOEABxKEwN0t72P3PlpEDu0Y7bE= -github.com/IBM-Cloud/power-go-client v1.7.1 h1:LDEqMGH3KoxgoYfWWM/hG+2fBzy05KFCWygis2fcT3M= -github.com/IBM-Cloud/power-go-client v1.7.1/go.mod h1:bJZ0gP3MHPNewMFVDXW73/8lJFxXOf8MQR8JaeTyrYo= +github.com/IBM-Cloud/power-go-client v1.8.1 h1:tx1aPJmIQrNru1MD1VHGNasGx3eRIs0zzPZ0KvdFQrg= +github.com/IBM-Cloud/power-go-client v1.8.1/go.mod h1:N4RxrsMUvBQjSQ/qPk0iMZ8zK+fZPRTnHi/gTaASw0g= github.com/IBM/cloud-databases-go-sdk v0.7.0 h1:prvLebKD1kcIk81D6yRhOr/TWp1VQJGLhGAasQr7RtA= github.com/IBM/cloud-databases-go-sdk v0.7.0/go.mod h1:JYucI1PdwqbAd8XGdDAchxzxRP7bxOh1zUnseovHKsc= github.com/IBM/go-sdk-core/v5 v5.17.5 h1:AjGC7xNee5tgDIjndekBDW5AbypdERHSgib3EZ1KNsA= github.com/IBM/go-sdk-core/v5 v5.17.5/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns= -github.com/IBM/platform-services-go-sdk v0.69.0 h1:SYpLydPWawyhfFxgDTAc5JqWHywkrzJeIsKtc7t/2YE= -github.com/IBM/platform-services-go-sdk v0.69.0/go.mod h1:6rYd3stLSnotYmZlxclw45EJPaQuLmh5f7c+Mg7rOg4= +github.com/IBM/platform-services-go-sdk v0.69.1 h1:Wb8BYVpsPIppWbOQCgF7ytm+BbSOXdWWCf9zcZ6xGA4= +github.com/IBM/platform-services-go-sdk v0.69.1/go.mod h1:ZP3zUDxR1qRdUqzFdnJOlQN0QpVYol2eOUCv4uk03Jc= github.com/IBM/project-go-sdk v0.3.0 h1:lZR4wT6UCsOZ8QkEBITrfM6OZkLlL70/HXiPxF/Olt4= github.com/IBM/project-go-sdk v0.3.0/go.mod h1:FOJM9ihQV3EEAY6YigcWiTNfVCThtdY8bLC/nhQHFvo= -github.com/IBM/vpc-go-sdk v0.57.0 h1:E8CPDpUE4z0cvvmFZzqUthMtGJx71Fne6vdvkjZdXfg= -github.com/IBM/vpc-go-sdk v0.57.0/go.mod h1:swmxiYLT+OfBsBYqJWGeRd6NPmBk4u/het2PZdtzIaw= +github.com/IBM/vpc-go-sdk v0.58.0 h1:Slk1jkcV7tPnf0iECQV2Oja7W8Bom0z7k9M4fMBY4bI= +github.com/IBM/vpc-go-sdk v0.58.0/go.mod h1:swmxiYLT+OfBsBYqJWGeRd6NPmBk4u/het2PZdtzIaw= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= @@ -586,8 +586,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.38.2 h1:iTmJxQFJriMnKTDtwtaHpdPU79NJCyCNfdUfUcMWkcE= -github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.38.2/go.mod h1:N5Dykk5JzqG1Z3fnxpX4P6zCWLzUYVpnNN/wyF2X4NQ= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.38.4 h1:MLbxOF1DFqRubVob2z0c2Ori8cIc6325YqHlRLbtnpk= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.38.4/go.mod h1:C2QuvDK/lX7xwDu8hwSszpGW4gTbeTRXKymSAMDjAKA= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tmccombs/hcl2json v0.5.0 h1:cT2sXStOzKL06c8ZTf9vh+0N8GKGzV7+9RUaY5/iUP8= github.com/tmccombs/hcl2json v0.5.0/go.mod h1:B0ZpBthAKbQur6yZRKrtaqDmYLCvgnwHOBApE0faCpU= From e925c8f1400a91f64442041df1e50059dbcac6d9 Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Thu, 26 Sep 2024 12:31:32 +0100 Subject: [PATCH 13/17] cleanup test deprecated setup options --- tests/pr_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/pr_test.go b/tests/pr_test.go index 6822696..dd3cf76 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -48,7 +48,6 @@ func TestProjectsBasicFullTest(t *testing.T) { options := testprojects.TestProjectOptionsDefault(&testprojects.TestProjectsOptions{ Testing: t, Prefix: "rag-stack", - ParallelDeploy: true, StackConfigurationPath: basicDaStackDefPath, }) @@ -112,7 +111,6 @@ func TestProjectsBasicExistingResourcesTest(t *testing.T) { options := testprojects.TestProjectOptionsDefault(&testprojects.TestProjectsOptions{ Testing: t, - ParallelDeploy: true, StackConfigurationPath: basicDaStackDefPath, }) @@ -161,7 +159,6 @@ func TestProjectsStandardFullTest(t *testing.T) { options := testprojects.TestProjectOptionsDefault(&testprojects.TestProjectsOptions{ Testing: t, Prefix: "rag-s", - ParallelDeploy: true, StackConfigurationPath: standardDaStackDefPath, }) From 0fb6c21064acd4ab6830abe294fabf739305fc5f Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Thu, 26 Sep 2024 12:31:51 +0100 Subject: [PATCH 14/17] update wrapper version --- tests/go.mod | 5 +++-- tests/go.sum | 28 ++++++++++++++++++++++++---- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/tests/go.mod b/tests/go.mod index e1d297c..4dbcbba 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.1 require ( github.com/gruntwork-io/terratest v0.47.1 github.com/stretchr/testify v1.9.0 - github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.38.4 + github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.0 ) require ( @@ -21,7 +21,8 @@ require ( github.com/IBM/cloud-databases-go-sdk v0.7.0 // indirect github.com/IBM/go-sdk-core/v5 v5.17.5 // indirect github.com/IBM/platform-services-go-sdk v0.69.1 // indirect - github.com/IBM/project-go-sdk v0.3.0 // indirect + github.com/IBM/project-go-sdk v0.3.6 // indirect + github.com/IBM/schematics-go-sdk v0.3.0 // indirect github.com/IBM/vpc-go-sdk v0.58.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/agext/levenshtein v1.2.3 // indirect diff --git a/tests/go.sum b/tests/go.sum index acf300d..3ebe686 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -193,12 +193,15 @@ github.com/IBM-Cloud/power-go-client v1.8.1 h1:tx1aPJmIQrNru1MD1VHGNasGx3eRIs0zz github.com/IBM-Cloud/power-go-client v1.8.1/go.mod h1:N4RxrsMUvBQjSQ/qPk0iMZ8zK+fZPRTnHi/gTaASw0g= github.com/IBM/cloud-databases-go-sdk v0.7.0 h1:prvLebKD1kcIk81D6yRhOr/TWp1VQJGLhGAasQr7RtA= github.com/IBM/cloud-databases-go-sdk v0.7.0/go.mod h1:JYucI1PdwqbAd8XGdDAchxzxRP7bxOh1zUnseovHKsc= +github.com/IBM/go-sdk-core/v5 v5.10.2/go.mod h1:WZPFasUzsKab/2mzt29xPcfruSk5js2ywAPwW4VJjdI= github.com/IBM/go-sdk-core/v5 v5.17.5 h1:AjGC7xNee5tgDIjndekBDW5AbypdERHSgib3EZ1KNsA= github.com/IBM/go-sdk-core/v5 v5.17.5/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns= github.com/IBM/platform-services-go-sdk v0.69.1 h1:Wb8BYVpsPIppWbOQCgF7ytm+BbSOXdWWCf9zcZ6xGA4= github.com/IBM/platform-services-go-sdk v0.69.1/go.mod h1:ZP3zUDxR1qRdUqzFdnJOlQN0QpVYol2eOUCv4uk03Jc= -github.com/IBM/project-go-sdk v0.3.0 h1:lZR4wT6UCsOZ8QkEBITrfM6OZkLlL70/HXiPxF/Olt4= -github.com/IBM/project-go-sdk v0.3.0/go.mod h1:FOJM9ihQV3EEAY6YigcWiTNfVCThtdY8bLC/nhQHFvo= +github.com/IBM/project-go-sdk v0.3.6 h1:DRiANKnAePevFsIKSvR89SUaMa2xsd7YKK71Ka1eqKI= +github.com/IBM/project-go-sdk v0.3.6/go.mod h1:FOJM9ihQV3EEAY6YigcWiTNfVCThtdY8bLC/nhQHFvo= +github.com/IBM/schematics-go-sdk v0.3.0 h1:Vwxw85SONflakiBsNHAfViKLyp9zJiH5/hh6SewOP5Q= +github.com/IBM/schematics-go-sdk v0.3.0/go.mod h1:Tw2OSAPdpC69AxcwoyqcYYaGTTW6YpERF9uNEU+BFRQ= github.com/IBM/vpc-go-sdk v0.58.0 h1:Slk1jkcV7tPnf0iECQV2Oja7W8Bom0z7k9M4fMBY4bI= github.com/IBM/vpc-go-sdk v0.58.0/go.mod h1:swmxiYLT+OfBsBYqJWGeRd6NPmBk4u/het2PZdtzIaw= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= @@ -218,6 +221,7 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= @@ -293,6 +297,7 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-openapi/analysis v0.21.5 h1:3tHfEBh6Ia8eKc4M7khOGjPOAlWKJ10d877Cr9teujI= github.com/go-openapi/analysis v0.21.5/go.mod h1:25YcZosX9Lwz2wBsrFrrsL8bmjjXdlyP6zsr2AMy29M= +github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk= github.com/go-openapi/errors v0.22.0 h1:c4xY/OLxUBSTiepAg3j/MHuAv5mJhnf53LLMWFB+u/w= github.com/go-openapi/errors v0.22.0/go.mod h1:J3DmZScxCDufmIMsdOuDHxJbdOGC0xtUynjIx092vXE= @@ -306,6 +311,7 @@ github.com/go-openapi/runtime v0.26.0 h1:HYOFtG00FM1UvqrcxbEJg/SwvDRvYLQKGhw2zaQ github.com/go-openapi/runtime v0.26.0/go.mod h1:QgRGeZwrUcSHdeh4Ka9Glvo0ug1LC5WyE+EV88plZrQ= github.com/go-openapi/spec v0.20.12 h1:cgSLbrsmziAP2iais+Vz7kSazwZ8rsUZd6TUzdDgkVI= github.com/go-openapi/spec v0.20.12/go.mod h1:iSCgnBcwbMW9SfzJb8iYynXvcY6C/QFrI7otzF7xGM4= +github.com/go-openapi/strfmt v0.21.3/go.mod h1:k+RzNO0Da+k3FrrynSNN8F7n/peCmQQqbbXjtDfvmGg= github.com/go-openapi/strfmt v0.21.7/go.mod h1:adeGTkxE44sPyLk0JV235VQAO/ZXUr8KAzYjclFs3ew= github.com/go-openapi/strfmt v0.23.0 h1:nlUS6BCqcnAk0pyhi9Y+kdDVZdZMHfEKQiS4HaMgO/c= github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4= @@ -315,8 +321,10 @@ github.com/go-openapi/validate v0.22.4 h1:5v3jmMyIPKTR8Lv9syBAIRxG6lY0RqeBPB1LKE github.com/go-openapi/validate v0.22.4/go.mod h1:qm6O8ZIcPVdSY5219468Jv7kBdGvkiZLPOmqnqTUZ2A= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4= @@ -405,6 +413,7 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLe github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -432,14 +441,17 @@ github.com/gruntwork-io/terratest v0.47.1/go.mod h1:LnYX8BN5WxUMpDr8rtD39oToSL4C github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-getter v1.7.6 h1:5jHuM+aH373XNtXl9TNTUH5Qd69Trve11tHIrB+6yj4= github.com/hashicorp/go-getter v1.7.6/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= +github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= @@ -483,6 +495,7 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= @@ -502,6 +515,7 @@ github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJ github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= +github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= @@ -516,6 +530,7 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk= @@ -535,6 +550,7 @@ github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.18.0/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= github.com/onsi/gomega v1.21.1/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc= @@ -586,8 +602,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.38.4 h1:MLbxOF1DFqRubVob2z0c2Ori8cIc6325YqHlRLbtnpk= -github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.38.4/go.mod h1:C2QuvDK/lX7xwDu8hwSszpGW4gTbeTRXKymSAMDjAKA= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.0 h1:E3672lYj4hnG93d/t7enfy90KVwHT1xAU+C97ueDl70= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.0/go.mod h1:xOJLB0UttcTG0FPVLikDM6RxP4iC+apBD01hidt2gYo= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tmccombs/hcl2json v0.5.0 h1:cT2sXStOzKL06c8ZTf9vh+0N8GKGzV7+9RUaY5/iUP8= github.com/tmccombs/hcl2json v0.5.0/go.mod h1:B0ZpBthAKbQur6yZRKrtaqDmYLCvgnwHOBApE0faCpU= @@ -609,6 +625,7 @@ github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zclconf/go-cty v1.14.4 h1:uXXczd9QDGsgu0i/QFR/hzI5NYCHLf6NQw/atrbnhq8= github.com/zclconf/go-cty v1.14.4/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +go.mongodb.org/mongo-driver v1.10.0/go.mod h1:wsihk0Kdgv8Kqu1Anit4sfK+22vSFbUrAVEYRhCXrA8= go.mongodb.org/mongo-driver v1.11.3/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80= go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= @@ -1236,6 +1253,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= +gopkg.in/go-playground/validator.v9 v9.31.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= @@ -1248,6 +1267,7 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 65875ad90ad37c67538a38b5e27a5f8d18996d40 Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Thu, 26 Sep 2024 14:38:17 +0100 Subject: [PATCH 15/17] bump slz --- solutions/standard/stack_definition.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json index 8a83864..fefe6fa 100644 --- a/solutions/standard/stack_definition.json +++ b/solutions/standard/stack_definition.json @@ -555,7 +555,7 @@ }, { "name": "Workload - Red Hat OpenShift Container Platform on VPC", - "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.0cad1271-5dad-4da7-9557-c2019413760d-global", + "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.639be978-b7d7-4702-9723-0b638225491b-global", "inputs": [ { "name": "ibmcloud_api_key", From b751825f1a54d191f724989699480c46200fd5ac Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Thu, 26 Sep 2024 17:09:03 +0100 Subject: [PATCH 16/17] rename EN member --- solutions/basic/stack_definition.json | 8 ++++---- solutions/standard/stack_definition.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json index 1da3b2e..9de2fea 100644 --- a/solutions/basic/stack_definition.json +++ b/solutions/basic/stack_definition.json @@ -271,7 +271,7 @@ }, { "name": "existing_en_instance_crn", - "value": "ref:../Essential Security - Observability Event Notifications/outputs/crn" + "value": "ref:../Essential Security - Event Notifications/outputs/crn" }, { "name": "logs_routing_tenant_regions", @@ -284,7 +284,7 @@ ] }, { - "name": "Essential Security - Observability Event Notifications", + "name": "Essential Security - Event Notifications", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b7a7944c-55fa-4196-b995-df8bc085870a-global", "inputs": [ { @@ -359,7 +359,7 @@ }, { "name": "existing_event_notification_instance_crn", - "value": "ref:../Essential Security - Observability Event Notifications/outputs/crn" + "value": "ref:../Essential Security - Event Notifications/outputs/crn" }, { "name": "enable_event_notification", @@ -405,7 +405,7 @@ }, { "name": "existing_en_crn", - "value": "ref:../Essential Security - Observability Event Notifications/outputs/crn" + "value": "ref:../Essential Security - Event Notifications/outputs/crn" }, { "name": "profile_attachments", diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json index fefe6fa..043cbbd 100644 --- a/solutions/standard/stack_definition.json +++ b/solutions/standard/stack_definition.json @@ -271,7 +271,7 @@ }, { "name": "existing_en_instance_crn", - "value": "ref:../Essential Security - Observability Event Notifications/outputs/crn" + "value": "ref:../Essential Security - Event Notifications/outputs/crn" }, { "name": "logs_routing_tenant_regions", @@ -284,7 +284,7 @@ ] }, { - "name": "Essential Security - Observability Event Notifications", + "name": "Essential Security - Event Notifications", "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.b7a7944c-55fa-4196-b995-df8bc085870a-global", "inputs": [ { @@ -359,7 +359,7 @@ }, { "name": "existing_event_notification_instance_crn", - "value": "ref:../Essential Security - Observability Event Notifications/outputs/crn" + "value": "ref:../Essential Security - Event Notifications/outputs/crn" }, { "name": "enable_event_notification", @@ -405,7 +405,7 @@ }, { "name": "existing_en_crn", - "value": "ref:../Essential Security - Observability Event Notifications/outputs/crn" + "value": "ref:../Essential Security - Event Notifications/outputs/crn" }, { "name": "profile_attachments", From 1041644211e4f8ffe786f1811f678e69b5714bb4 Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Thu, 26 Sep 2024 17:11:48 +0100 Subject: [PATCH 17/17] doc update --- ibm_catalog.json | 84 +++++++++++------------------------------------- 1 file changed, 19 insertions(+), 65 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 8cb1a59..02f7620 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1,7 +1,7 @@ { "products": [ { - "label": "Retrieval Augmented Generation Pattern (Dev)", + "label": "Retrieval Augmented Generation (RAG) Pattern (Dev)", "name": "Retrieval_Augmented_Generation_Pattern_dev", "product_kind": "solution", "tags": [ @@ -27,27 +27,27 @@ "key protect", "scc" ], - "short_description": "Deploys a sample Retrieval Augmented Generation application, including all supporting IBM Cloud and Watson services.", - "long_description": "This deployable architecture provides a comprehensive foundation for trust, observability, security, and regulatory compliance by configuring and deploying various services, including:\n- Configuring IBM Cloud Account: with recommended values meeting the [IBM Cloud Framework for Financial Services](https://cloud.ibm.com/docs/framework-financial-services?topic=framework-financial-services-about)\n- Deploying Observability Services: for application and platform logging and monitoring\n- Deploying Keys and Secrets Management Services: for storage and management of encryption keys and secrets\n- Deploying CI/CD/CC Pipelines: for secure application lifecycle management\n- Deploying a Suite of Watson AI Services: to provide AI capabilities to the application \n\nThese configured and deployed services enable a secure and trustworthy deployment of Generative AI applications on IBM Cloud.\n\n# Objective\n\nThis deployable architecture is designed to showcase a fully automated deployment of a retrieval augmented generation application through IBM Cloud Project, providing a flexible and customizable foundation for your own Watson-based application deployments on IBM Cloud. This architecture deploys the following [banking sample application](https://github.com/IBM/gen-ai-rag-watsonx-sample-application) by default.\n\nBy leveraging this architecture, you can accelerate your deployment and tailor it to meet your unique business needs and enterprise goals.", + "short_description": "Automate RAG deployment with supporting IBM Cloud and watsonx services, embed your enterprise data in generative AI solutions.", + "long_description": "Utilize data from your enterprise to achieve productivity gains in activities related to question/answer conversations, content search, summarization and generation. RAG can be deployed in multiple configurations and is applicable to various industry use cases and solutions.\n\nThis deployable architecture provides a comprehensive foundation for trust, observability, security, and regulatory compliance by configuring and deploying various services and a sample application for a [RAG pattern](https://cloud.ibm.com/docs/pattern-genai-rag?topic=pattern-genai-rag-genai-pattern), including:\n- Configuring IBM Cloud Account with best practices from [IBM Cloud Framework for Financial Services](https://cloud.ibm.com/docs/framework-financial-services?topic=framework-financial-services-about)\n- Deploying key and secrets management services for storage and management of encryption keys and secrets\n- Deploying controls for continuous compliance\n- Deploying observability services for application and platform logging and monitoring\n- Deploying a suite of watsonx services to provide generative AI RAG capabilities\n- Deploying content databases for storing vector embeddings of the documents and content search/retrieval\n- Deploying a sample application in a variety of run times including CI/CD/CC pipelines for secure application lifecycle management\n\nThe above configured and deployed services enable a secure and trustworthy deployment of generative AI applications on IBM Cloud.\n\nThe configurations are flexible and be changed to meet the needs for several types of RAG patterns depending on the chosen combination of technologies and services.\n\nThe generative AI RAG pattern services include:\n- [watsonx.ai](https://dataplatform.cloud.ibm.com/docs/content/wsj/getting-started/welcome-main.html?context=wx)\n- [watsonx.data](https://cloud.ibm.com/docs/watsonxdata) (with Milvus)\n- [watsonx.governance](https://dataplatform.cloud.ibm.com/docs/content/svc-welcome/aiopenscale.html?context=wx)\n- [watsonx Assistant](https://cloud.ibm.com/docs/watson-assistant?topic=watson-assistant-welcome-new-assistant)\n- [watsonx Orchestrate](https://www.ibm.com/docs/en/watsonx/watson-orchestrate/current)\n- [Watson Discovery](https://cloud.ibm.com/docs/discovery-data)\n- [Elasticsearch](https://cloud.ibm.com/docs/databases-for-elasticsearch) Enterprise and Platinum edition\nThe supporting services include:\n- [Secrets Manager](https://cloud.ibm.com/docs/secrets-manager)\n- [Key Protect](https://cloud.ibm.com/docs/key-protect)\n- [Security and Compliance Center](https://cloud.ibm.com/docs/security-compliance)\n- [Event Notifications](https://cloud.ibm.com/docs/event-notifications?topic=event-notifications-getting-started)\n- [Logs](https://cloud.ibm.com/docs/cloud-logs)\n- [Monitoring](https://cloud.ibm.com/docs/monitoring?topic=monitoring-getting-started)\n- [Object Storage](https://cloud.ibm.com/docs/cloud-object-storage?topic=cloud-object-storage-getting-started-cloud-object-storage)\n- [Continuous Delivery](https://cloud.ibm.com/docs/ContinuousDelivery) toolchains\n- [Container Registry](https://cloud.ibm.com/docs/Registry)\n\nA [sample RAG application](https://github.com/IBM/gen-ai-rag-watsonx-sample-application) is deployed to [Code Engine](https://cloud.ibm.com/docs/codeengine) or [Red Hat OpenShift](https://cloud.ibm.com/docs/openshift) cluster.\n\nBy leveraging this architecture, you can accelerate your deployment and tailor it to meet your unique business needs and enterprise goals.", "offering_docs_url": "https://github.com/terraform-ibm-modules/stack-retrieval-augmented-generation/blob/main/README.md", "offering_icon_url": "https://globalcatalog.cloud.ibm.com/api/v1/1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc/artifacts/solution.svg", "provider_name": "IBM", "features": [ { - "title": "Retrieval Augmented Generation sample pattern", - "description": "Deploy a banking retrieval augmented generation (RAG) sample application to IBM Cloud Code Engine using Continous Delivery." - }, - { - "title": "Ensure Observability", - "description": "Provides observability by deploying services such as IBM Log Analysis, IBM Monitoring, IBM Activity Tracker, and log retention." + "title": "RAG Pattern", + "description": "Deploy a RAG pattern with supporting IBM Cloud and watsonx services, and a sample application to Code Engine or Red Hat OpenShift using Continuous Delivery." }, { "title": "Implement Security", - "description": "The architecture ensures security by deploying IBM Key Protect and IBM Secrets Manager." + "description": "The architecture ensures security by deploying Key Protect and Secrets Manager." }, { "title": "Achieve Regulatory Compliance", - "description": "Ensures regulatory compliance by implementing CI/CD/CC pipelines, along with IBM SCC for secure application lifecycle management." + "description": "Ensures regulatory compliance by implementing CI/CD/CC pipelines, along with Security and Compliance Center for continuous compliance." + }, + { + "title": "Ensure Observability", + "description": "Provides observability by deploying services such as Logs and Monitoring for log analysis and tracking activity." }, { "title": "Establish Trust", @@ -157,24 +157,8 @@ "architecture": { "features": [ { - "title": "Retrieval Augmented Generation sample pattern", - "description": "Deploy a banking retrieval augmented generation (RAG) sample application to IBM Cloud Code Engine using Continous Delivery." - }, - { - "title": "Ensure Observability", - "description": "The architecture provides observability by deploying services such as IBM Log Analysis, IBM Monitoring, IBM Activity Tracker, and log retention through Cloud Object Storage buckets." - }, - { - "title": "Implement Security", - "description": "The architecture ensures security by deploying IBM Key Protect and IBM Secrets Manager." - }, - { - "title": "Achieve Regulatory Compliance", - "description": "The architecture ensures regulatory compliance by implementing CI/CD/CC pipelines, along with IBM Security Compliance Center (SCC) for secure application lifecycle management." - }, - { - "title": "Establish Trust", - "description": "The architecture ensures trust by configuring the IBM Cloud account to align with compliance settings as defined in the Financial Services framework." + "title": "Enables:", + "description": "1.Code Engine for containerized and serverless workloads\n2.Elasticsearch Enterprise for building and storing dense vector indexes or keyword search indexes\n3.watsonx.ai in-memory vector store for RAG trial and exploration\n4.watsonx.ai UI to upload documents\n5.watsonx.ai Prompt Lab for inferencing and Prompt Templates\n6.watsonx Assistant Conversational Search with embedded LLM\n7.Build your own data processing, ingestion pipeline and indexes" } ], "diagrams": [ @@ -287,17 +271,10 @@ "required": false }, { - "key": "enable_platform_metrics", + "key": "enable_platform_logs_metrics", "type": "boolean", "default_value": false, - "description": "Whether the monitoring instance is configured to receive all platform metrics in the target region. There can only be one instance per region provisioned for platform metrics.", - "required": false - }, - { - "key": "logs_routing_tenant_regions", - "type": "array", - "default_value": [], - "description": "Pass a list of regions to create a tenant that is targeted to the Cloud Logs instance. To manage platform logs that are generated by IBM Cloud® services in a region of IBM Cloud, you must create a tenant in each region that you operate. Leave the list empty if you don't want to create any tenants.", + "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 }, { @@ -501,24 +478,8 @@ "architecture": { "features": [ { - "title": "Retrieval Augmented Generation sample pattern", - "description": "Deploy a banking retrieval augmented generation (RAG) sample application to IBM Cloud Code Engine using Continous Delivery." - }, - { - "title": "Ensure Observability", - "description": "The architecture provides observability by deploying services such as IBM Log Analysis, IBM Monitoring, IBM Activity Tracker, and log retention through Cloud Object Storage buckets." - }, - { - "title": "Implement Security", - "description": "The architecture ensures security by deploying IBM Key Protect and IBM Secrets Manager." - }, - { - "title": "Achieve Regulatory Compliance", - "description": "The architecture ensures regulatory compliance by implementing CI/CD/CC pipelines, along with IBM Security Compliance Center (SCC) for secure application lifecycle management." - }, - { - "title": "Establish Trust", - "description": "The architecture ensures trust by configuring the IBM Cloud account to align with compliance settings as defined in the Financial Services framework." + "title": "Enables:", + "description": "1.Red Hat OpenShift cluster for microservices workloads\n2.Elasticsearch Platinum for building and storing sparse vectors, dense vector indexes or keyword search indexes\n - watsonx.ai use of Elasticsearch ELSER2 vector index for RAG\n - watsonx Assistant Conversational Search with UI feature for uploading documents to create or use Elasticsearch ELSER2 vector index for RAG\n3.watsonx.ai in-memory vector store for RAG trial and exploration\n4.watsonx.ai UI to upload documents\n5.watsonx.ai Prompt Lab for inferencing and Prompt Templates\n6.watsonx Assistant Conversational Search with embedded LLM\n7.Build your own data processing, ingestion pipeline and indexes" } ], "diagrams": [ @@ -631,17 +592,10 @@ "required": false }, { - "key": "enable_platform_metrics", + "key": "enable_platform_logs_metrics", "type": "boolean", "default_value": false, - "description": "Whether the monitoring instance is configured to receive all platform metrics in the target region. There can only be one instance per region provisioned for platform metrics.", - "required": false - }, - { - "key": "logs_routing_tenant_regions", - "type": "array", - "default_value": [], - "description": "Pass a list of regions to create a tenant that is targeted to the Cloud Logs instance. To manage platform logs that are generated by IBM Cloud® services in a region of IBM Cloud, you must create a tenant in each region that you operate. Leave the list empty if you don't want to create any tenants.", + "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 }, {