Skip to content

Commit 0c192aa

Browse files
terraform-ibm-modules-opsterraform-ibm-modules-ops
authored
feat: Update stack definition member versions (#190)
1 parent 2fae750 commit 0c192aa

File tree

8 files changed

+110
-75
lines changed

8 files changed

+110
-75
lines changed

‎catalogValidationValues.json.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"ibmcloud_api_key": $VALIDATION_APIKEY,
33
"prefix": $PREFIX,
44
"existing_resource_group_name": $RG_NAME,
5-
"enable_platform_logs_metrics": false,
5+
"enable_platform_metrics": false,
66
"region": "eu-de"
77
}

‎common-dev-assets‎

‎ibm_catalog.json‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"description": "Creates and configures an IBM Key Protect instance and creates root keys for IBM Cloud Object Storage, Event Notifications, and Secrets Manager."
3939
},
4040
{
41-
"title": "Creates an IBM Secrets Manager instance",
41+
"title": "Creates an IBM Cloud Secrets Manager instance",
4242
"description": "Creates and configures an IBM Secrets Manager instance."
4343
},
4444
{
@@ -51,15 +51,15 @@
5151
},
5252
{
5353
"title": "Creates an IBM Cloud Object Storage instance",
54-
"description": "Creates and configures an IBM Cloud Object Storage instance and multiple Object Storage buckets that is encrypted by Key Protect."
54+
"description": "Creates and configures an IBM Cloud Object Storage instance and multiple Object Storage buckets that are encrypted by IBM Key Protect."
5555
},
5656
{
5757
"title": "Creates an IBM Cloud Event Notifications instance",
5858
"description": "Creates and configures an IBM Cloud Event Notifications instance with topics for Secrets Manager and Security and Compliance Center events."
5959
},
6060
{
6161
"title": "Creates service-to-service authorizations",
62-
"description": "Creates and configures service-to-service authorizations for the following services: KMS, Event Notifications, Object Storage, Secrets Manager, and Security and Compliance Center."
62+
"description": "Creates and configures service-to-service authorizations for the following IBM Cloud services: Key Protect, Event Notifications, Object Storage, Security and Compliance Center, and Secrets Manager."
6363
}
6464
],
6565
"flavors": [
@@ -116,32 +116,32 @@
116116
"architecture": {
117117
"features": [
118118
{
119-
"title": "Creates IBM Cloud core security services in a resource group.",
119+
"title": "Creates IBM Cloud core security services in a resource group",
120120
"description": "Creates IBM Cloud core security services in an existing resource group."
121121
},
122122
{
123123
"title": "Creates an IBM Key Protect instance",
124124
"description": "Creates and configures an IBM Key Protect instance and creates root keys for IBM Cloud Object Storage, Event Notifications, and Secrets Manager."
125125
},
126126
{
127-
"title": "Creates an IBM Secrets Manager instance ",
128-
"description": "Creates and configures an IBM Secrets Manager instance."
127+
"title": "Creates an IBM Cloud Secrets Manager instance",
128+
"description": "Create, lease, and centrally manage secrets that are used in your apps and services using IBM Secrets Manager instance."
129129
},
130130
{
131-
"title": "Optionally configure an IBM Secrets Manager IAM credentials engine to an IBM Secrets Manager instance.",
132-
"description": "Optionally configure an IBM Secrets Manager IAM credentials engine to an IBM Secrets Manager instance."
131+
"title": "Optionally configure an IBM Cloud Secrets Manager IAM credentials engine to an IBM Cloud Secrets Manager instance",
132+
"description": "Optionally configure an IBM Secrets Manager IAM credentials engine to an IBM Cloud Secrets Manager instance."
133133
},
134134
{
135-
"title": "Creates an IBM Security and Compliance Center instance",
136-
"description": "Creates and configures an IBM Security Compliance Center instance."
135+
"title": "Creates an IBM Cloud Security and Compliance Center instance",
136+
"description": "Manage your continuous compliance monitoring needs using IBM Security Compliance Center instance."
137137
},
138138
{
139-
"title": "Creates a Security and Compliance Center Workload Protection instance",
140-
"description": "Creates and configures a Security and Compliance Center Workload Protection instance."
139+
"title": "Creates a IBM Cloud Security and Compliance Center Workload Protection instance",
140+
"description": "Creates a Cloud-Native Application Protection Platform solution to manage your security and compliance posture, allowing you to monitor misconfigurations and detect and respond to vulnerabilities and threats in real-time."
141141
},
142142
{
143-
"title": "Creates an IBM Event Notification instance",
144-
"description": "Creates and configures an Event Notifications instance."
143+
"title": "Creates an IBM Cloud Event Notifications instance",
144+
"description": "Deliver Email, SMS, Webhooks and Push Notifications for your IBM Cloud service events using IBM Event Notifications instance."
145145
}
146146
],
147147
"diagrams": [
@@ -202,10 +202,17 @@
202202
}
203203
},
204204
{
205-
"key": "enable_platform_logs_metrics",
205+
"key": "enable_platform_metrics",
206206
"type": "boolean",
207207
"default_value": true,
208-
"description": "Setting this to true will create a tenant in the same region where the Cloud Logs instance is provisioned, enabling platform logs for that region. Note: You can have only one tenant per region in an account. This variable will also enable platform logs for the Log Analysis instance and platform metrics for Cloud Monitoring instance.",
208+
"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.",
209+
"required": false
210+
},
211+
{
212+
"key": "logs_routing_tenant_regions",
213+
"type": "array",
214+
"default_value": [],
215+
"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.",
209216
"required": false
210217
},
211218
{
@@ -223,7 +230,7 @@
223230
"required": false
224231
},
225232
{
226-
"key" : "existing_en_instance_crn",
233+
"key": "existing_en_instance_crn",
227234
"type": "string",
228235
"default_value": "__NULL__",
229236
"description": "The CRN of existing event notification instance. If not supplied, a new instance is created.",
@@ -233,14 +240,14 @@
233240
"key": "existing_secrets_manager_crn",
234241
"type": "string",
235242
"default_value": "__NULL__",
236-
"description": "The CRN of an existing Secrets Manager instance to use in this solution. If not set, a new Secrets Manager instance is provisioned.",
243+
"description": "The CRN of an existing IBM Cloud Secrets Manager instance to use in this solution. If not set, a new Secrets Manager instance is provisioned.",
237244
"required": false
238245
},
239246
{
240247
"key": "sm_service_plan",
241248
"type": "string",
242249
"default_value": "standard",
243-
"description": "The pricing plan to use for Secrets Manager. Not used if `existing_secrets_manager_crn` is specified.",
250+
"description": "The pricing plan to use for IBM Cloud Secrets Manager. Not used if `existing_secrets_manager_crn` is specified.",
244251
"required": false,
245252
"options": [
246253
{
@@ -254,10 +261,11 @@
254261
]
255262
},
256263
{
257-
"key": "secret_manager_iam_engine_enabled",
264+
"key": "skip_iam_authorization_policy",
265+
"display_name": "Disable Secrets Manager IAM credentials engine auth policy creation?",
258266
"type": "boolean",
259267
"default_value": false,
260-
"description": "Set this to true to to configure a Secrets Manager IAM credentials engine. If set to false, no IAM engine will be configured for your instance.",
268+
"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.",
261269
"required": false
262270
},
263271
{

‎stack_definition.json‎

Lines changed: 52 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,21 @@
2525
"custom_config": {}
2626
},
2727
{
28-
"name": "enable_platform_logs_metrics",
28+
"name": "enable_platform_metrics",
2929
"required": false,
3030
"type": "boolean",
3131
"hidden": false,
3232
"default": true,
3333
"custom_config": {}
3434
},
35+
{
36+
"name": "logs_routing_tenant_regions",
37+
"required": false,
38+
"type": "array",
39+
"hidden": false,
40+
"default": [],
41+
"custom_config": {}
42+
},
3543
{
3644
"name": "existing_kms_instance_crn",
3745
"required": false,
@@ -72,19 +80,19 @@
7280
"custom_config": {}
7381
},
7482
{
75-
"name": "scc_service_plan",
83+
"name": "skip_iam_authorization_policy",
7684
"required": false,
77-
"type": "string",
85+
"type": "boolean",
7886
"hidden": false,
79-
"default": "security-compliance-center-standard-plan",
80-
"custom_config": {}
87+
"default": false
8188
},
8289
{
83-
"name": "secret_manager_iam_engine_enabled",
90+
"name": "scc_service_plan",
8491
"required": false,
85-
"type": "boolean",
92+
"type": "string",
8693
"hidden": false,
87-
"default": false
94+
"default": "security-compliance-center-standard-plan",
95+
"custom_config": {}
8896
}
8997
],
9098
"members": [
@@ -109,10 +117,14 @@
109117
{
110118
"name": "prefix",
111119
"value": "ref:../../inputs/prefix"
120+
},
121+
{
122+
"name": "key_protect_instance_name",
123+
"value": "base-security-services-kms"
112124
}
113125
],
114126
"name": "1a - Key management",
115-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.00f91756-7287-4786-9ab0-fd12d30d8919-global"
127+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.efaad0d0-9028-4d39-90e7-7e0f9d6e7569-global"
116128
},
117129
{
118130
"inputs": [
@@ -121,7 +133,7 @@
121133
"value": "ref:../../inputs/existing_resource_group_name"
122134
},
123135
{
124-
"name": "existing_resource_group",
136+
"name": "use_existing_resource_group",
125137
"value": true
126138
},
127139
{
@@ -134,7 +146,7 @@
134146
}
135147
],
136148
"name": "1b - Object storage",
137-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.855893e4-62db-4f00-a867-0795231053fe-global"
149+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.321f6c6a-7511-47d1-830a-72506ea72190-global"
138150
},
139151
{
140152
"inputs": [
@@ -167,20 +179,20 @@
167179
"value": "ref:../../members/1b - Object storage/outputs/cos_instance_id"
168180
},
169181
{
170-
"name": "enable_platform_logs",
171-
"value": "ref:../../inputs/enable_platform_logs_metrics"
182+
"name": "logs_routing_tenant_regions",
183+
"value": "ref:../../inputs/logs_routing_tenant_regions"
172184
},
173185
{
174186
"name": "enable_platform_metrics",
175-
"value": "ref:../../inputs/enable_platform_logs_metrics"
187+
"value": "ref:../../inputs/enable_platform_metrics"
176188
},
177189
{
178190
"name": "existing_en_instance_crn",
179191
"value": "ref:../../members/3 - Event Notifications/outputs/crn"
180192
}
181193
],
182194
"name": "2 - Observability",
183-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.783586a0-5c8c-465f-bee2-891c2ed630fd-global"
195+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.42643524-2f7e-4c59-a9bf-83c5f502f526-global"
184196
},
185197
{
186198
"inputs": [
@@ -230,7 +242,7 @@
230242
}
231243
],
232244
"name": "3 - Event Notifications",
233-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88d7308d-c2c8-4977-92cf-f85d99e27d00-global"
245+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.1c3a9873-77b2-4ab4-89c7-26d9899b1edb-global"
234246
},
235247
{
236248
"inputs": [
@@ -271,7 +283,7 @@
271283
"value": false
272284
},
273285
{
274-
"name": "existing_en_crn",
286+
"name": "existing_event_notifications_crn",
275287
"value": "ref:../../members/3 - Event Notifications/outputs/crn"
276288
},
277289
{
@@ -294,7 +306,7 @@
294306
}
295307
],
296308
"name": "4a - Security and Compliance Center",
297-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.0e4e8fc9-8953-4456-a51c-6ed6a3ca1bd7-global"
309+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.03c63154-2430-4154-9033-9f8e6f80d93b-global"
298310
},
299311
{
300312
"inputs": [
@@ -319,7 +331,7 @@
319331
"value": "ref:../../members/1a - Key management/outputs/kms_instance_crn"
320332
},
321333
{
322-
"name": "existing_event_notification_instance_crn",
334+
"name": "existing_event_notifications_instance_crn",
323335
"value": "ref:../../members/3 - Event Notifications/outputs/crn"
324336
},
325337
{
@@ -331,16 +343,32 @@
331343
"value": "ref:../../inputs/sm_service_plan"
332344
},
333345
{
334-
"name": "iam_engine_enabled",
335-
"value": "ref:../../inputs/secret_manager_iam_engine_enabled"
346+
"name": "enable_event_notifications",
347+
"value": true
336348
},
337349
{
338-
"name": "enable_event_notification",
339-
"value": true
350+
"name": "kms_key_ring_name",
351+
"value": "sm-cos-key-ring"
352+
},
353+
{
354+
"name": "kms_key_name",
355+
"value": "sm-cos-key"
356+
},
357+
{
358+
"name": "secrets_manager_instance_name",
359+
"value": "base-security-services-sm"
360+
},
361+
{
362+
"name": "skip_iam_authorization_policy",
363+
"value": "ref:../../inputs/skip_iam_authorization_policy"
364+
},
365+
{
366+
"name": "iam_engine_enabled",
367+
"value": false
340368
}
341369
],
342370
"name": "4b - Secrets Manager",
343-
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global"
371+
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.db823650-3010-4482-b807-45145f273553-global"
344372
}
345373
],
346374
"outputs": [

‎tests/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.24.1
77
require (
88
github.com/gruntwork-io/terratest v0.48.2
99
github.com/stretchr/testify v1.10.0
10-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.46.6
10+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.47.1
1111
)
1212

1313
require (
@@ -16,7 +16,7 @@ require (
1616
github.com/IBM-Cloud/power-go-client v1.11.0 // indirect
1717
github.com/IBM/cloud-databases-go-sdk v0.7.1 // indirect
1818
github.com/IBM/go-sdk-core/v5 v5.19.0 // indirect
19-
github.com/IBM/platform-services-go-sdk v0.78.2 // indirect
19+
github.com/IBM/platform-services-go-sdk v0.79.0 // indirect
2020
github.com/IBM/project-go-sdk v0.3.6 // indirect
2121
github.com/IBM/schematics-go-sdk v0.4.0 // indirect
2222
github.com/IBM/vpc-go-sdk v0.65.0 // indirect
@@ -38,7 +38,7 @@ require (
3838
github.com/go-logr/logr v1.4.2 // indirect
3939
github.com/go-logr/stdr v1.2.2 // indirect
4040
github.com/go-openapi/analysis v0.21.5 // indirect
41-
github.com/go-openapi/errors v0.22.0 // indirect
41+
github.com/go-openapi/errors v0.22.1 // indirect
4242
github.com/go-openapi/jsonpointer v0.20.1 // indirect
4343
github.com/go-openapi/jsonreference v0.20.3 // indirect
4444
github.com/go-openapi/loads v0.21.3 // indirect

‎tests/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ github.com/IBM/cloud-databases-go-sdk v0.7.1 h1:5kK4/3NUsGxZzmuUe+1ftajpOQbeDVh5
88
github.com/IBM/cloud-databases-go-sdk v0.7.1/go.mod h1:JYucI1PdwqbAd8XGdDAchxzxRP7bxOh1zUnseovHKsc=
99
github.com/IBM/go-sdk-core/v5 v5.19.0 h1:YN2S5JUvq/EwYulmcNFwgyYBxZhVWl9nkY22H7Hpghw=
1010
github.com/IBM/go-sdk-core/v5 v5.19.0/go.mod h1:deZO1J5TSlU69bCnl/YV7nPxFZA2UEaup7cq/7ZTOgw=
11-
github.com/IBM/platform-services-go-sdk v0.78.2 h1:iOsPSXGMLYwjfJxYqyoaGXGqOPYHq2WuhAYIU7CsXbc=
12-
github.com/IBM/platform-services-go-sdk v0.78.2/go.mod h1:FzCPOfbNAt0s9RwtIrbJbfDwA7mKIObtZ/18KnviKr0=
11+
github.com/IBM/platform-services-go-sdk v0.79.0 h1:qCNheB3390holPcpDxdgNyi11JS6ZfsL39YgnJEOsTo=
12+
github.com/IBM/platform-services-go-sdk v0.79.0/go.mod h1:FzCPOfbNAt0s9RwtIrbJbfDwA7mKIObtZ/18KnviKr0=
1313
github.com/IBM/project-go-sdk v0.3.6 h1:DRiANKnAePevFsIKSvR89SUaMa2xsd7YKK71Ka1eqKI=
1414
github.com/IBM/project-go-sdk v0.3.6/go.mod h1:FOJM9ihQV3EEAY6YigcWiTNfVCThtdY8bLC/nhQHFvo=
1515
github.com/IBM/schematics-go-sdk v0.4.0 h1:x01f/tPquYJYLQzJLGuxWfCbV/EdSMXRikOceNy/JLM=
@@ -81,8 +81,8 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
8181
github.com/go-openapi/analysis v0.21.5 h1:3tHfEBh6Ia8eKc4M7khOGjPOAlWKJ10d877Cr9teujI=
8282
github.com/go-openapi/analysis v0.21.5/go.mod h1:25YcZosX9Lwz2wBsrFrrsL8bmjjXdlyP6zsr2AMy29M=
8383
github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk=
84-
github.com/go-openapi/errors v0.22.0 h1:c4xY/OLxUBSTiepAg3j/MHuAv5mJhnf53LLMWFB+u/w=
85-
github.com/go-openapi/errors v0.22.0/go.mod h1:J3DmZScxCDufmIMsdOuDHxJbdOGC0xtUynjIx092vXE=
84+
github.com/go-openapi/errors v0.22.1 h1:kslMRRnK7NCb/CvR1q1VWuEQCEIsBGn5GgKD9e+HYhU=
85+
github.com/go-openapi/errors v0.22.1/go.mod h1:+n/5UdIqdVnLIJ6Q9Se8HNGUXYaY6CN8ImWzfi/Gzp0=
8686
github.com/go-openapi/jsonpointer v0.20.1 h1:MkK4VEIEZMj4wT9PmjaUmGflVBr9nvud4Q4UVFbDoBE=
8787
github.com/go-openapi/jsonpointer v0.20.1/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs=
8888
github.com/go-openapi/jsonreference v0.20.3 h1:EjGcjTW8pD1mRis6+w/gmoBdqv5+RbE9B85D1NgDOVQ=
@@ -279,8 +279,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
279279
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
280280
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
281281
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
282-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.46.6 h1:GQR+O4fWAfCBJpUS6j5NtYCKX8xYUbSfX2ZHjvMA60s=
283-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.46.6/go.mod h1:/sx8pAvkMdCng32CHwsQULs9VplmtVvIwqHNc6EDey4=
282+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.47.1 h1:tNFE95ARyd8tTjP0zSmIJIFKBf7Kdl8Cuwp5NZ1xqUo=
283+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.47.1/go.mod h1:be/us5lpuIvNmni1CXR0nJcAiFJkvluQDM0iFe960s8=
284284
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
285285
github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=
286286
github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=

0 commit comments

Comments
 (0)