Skip to content

Commit 8ead99d

Browse files
terraform-ibm-modules-opsterraform-ibm-modules-ops
authored
feat(deps): Update stack definition member versions (#246)
1 parent 97a51cd commit 8ead99d

File tree

8 files changed

+226
-121
lines changed

8 files changed

+226
-121
lines changed

‎common-dev-assets

‎ibm_catalog.json

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@
235235
"key": "signing_key",
236236
"type": "password",
237237
"description": "The key used to sign the application image built by the CI pipeline deployed in this solution; please refer to the documentation at https://github.com/terraform-ibm-modules/stack-retrieval-augmented-generation/blob/main/README.md for generating the key; if not set, all resources will deploy successfully, but the initial CI pipeline execution will fail at the signing step.",
238-
"display_name": "Multiline secure value",
239238
"default_value": "replace",
240239
"required": false,
241240
"custom_config": {
@@ -306,10 +305,25 @@
306305
"required": false
307306
},
308307
{
309-
"key": "enable_platform_logs_metrics",
308+
"key": "skip_iam_authorization_policy",
309+
"display_name": "Disable Secrets Manager IAM credentials engine auth policy creation?",
310310
"type": "boolean",
311311
"default_value": false,
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.",
312+
"description": "Whether to skip the creation of the IAM authorization policies required to enable the Secrets Manager IAM credentials engine. If set to false, policies will be created that grants the Secrets Manager instance 'Operator' access to the IAM identity service, and 'Groups Service Member Manage' access to the IAM groups service.",
313+
"required": false
314+
},
315+
{
316+
"key": "enable_platform_metrics",
317+
"type": "boolean",
318+
"default_value": false,
319+
"description": "Setting this to true will enable platform metrics for the Cloud Monitoring instance. NOTE: You can configure 1 instance only of the IBM Cloud Monitoring service per region to collect platform metrics in that location.",
320+
"required": false
321+
},
322+
{
323+
"key": "logs_routing_tenant_regions",
324+
"type": "array",
325+
"default_value": [],
326+
"description": "Pass a list of regions to create a tenant that is targeted to the Cloud Logs instance created by this solution. 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.",
313327
"required": false
314328
},
315329
{
@@ -605,7 +619,6 @@
605619
"key": "signing_key",
606620
"type": "password",
607621
"description": "The key used to sign the application image built by the CI pipeline deployed in this solution; please refer to the documentation at https://github.com/terraform-ibm-modules/stack-retrieval-augmented-generation/blob/main/README.md for generating the key; if not set, all resources will deploy successfully, but the initial CI pipeline execution will fail at the signing step.",
608-
"display_name": "Multiline secure value",
609622
"default_value": "replace",
610623
"required": false,
611624
"custom_config": {
@@ -676,10 +689,25 @@
676689
"required": false
677690
},
678691
{
679-
"key": "enable_platform_logs_metrics",
692+
"key": "skip_iam_authorization_policy",
693+
"display_name": "Disable Secrets Manager IAM credentials engine auth policy creation?",
680694
"type": "boolean",
681695
"default_value": false,
682-
"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.",
696+
"description": "Whether to skip the creation of the IAM authorization policies required to enable the Secrets Manager IAM credentials engine. If set to false, policies will be created that grants the Secrets Manager instance 'Operator' access to the IAM identity service, and 'Groups Service Member Manage' access to the IAM groups service.",
697+
"required": false
698+
},
699+
{
700+
"key": "enable_platform_metrics",
701+
"type": "boolean",
702+
"default_value": false,
703+
"description": "Setting this to true will enable platform metrics for the Cloud Monitoring instance. NOTE: You can configure 1 instance only of the IBM Cloud Monitoring service per region to collect platform metrics in that location.",
704+
"required": false
705+
},
706+
{
707+
"key": "logs_routing_tenant_regions",
708+
"type": "array",
709+
"default_value": [],
710+
"description": "Pass a list of regions to create a tenant that is targeted to the Cloud Logs instance created by this solution. 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.",
683711
"required": false
684712
},
685713
{

‎solutions/basic/stack_definition.json

Lines changed: 56 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@
1414
"hidden": false,
1515
"default": "trial"
1616
},
17+
{
18+
"name": "skip_iam_authorization_policy",
19+
"required": false,
20+
"type": "boolean",
21+
"hidden": false,
22+
"default": false
23+
},
1724
{
1825
"name": "watsonx_admin_api_key",
1926
"required": false,
@@ -76,12 +83,19 @@
7683
"default": null
7784
},
7885
{
79-
"name": "enable_platform_logs_metrics",
86+
"name": "enable_platform_metrics",
8087
"required": false,
8188
"type": "boolean",
8289
"hidden": false,
8390
"default": false
8491
},
92+
{
93+
"name": "logs_routing_tenant_regions",
94+
"required": false,
95+
"type": "array",
96+
"hidden": false,
97+
"default": []
98+
},
8599
{
86100
"name": "existing_discovery_instance",
87101
"required": false,
@@ -128,7 +142,7 @@
128142
"members": [
129143
{
130144
"name": "Account Infrastructure Base",
131-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.e410c7bc-eee6-4dc1-86b5-1ccbd3fdd1fc-global",
145+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fa88886a-209c-4fbf-b06c-d5f1a96e0ffc-global",
132146
"inputs": [
133147
{
134148
"name": "prefix",
@@ -206,7 +220,7 @@
206220
},
207221
{
208222
"name": "Essential Security - Encryption Key Management",
209-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.00f91756-7287-4786-9ab0-fd12d30d8919-global",
223+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.efaad0d0-9028-4d39-90e7-7e0f9d6e7569-global",
210224
"inputs": [
211225
{
212226
"name": "resource_group_name",
@@ -231,12 +245,16 @@
231245
{
232246
"name": "prefix",
233247
"value": "ref:../../inputs/prefix"
248+
},
249+
{
250+
"name": "key_protect_instance_name",
251+
"value": "base-security-services-kms"
234252
}
235253
]
236254
},
237255
{
238256
"name": "Essential Security - Logging Monitoring Activity Tracker",
239-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.5036a34b-9925-4d06-932b-c22ce63d3fdf-global",
257+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.50624578-9e5c-408c-90ea-ce412899b5dc-global",
240258
"inputs": [
241259
{
242260
"name": "ibmcloud_api_key",
@@ -268,17 +286,17 @@
268286
},
269287
{
270288
"name": "enable_platform_metrics",
271-
"value": "ref:../../inputs/enable_platform_logs_metrics"
289+
"value": "ref:../../inputs/enable_platform_metrics"
272290
},
273291
{
274-
"name": "enable_platform_logs",
275-
"value": "ref:../../inputs/enable_platform_logs_metrics"
292+
"name": "logs_routing_tenant_regions",
293+
"value": "ref:../../inputs/logs_routing_tenant_regions"
276294
}
277295
]
278296
},
279297
{
280298
"name": "Essential Security - Event Notifications",
281-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88d7308d-c2c8-4977-92cf-f85d99e27d00-global",
299+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1c3a9873-77b2-4ab4-89c7-26d9899b1edb-global",
282300
"inputs": [
283301
{
284302
"name": "kms_endpoint_url",
@@ -316,7 +334,7 @@
316334
},
317335
{
318336
"name": "Essential Security - Secrets Manager",
319-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global",
337+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.db823650-3010-4482-b807-45145f273553-global",
320338
"inputs": [
321339
{
322340
"name": "prefix",
@@ -346,23 +364,39 @@
346364
"name": "existing_secrets_manager_crn",
347365
"value": "ref:../../inputs/existing_secrets_manager_crn"
348366
},
367+
{
368+
"name": "skip_iam_authorization_policy",
369+
"value": "ref:../../inputs/skip_iam_authorization_policy"
370+
},
349371
{
350372
"name": "service_plan",
351373
"value": "ref:../../inputs/secret_manager_service_plan"
352374
},
353375
{
354-
"name": "existing_event_notification_instance_crn",
376+
"name": "existing_event_notifications_instance_crn",
355377
"value": "ref:../Essential Security - Event Notifications/outputs/crn"
356378
},
357379
{
358-
"name": "enable_event_notification",
380+
"name": "enable_event_notifications",
359381
"value": true
382+
},
383+
{
384+
"name": "kms_key_ring_name",
385+
"value": "sm-cos-key-ring"
386+
},
387+
{
388+
"name": "kms_key_name",
389+
"value": "sm-cos-key"
390+
},
391+
{
392+
"name": "secrets_manager_instance_name",
393+
"value": "base-security-services-sm"
360394
}
361395
]
362396
},
363397
{
364398
"name": "Essential Security - Security Compliance Center",
365-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e4e8fc9-8953-4456-a51c-6ed6a3ca1bd7-global",
399+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.03c63154-2430-4154-9033-9f8e6f80d93b-global",
366400
"inputs": [
367401
{
368402
"name": "ibmcloud_api_key",
@@ -397,7 +431,7 @@
397431
"value": false
398432
},
399433
{
400-
"name": "existing_en_crn",
434+
"name": "existing_event_notifications_crn",
401435
"value": "ref:../Essential Security - Event Notifications/outputs/crn"
402436
},
403437
{
@@ -408,7 +442,7 @@
408442
},
409443
{
410444
"name": "Gen AI - Databases for Elasticsearch",
411-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0166bfff-6cf8-46d1-bb13-e27f7f8ba0db-global",
445+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.68a66140-e2e8-40ef-be86-c46e6f3442a3-global",
412446
"inputs": [
413447
{
414448
"name": "use_existing_resource_group",
@@ -466,7 +500,7 @@
466500
},
467501
{
468502
"name": "Gen AI - WatsonX SaaS services",
469-
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.898b1113-985e-4524-9b69-279f0dc0fef2-global",
503+
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.c784a77d-cf67-4287-9284-a126e4a053a7-global",
470504
"inputs": [
471505
{
472506
"name": "ibmcloud_api_key",
@@ -535,12 +569,16 @@
535569
{
536570
"name": "cos_kms_crn",
537571
"value": "ref:../Essential Security - Encryption Key Management/outputs/kms_instance_crn"
572+
},
573+
{
574+
"name": "enable_cos_kms_encryption",
575+
"value": true
538576
}
539577
]
540578
},
541579
{
542580
"name": "Workload - Code Engine Projects",
543-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.65a474ad-7a19-4219-bdec-eab0dc413404-global",
581+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.c27eeec3-a83c-4ca0-9b26-c16a6a883fd7-global",
544582
"inputs": [
545583
{
546584
"name": "ibmcloud_api_key",
@@ -573,7 +611,7 @@
573611
},
574612
{
575613
"name": "Workload - DevSecOps Application Lifecycle Management",
576-
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.72e3b0a3-9d6c-4b85-be2c-baed5a5ac732-global",
614+
"version_locator": "1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc.3bf38800-70e9-40db-aeca-016c9911364f-global",
577615
"inputs": [
578616
{
579617
"name": "ibmcloud_api_key",
@@ -667,7 +705,7 @@
667705
},
668706
{
669707
"name": "Workload - Sample RAG App Configuration",
670-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.8fedf6b3-56a4-42e0-87a4-b767eadbe6c8-global",
708+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.78aab24a-ba1c-4d72-91fb-131d718dfeb6-global",
671709
"inputs": [
672710
{
673711
"name": "toolchain_region",

0 commit comments

Comments
 (0)