Skip to content
This repository was archived by the owner on Dec 17, 2024. It is now read-only.

Commit ba15a5e

Browse files
toddgigueretoddgiguere
authored
fix: latest updates to dev tile (#63)
1 parent 9f9ed20 commit ba15a5e

File tree

5 files changed

+54
-27
lines changed

5 files changed

+54
-27
lines changed

‎ibm_catalog.json‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,13 @@
152152
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
153153
"crn:v1:bluemix:public:iam::::role:Editor"
154154
]
155+
},
156+
{
157+
"role_crns": [
158+
"crn:v1:bluemix:public:iam::::serviceRole:Writer",
159+
"crn:v1:bluemix:public:iam::::role:Editor"
160+
],
161+
"service_name": "codeengine"
155162
}
156163
],
157164
"architecture": {
@@ -299,10 +306,10 @@
299306
"required": false
300307
},
301308
{
302-
"key": "enable_platform_metrics",
309+
"key": "enable_platform_logs_metrics",
303310
"type": "boolean",
304311
"default_value": false,
305-
"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.",
312+
"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.",
306313
"required": false
307314
},
308315
{
@@ -414,7 +421,7 @@
414421
"profiles": [
415422
{
416423
"profile_name": "AI Security Guardrails 2.0",
417-
"profile_version": "1.0.0"
424+
"profile_version": "1.1.0"
418425
}
419426
]
420427
},
@@ -501,6 +508,18 @@
501508
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
502509
"crn:v1:bluemix:public:iam::::role:Editor"
503510
]
511+
},
512+
{
513+
"role_crns": [
514+
"crn:v1:bluemix:public:iam::::role:Administrator"
515+
],
516+
"service_name": "containers-kubernetes"
517+
},
518+
{
519+
"role_crns": [
520+
"crn:v1:bluemix:public:iam::::role:Administrator"
521+
],
522+
"service_name": "is.vpc"
504523
}
505524
],
506525
"architecture": {
@@ -518,11 +537,11 @@
518537
"description": " "
519538
},
520539
{
521-
"title": "- watsonx.ai use of Elasticsearch ELSER2 vector index for RAG",
540+
"title": "i. watsonx.ai use of Elasticsearch ELSER2 vector index for RAG",
522541
"description": " "
523542
},
524543
{
525-
"title": "- watsonx Assistant Conversational Search with UI feature for uploading documents to create or use Elasticsearch ELSER2 vector index for RAG",
544+
"title": "ii. watsonx Assistant Conversational Search with UI feature for uploading documents to create or use Elasticsearch ELSER2 vector index for RAG",
526545
"description": " "
527546
},
528547
{
@@ -656,10 +675,10 @@
656675
"required": false
657676
},
658677
{
659-
"key": "enable_platform_metrics",
678+
"key": "enable_platform_logs_metrics",
660679
"type": "boolean",
661680
"default_value": false,
662-
"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.",
681+
"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.",
663682
"required": false
664683
},
665684
{

‎solutions/basic/stack_definition.json‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"default": null
7777
},
7878
{
79-
"name": "enable_platform_metrics",
79+
"name": "enable_platform_logs_metrics",
8080
"required": false,
8181
"type": "boolean",
8282
"hidden": false,
@@ -236,7 +236,7 @@
236236
},
237237
{
238238
"name": "Essential Security - Logging Monitoring Activity Tracker",
239-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.eaf90e32-42b4-4cd6-a4c3-ea720f6ea9f7-global",
239+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.157744e4-5ef1-4e0f-9b8b-8b49b2ee8bb2-global",
240240
"inputs": [
241241
{
242242
"name": "ibmcloud_api_key",
@@ -268,7 +268,11 @@
268268
},
269269
{
270270
"name": "enable_platform_metrics",
271-
"value": "ref:../../inputs/enable_platform_metrics"
271+
"value": "ref:../../inputs/enable_platform_logs_metrics"
272+
},
273+
{
274+
"name": "enable_platform_logging",
275+
"value": "ref:../../inputs/enable_platform_logs_metrics"
272276
}
273277
]
274278
},
@@ -404,7 +408,7 @@
404408
},
405409
{
406410
"name": "Gen AI - Databases for Elasticsearch",
407-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.aa4a2c9b-8a6a-472d-a9d3-9fc6e97b062f-global",
411+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.bd9fa211-0586-4580-90a7-47f22f6b8b4b-global",
408412
"inputs": [
409413
{
410414
"name": "use_existing_resource_group",
@@ -659,7 +663,7 @@
659663
},
660664
{
661665
"name": "Workload - Sample RAG App Configuration",
662-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.15a21bde-a11f-476b-a312-83a9c863e8eb-global",
666+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0f19e9f8-07c5-4091-9c0a-5f55f846b152-global",
663667
"inputs": [
664668
{
665669
"name": "toolchain_region",

‎solutions/standard/stack_definition.json‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"default": null
7777
},
7878
{
79-
"name": "enable_platform_metrics",
79+
"name": "enable_platform_logs_metrics",
8080
"required": false,
8181
"type": "boolean",
8282
"hidden": false,
@@ -236,7 +236,7 @@
236236
},
237237
{
238238
"name": "Essential Security - Logging Monitoring Activity Tracker",
239-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.eaf90e32-42b4-4cd6-a4c3-ea720f6ea9f7-global",
239+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.157744e4-5ef1-4e0f-9b8b-8b49b2ee8bb2-global",
240240
"inputs": [
241241
{
242242
"name": "ibmcloud_api_key",
@@ -268,7 +268,11 @@
268268
},
269269
{
270270
"name": "enable_platform_metrics",
271-
"value": "ref:../../inputs/enable_platform_metrics"
271+
"value": "ref:../../inputs/enable_platform_logs_metrics"
272+
},
273+
{
274+
"name": "enable_platform_logging",
275+
"value": "ref:../../inputs/enable_platform_logs_metrics"
272276
}
273277
]
274278
},
@@ -404,7 +408,7 @@
404408
},
405409
{
406410
"name": "Gen AI - Databases for Elasticsearch",
407-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.aa4a2c9b-8a6a-472d-a9d3-9fc6e97b062f-global",
411+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.bd9fa211-0586-4580-90a7-47f22f6b8b4b-global",
408412
"inputs": [
409413
{
410414
"name": "use_existing_resource_group",
@@ -543,7 +547,7 @@
543547
]
544548
},
545549
{
546-
"name": "Workload - Red Hat OpenShift Container Platform on VPC",
550+
"name": "Workload - Compute Red Hat OpenShift Container Platform on VPC",
547551
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.639be978-b7d7-4702-9723-0b638225491b-global",
548552
"inputs": [
549553
{
@@ -622,7 +626,7 @@
622626
]
623627
},
624628
{
625-
"name": "Workload - Application Lifecycle Management",
629+
"name": "Workload - DevSecOps Application Lifecycle Management",
626630
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.d0d2aff1-8f34-4fa8-bc00-92378edd2226-global",
627631
"inputs": [
628632
{
@@ -655,7 +659,7 @@
655659
},
656660
{
657661
"name": "cluster_name",
658-
"value": "ref:../Workload - Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name"
662+
"value": "ref:../Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name"
659663
},
660664
{
661665
"name": "registry_namespace",
@@ -701,7 +705,7 @@
701705
},
702706
{
703707
"name": "Workload - Sample RAG App Configuration",
704-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.15a21bde-a11f-476b-a312-83a9c863e8eb-global",
708+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0f19e9f8-07c5-4091-9c0a-5f55f846b152-global",
705709
"inputs": [
706710
{
707711
"name": "toolchain_region",
@@ -725,11 +729,11 @@
725729
},
726730
{
727731
"name": "cd_pipeline_id",
728-
"value": "ref:../Workload - Application Lifecycle Management/outputs/cd_pipeline_id"
732+
"value": "ref:../Workload - DevSecOps Application Lifecycle Management/outputs/cd_pipeline_id"
729733
},
730734
{
731735
"name": "ci_pipeline_id",
732-
"value": "ref:../Workload - Application Lifecycle Management/outputs/ci_pipeline_id"
736+
"value": "ref:../Workload - DevSecOps Application Lifecycle Management/outputs/ci_pipeline_id"
733737
},
734738
{
735739
"name": "watson_machine_learning_instance_guid",
@@ -781,11 +785,11 @@
781785
},
782786
{
783787
"name": "cluster_name",
784-
"value": "ref:../Workload - Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name"
788+
"value": "ref:../Workload - Compute Red Hat OpenShift Container Platform on VPC/outputs/workload_cluster_name"
785789
},
786790
{
787791
"name": "cluster_zone_count",
788-
"value": "ref:../Workload - Red Hat OpenShift Container Platform on VPC/inputs/cluster_zones"
792+
"value": "ref:../Workload - Compute Red Hat OpenShift Container Platform on VPC/inputs/cluster_zones"
789793
}
790794
]
791795
}

‎tests/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.23.1
77
require (
88
github.com/gruntwork-io/terratest v0.47.1
99
github.com/stretchr/testify v1.9.0
10-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.2
10+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.3
1111
)
1212

1313
require (

‎tests/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,8 +602,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
602602
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
603603
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
604604
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
605-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.2 h1:CS7GP1awUY/oR/NmQo4O1GUjnd0mkpsDVaxGM/Kg+iQ=
606-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.2/go.mod h1:xOJLB0UttcTG0FPVLikDM6RxP4iC+apBD01hidt2gYo=
605+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.3 h1:34LldlFzaFwNpeeUJI7yIwG7JO0twRC8nPIsgatzZRs=
606+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.39.3/go.mod h1:xOJLB0UttcTG0FPVLikDM6RxP4iC+apBD01hidt2gYo=
607607
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
608608
github.com/tmccombs/hcl2json v0.5.0 h1:cT2sXStOzKL06c8ZTf9vh+0N8GKGzV7+9RUaY5/iUP8=
609609
github.com/tmccombs/hcl2json v0.5.0/go.mod h1:B0ZpBthAKbQur6yZRKrtaqDmYLCvgnwHOBApE0faCpU=

0 commit comments

Comments
 (0)