From ba15a5e9b80a5bb25ab1efa776643871210117e9 Mon Sep 17 00:00:00 2001 From: toddgiguere <83610458+toddgiguere@users.noreply.github.com> Date: Mon, 30 Sep 2024 10:24:29 -0400 Subject: [PATCH] fix: latest updates to dev tile (#63) --- ibm_catalog.json | 33 +++++++++++++++++++----- solutions/basic/stack_definition.json | 14 ++++++---- solutions/standard/stack_definition.json | 28 +++++++++++--------- tests/go.mod | 2 +- tests/go.sum | 4 +-- 5 files changed, 54 insertions(+), 27 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 4e95a7f..877e89f 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -152,6 +152,13 @@ "crn:v1:bluemix:public:iam::::serviceRole:Manager", "crn:v1:bluemix:public:iam::::role:Editor" ] + }, + { + "role_crns": [ + "crn:v1:bluemix:public:iam::::serviceRole:Writer", + "crn:v1:bluemix:public:iam::::role:Editor" + ], + "service_name": "codeengine" } ], "architecture": { @@ -299,10 +306,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.", + "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 }, { @@ -414,7 +421,7 @@ "profiles": [ { "profile_name": "AI Security Guardrails 2.0", - "profile_version": "1.0.0" + "profile_version": "1.1.0" } ] }, @@ -501,6 +508,18 @@ "crn:v1:bluemix:public:iam::::serviceRole:Manager", "crn:v1:bluemix:public:iam::::role:Editor" ] + }, + { + "role_crns": [ + "crn:v1:bluemix:public:iam::::role:Administrator" + ], + "service_name": "containers-kubernetes" + }, + { + "role_crns": [ + "crn:v1:bluemix:public:iam::::role:Administrator" + ], + "service_name": "is.vpc" } ], "architecture": { @@ -518,11 +537,11 @@ "description": " " }, { - "title": "- watsonx.ai use of Elasticsearch ELSER2 vector index for RAG", + "title": "i. watsonx.ai use of Elasticsearch ELSER2 vector index for RAG", "description": " " }, { - "title": "- watsonx Assistant Conversational Search with UI feature for uploading documents to create or use Elasticsearch ELSER2 vector index for RAG", + "title": "ii. watsonx Assistant Conversational Search with UI feature for uploading documents to create or use Elasticsearch ELSER2 vector index for RAG", "description": " " }, { @@ -656,10 +675,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.", + "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 }, { diff --git a/solutions/basic/stack_definition.json b/solutions/basic/stack_definition.json index 39f70c4..92d6c03 100644 --- a/solutions/basic/stack_definition.json +++ b/solutions/basic/stack_definition.json @@ -76,7 +76,7 @@ "default": null }, { - "name": "enable_platform_metrics", + "name": "enable_platform_logs_metrics", "required": false, "type": "boolean", "hidden": false, @@ -236,7 +236,7 @@ }, { "name": "Essential Security - Logging Monitoring Activity Tracker", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.eaf90e32-42b4-4cd6-a4c3-ea720f6ea9f7-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.157744e4-5ef1-4e0f-9b8b-8b49b2ee8bb2-global", "inputs": [ { "name": "ibmcloud_api_key", @@ -268,7 +268,11 @@ }, { "name": "enable_platform_metrics", - "value": "ref:../../inputs/enable_platform_metrics" + "value": "ref:../../inputs/enable_platform_logs_metrics" + }, + { + "name": "enable_platform_logging", + "value": "ref:../../inputs/enable_platform_logs_metrics" } ] }, @@ -404,7 +408,7 @@ }, { "name": "Gen AI - Databases for Elasticsearch", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.aa4a2c9b-8a6a-472d-a9d3-9fc6e97b062f-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.bd9fa211-0586-4580-90a7-47f22f6b8b4b-global", "inputs": [ { "name": "use_existing_resource_group", @@ -659,7 +663,7 @@ }, { "name": "Workload - Sample RAG App Configuration", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.15a21bde-a11f-476b-a312-83a9c863e8eb-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0f19e9f8-07c5-4091-9c0a-5f55f846b152-global", "inputs": [ { "name": "toolchain_region", diff --git a/solutions/standard/stack_definition.json b/solutions/standard/stack_definition.json index 866c679..5ff1a3f 100644 --- a/solutions/standard/stack_definition.json +++ b/solutions/standard/stack_definition.json @@ -76,7 +76,7 @@ "default": null }, { - "name": "enable_platform_metrics", + "name": "enable_platform_logs_metrics", "required": false, "type": "boolean", "hidden": false, @@ -236,7 +236,7 @@ }, { "name": "Essential Security - Logging Monitoring Activity Tracker", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.eaf90e32-42b4-4cd6-a4c3-ea720f6ea9f7-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.157744e4-5ef1-4e0f-9b8b-8b49b2ee8bb2-global", "inputs": [ { "name": "ibmcloud_api_key", @@ -268,7 +268,11 @@ }, { "name": "enable_platform_metrics", - "value": "ref:../../inputs/enable_platform_metrics" + "value": "ref:../../inputs/enable_platform_logs_metrics" + }, + { + "name": "enable_platform_logging", + "value": "ref:../../inputs/enable_platform_logs_metrics" } ] }, @@ -404,7 +408,7 @@ }, { "name": "Gen AI - Databases for Elasticsearch", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.aa4a2c9b-8a6a-472d-a9d3-9fc6e97b062f-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.bd9fa211-0586-4580-90a7-47f22f6b8b4b-global", "inputs": [ { "name": "use_existing_resource_group", @@ -543,7 +547,7 @@ ] }, { - "name": "Workload - Red Hat OpenShift Container Platform on VPC", + "name": "Workload - Compute Red Hat OpenShift Container Platform on VPC", "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.639be978-b7d7-4702-9723-0b638225491b-global", "inputs": [ { @@ -622,7 +626,7 @@ ] }, { - "name": "Workload - Application Lifecycle Management", + "name": "Workload - DevSecOps Application Lifecycle Management", "version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.d0d2aff1-8f34-4fa8-bc00-92378edd2226-global", "inputs": [ { @@ -655,7 +659,7 @@ }, { "name": "cluster_name", - "value": "ref:../Workload - Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name" + "value": "ref:../Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name" }, { "name": "registry_namespace", @@ -701,7 +705,7 @@ }, { "name": "Workload - Sample RAG App Configuration", - "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.15a21bde-a11f-476b-a312-83a9c863e8eb-global", + "version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0f19e9f8-07c5-4091-9c0a-5f55f846b152-global", "inputs": [ { "name": "toolchain_region", @@ -725,11 +729,11 @@ }, { "name": "cd_pipeline_id", - "value": "ref:../Workload - Application Lifecycle Management/outputs/cd_pipeline_id" + "value": "ref:../Workload - DevSecOps Application Lifecycle Management/outputs/cd_pipeline_id" }, { "name": "ci_pipeline_id", - "value": "ref:../Workload - Application Lifecycle Management/outputs/ci_pipeline_id" + "value": "ref:../Workload - DevSecOps Application Lifecycle Management/outputs/ci_pipeline_id" }, { "name": "watson_machine_learning_instance_guid", @@ -781,11 +785,11 @@ }, { "name": "cluster_name", - "value": "ref:../Workload - Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name" + "value": "ref:../Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name" }, { "name": "cluster_zone_count", - "value": "ref:../Workload - Red Hat OpenShift Container Platform on VPC/inputs/cluster_zones" + "value": "ref:../Workload - Compute Red Hat OpenShift Container Platform on VPC/inputs/cluster_zones" } ] } diff --git a/tests/go.mod b/tests/go.mod index 0f440b1..dd52213 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.39.2 + github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.3 ) require ( diff --git a/tests/go.sum b/tests/go.sum index 14cfec9..b28c6b4 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -602,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.39.2 h1:CS7GP1awUY/oR/NmQo4O1GUjnd0mkpsDVaxGM/Kg+iQ= -github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.2/go.mod h1:xOJLB0UttcTG0FPVLikDM6RxP4iC+apBD01hidt2gYo= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.3 h1:34LldlFzaFwNpeeUJI7yIwG7JO0twRC8nPIsgatzZRs= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.3/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=