Skip to content

Commit bc5b998

Browse files
iamar7iamar7
authored
variable cleanup (#57)
1 parent e7425d8 commit bc5b998

File tree

2 files changed

+56
-72
lines changed

2 files changed

+56
-72
lines changed

‎ibm_catalog.json‎

Lines changed: 27 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@
117117
"title": "Creates an IBM Security and Compliance Center instance",
118118
"description": "Creates and configures an IBM Security Compliance Center instance."
119119
},
120-
{
121-
"title": "Creates an Security and Compliance Center Workload Protection instance",
122-
"description": "Creates and configures an Security and Compliance Center Workload Protection instance."
123-
},
120+
{
121+
"title": "Creates an Security and Compliance Center Workload Protection instance",
122+
"description": "Creates and configures an Security and Compliance Center Workload Protection instance."
123+
},
124124
{
125125
"title": "Creates an IBM Event Notification instance",
126126
"description": "Creates and configures an Event Notifications instance."
@@ -143,7 +143,7 @@
143143
"key": "prefix",
144144
"type": "string",
145145
"default_value": "",
146-
"description": "An identifier prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number.",
146+
"description": "The prefix to add to all resources created by this solution. Used to make sure that names are unique when you deploy the solution more than one time.",
147147
"required": true
148148
},
149149
{
@@ -183,11 +183,32 @@
183183
}
184184
}
185185
},
186+
{
187+
"key": "enable_platform_logs_metrics",
188+
"type": "boolean",
189+
"default_value": true,
190+
"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.",
191+
"required": false
192+
},
193+
{
194+
"key": "en_email_list",
195+
"type": "array",
196+
"default_value": [],
197+
"description": "List of emails to configure event notifications.",
198+
"required": false
199+
},
200+
{
201+
"key": "existing_secrets_manager_crn",
202+
"type": "string",
203+
"default_value": "__NULL__",
204+
"description": "The CRN of an existing Secrets Manager instance to use in this solution. If not set, a new Secrets Manager instance is provisioned.",
205+
"required": false
206+
},
186207
{
187208
"key": "sm_service_plan",
188209
"type": "string",
189210
"default_value": "standard",
190-
"description": "The pricing plan to use for Secrets Manager.",
211+
"description": "The pricing plan to use for Secrets Manager. Not used if `existing_secrets_manager_crn` is specified.",
191212
"required": false,
192213
"options": [
193214
{
@@ -216,34 +237,6 @@
216237
"value": "security-compliance-center-trial-plan"
217238
}
218239
]
219-
},
220-
{
221-
"key": "existing_secrets_manager_crn",
222-
"type": "string",
223-
"default_value": "__NULL__",
224-
"description": "The CRN of an existing Secrets Manager instance to use in this solution. If not set, a new Secrets Manager instance is provisioned.",
225-
"required": false
226-
},
227-
{
228-
"key": "existing_kms_instance_crn",
229-
"type": "string",
230-
"default_value": "__NULL__",
231-
"description": "The CRN of an existing KMS instance to use in this solution. If not set, a new Key Protect instance is provisioned.",
232-
"required": false
233-
},
234-
{
235-
"key": "enable_platform_logs_metrics",
236-
"type": "boolean",
237-
"default_value": true,
238-
"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.",
239-
"required": false
240-
},
241-
{
242-
"key": "en_email_list",
243-
"type": "array",
244-
"default_value": [],
245-
"description": "List of emails to configure event notifications.",
246-
"required": false
247240
}
248241
],
249242
"outputs": [

‎stack_definition.json‎

Lines changed: 29 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"type": "string",
77
"hidden": false,
88
"default": "core-security",
9-
"description": "The prefix to use for all resources deployed.",
109
"custom_config": {}
1110
},
1211
{
@@ -15,7 +14,6 @@
1514
"type": "string",
1615
"hidden": false,
1716
"default": "us-south",
18-
"description": "The region to deploy the Deployable Architecture",
1917
"custom_config": {}
2018
},
2119
{
@@ -27,19 +25,19 @@
2725
"custom_config": {}
2826
},
2927
{
30-
"name": "sm_service_plan",
28+
"name": "enable_platform_logs_metrics",
3129
"required": false,
32-
"type": "string",
30+
"type": "boolean",
3331
"hidden": false,
34-
"default": "standard",
32+
"default": true,
3533
"custom_config": {}
3634
},
3735
{
38-
"name": "scc_service_plan",
36+
"name": "en_email_list",
3937
"required": false,
40-
"type": "string",
38+
"type": "array",
4139
"hidden": false,
42-
"default": "security-compliance-center-standard-plan",
40+
"default": [],
4341
"custom_config": {}
4442
},
4543
{
@@ -51,26 +49,19 @@
5149
"custom_config": {}
5250
},
5351
{
54-
"name": "existing_kms_instance_crn",
52+
"name": "sm_service_plan",
5553
"required": false,
5654
"type": "string",
5755
"hidden": false,
58-
"default": "__NULL__"
59-
},
60-
{
61-
"name": "enable_platform_logs_metrics",
62-
"required": false,
63-
"type": "boolean",
64-
"hidden": false,
65-
"default": true,
56+
"default": "standard",
6657
"custom_config": {}
6758
},
6859
{
69-
"name": "en_email_list",
60+
"name": "scc_service_plan",
7061
"required": false,
71-
"type": "array",
62+
"type": "string",
7263
"hidden": false,
73-
"default": [],
64+
"default": "security-compliance-center-standard-plan",
7465
"custom_config": {}
7566
}
7667
],
@@ -134,20 +125,20 @@
134125
"value": "ref:../../inputs/region"
135126
},
136127
{
137-
"name": "existing_kms_instance_crn",
138-
"value": "ref:../../members/1a - Key management/outputs/kms_instance_crn"
128+
"name": "prefix",
129+
"value": "ref:../../inputs/prefix"
139130
},
140131
{
141-
"name": "existing_cos_instance_crn",
142-
"value": "ref:../../members/1b - Object storage/outputs/cos_instance_id"
132+
"name": "existing_kms_instance_crn",
133+
"value": "ref:../../members/1a - Key management/outputs/kms_instance_crn"
143134
},
144135
{
145136
"name": "kms_endpoint_type",
146137
"value": "private"
147138
},
148139
{
149-
"name": "prefix",
150-
"value": "ref:../../inputs/prefix"
140+
"name": "existing_cos_instance_crn",
141+
"value": "ref:../../members/1b - Object storage/outputs/cos_instance_id"
151142
},
152143
{
153144
"name": "enable_platform_logs",
@@ -229,6 +220,10 @@
229220
"name": "existing_kms_instance_crn",
230221
"value": "ref:../../members/1a - Key management/outputs/kms_instance_crn"
231222
},
223+
{
224+
"name": "kms_endpoint_type",
225+
"value": "private"
226+
},
232227
{
233228
"name": "existing_monitoring_crn",
234229
"value": "ref:../../members/2 - Observability/outputs/cloud_monitoring_crn"
@@ -237,18 +232,14 @@
237232
"name": "existing_cos_instance_crn",
238233
"value": "ref:../../members/1b - Object storage/outputs/cos_instance_id"
239234
},
240-
{
241-
"name": "existing_en_crn",
242-
"value": "ref:../../members/3 - Event Notifications/outputs/crn"
243-
},
244-
{
245-
"name": "kms_endpoint_type",
246-
"value": "private"
247-
},
248235
{
249236
"name": "skip_cos_kms_auth_policy",
250237
"value": true
251238
},
239+
{
240+
"name": "existing_en_crn",
241+
"value": "ref:../../members/3 - Event Notifications/outputs/crn"
242+
},
252243
{
253244
"name": "scc_service_plan",
254245
"value": "ref:../../inputs/scc_service_plan"
@@ -313,10 +304,6 @@
313304
"name": "secrets_manager_crn",
314305
"value": "ref:../../members/4b - Secrets Manager/outputs/secrets_manager_crn"
315306
},
316-
{
317-
"name": "scc_crn",
318-
"value": "ref:../../members/4a - Security and Compliance Center/outputs/scc_crn"
319-
},
320307
{
321308
"name": "monitoring_crn",
322309
"value": "ref:../../members/2 - Observability/outputs/cloud_monitoring_crn"
@@ -333,6 +320,10 @@
333320
"name": "log_analysis_crn",
334321
"value": "ref:../../members/2 - Observability/outputs/log_analysis_crn"
335322
},
323+
{
324+
"name": "scc_crn",
325+
"value": "ref:../../members/4a - Security and Compliance Center/outputs/scc_crn"
326+
},
336327
{
337328
"name": "scc_workload_protection_crn",
338329
"value": "ref:../../members/4a - Security and Compliance Center/outputs/crn"

0 commit comments

Comments
 (0)