Skip to content
This repository was archived by the owner on Mar 19, 2025. It is now read-only.

Commit c828039

Browse files
vkuma17vkuma17
authored
feat: The following DA variables have been renamed:<br>- cbr_rules -> scc_instance_cbr_rules<br>scc_en_email_list -> scc_event_notifications_email_list<br>- scc_en_reply_to_email -> scc_event_notifications_reply_to_email<br>- scc_en_from_email -> scc_event_notifications_from_email<br>- skip_scc_workload_protection_auth_policy -> skip_scc_workload_protection_iam_auth_policy<br>- en_source_description -> event_notifications_source_description<br>- en_source_name -> event_notifications_source_name<br>- existing_en_crn -> existing_event_notifications_crn<br>- skip_scc_cos_auth_policy -> skip_scc_cos_iam_auth_policy<br>- skip_cos_kms_auth_policy -> skip_cos_kms_iam_auth_policy<br>- cos_region -> scc_cos_bucket_region<br><br>Upgrade note: The default value of scc_cos_bucket_region (previously cos_region) has been updated to null, which means it will default to the same region that the SCC instance is in. If upgrading from a previous version, you may want to set the value back to its original value (or whatever value you were using) to avoid resources being destroyed and recreated. (#250)
1 parent 3b2e137 commit c828039

File tree

7 files changed

+242
-152
lines changed

7 files changed

+242
-152
lines changed

‎ibm_catalog.json‎

Lines changed: 179 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,45 @@
6060
{
6161
"key": "ibmcloud_api_key"
6262
},
63+
{
64+
"key": "prefix",
65+
"required": true,
66+
"description": "Prefix to add to all resources that this solution creates. To not use any prefix value, you can enter the string `__NULL__`."
67+
},
68+
{
69+
"key": "use_existing_resource_group",
70+
"required": true
71+
},
72+
{
73+
"key": "resource_group_name",
74+
"required": true
75+
},
76+
{
77+
"key": "scc_region",
78+
"required": true,
79+
"options": [
80+
{
81+
"displayname": "Dallas (us-south)",
82+
"value": "us-south"
83+
},
84+
{
85+
"displayname": "Frankfurt (eu-de)",
86+
"value": "eu-de"
87+
},
88+
{
89+
"displayname": "Madrid (eu-es)",
90+
"value": "eu-es"
91+
},
92+
{
93+
"displayname": "Toronto (ca-tor)",
94+
"value": "ca-tor"
95+
}
96+
]
97+
},
98+
{
99+
"key": "existing_kms_instance_crn",
100+
"required": true
101+
},
63102
{
64103
"key": "provider_visibility",
65104
"options": [
@@ -78,78 +117,121 @@
78117
]
79118
},
80119
{
81-
"key": "use_existing_resource_group"
82-
},
83-
{
84-
"key": "resource_group_name"
85-
},
86-
{
87-
"key": "prefix",
88-
"required": true,
89-
"description": "The prefix to add to all resources that this solution creates. To not use any prefix value, you can enter the string `__NULL__`."
90-
},
91-
{
92-
"key": "existing_monitoring_crn"
93-
},
94-
{
95-
"key": "existing_kms_instance_crn",
96-
"required": true
97-
},
98-
{
99-
"key": "existing_scc_instance_crn"
120+
"key": "scc_instance_name"
100121
},
101122
{
102-
"key": "existing_scc_cos_kms_key_crn"
123+
"key": "scc_instance_tags",
124+
"custom_config": {
125+
"grouping": "deployment",
126+
"original_grouping": "deployment",
127+
"config_constraints": {
128+
"type": "string"
129+
}
130+
}
103131
},
104132
{
105-
"key": "kms_endpoint_type",
133+
"key": "scc_service_plan",
106134
"options": [
107135
{
108-
"displayname": "Public",
109-
"value": "public"
136+
"displayname": "Standard",
137+
"value": "security-compliance-center-standard-plan"
110138
},
111139
{
112-
"displayname": "Private",
113-
"value": "private"
140+
"displayname": "Trial",
141+
"value": "security-compliance-center-trial-plan"
114142
}
115143
]
116144
},
117145
{
118-
"key": "scc_cos_key_ring_name"
146+
"key": "existing_scc_instance_crn"
119147
},
120148
{
121-
"key": "scc_cos_key_name"
149+
"key": "cos_instance_name"
122150
},
123151
{
152+
"key": "cos_instance_tags",
124153
"custom_config": {
125-
"config_constraints": {
126-
"generationType": "2"
127-
},
128154
"grouping": "deployment",
129155
"original_grouping": "deployment",
130-
"type": "region"
131-
},
132-
"key": "cos_region",
133-
"required": true,
134-
"type": "string"
135-
},
136-
{
137-
"key": "cos_instance_name"
156+
"config_constraints": {
157+
"type": "string"
158+
}
159+
}
138160
},
139161
{
140-
"key": "cos_instance_tags"
162+
"key": "cos_instance_access_tags",
163+
"custom_config": {
164+
"grouping": "deployment",
165+
"original_grouping": "deployment",
166+
"config_constraints": {
167+
"type": "string"
168+
}
169+
}
141170
},
142171
{
143-
"key": "cos_instance_access_tags"
172+
"key": "scc_cos_bucket_name"
144173
},
145174
{
146-
"key": "scc_cos_bucket_name"
175+
"key": "scc_cos_bucket_region",
176+
"options": [
177+
{
178+
"displayname": "Same region as SCC instance",
179+
"value": "__NULL__"
180+
},
181+
{
182+
"displayname": "Dallas (us-south)",
183+
"value": "us-south"
184+
},
185+
{
186+
"displayname": "Sydney (au-syd)",
187+
"value": "au-syd"
188+
},
189+
{
190+
"displayname": "Sao Paolo (br-sao)",
191+
"value": "br-sao"
192+
},
193+
{
194+
"displayname": "Toronto (ca-tor)",
195+
"value": "ca-tor"
196+
},
197+
{
198+
"displayname": "Frankfurt (eu-de)",
199+
"value": "eu-de"
200+
},
201+
{
202+
"displayname": "London (eu-gb)",
203+
"value": "eu-gb"
204+
},
205+
{
206+
"displayname": "Madrid (eu-es)",
207+
"value": "eu-es"
208+
},
209+
{
210+
"displayname": "Osaka (jp-osa)",
211+
"value": "jp-osa"
212+
},
213+
{
214+
"displayname": "Tokyo (jp-tok)",
215+
"value": "jp-tok"
216+
},
217+
{
218+
"displayname": "Washington DC (us-east)",
219+
"value": "us-east"
220+
}
221+
]
147222
},
148223
{
149224
"key": "add_bucket_name_suffix"
150225
},
151226
{
152-
"key": "scc_cos_bucket_access_tags"
227+
"key": "scc_cos_bucket_access_tags",
228+
"custom_config": {
229+
"grouping": "deployment",
230+
"original_grouping": "deployment",
231+
"config_constraints": {
232+
"type": "string"
233+
}
234+
}
153235
},
154236
{
155237
"key": "scc_cos_bucket_class",
@@ -176,15 +258,9 @@
176258
}
177259
]
178260
},
179-
{
180-
"key": "existing_cos_instance_crn"
181-
},
182261
{
183262
"key": "existing_scc_cos_bucket_name"
184263
},
185-
{
186-
"key": "skip_cos_kms_auth_policy"
187-
},
188264
{
189265
"key": "management_endpoint_type_for_bucket",
190266
"options": [
@@ -203,59 +279,41 @@
203279
]
204280
},
205281
{
206-
"key": "scc_instance_name"
282+
"key": "existing_cos_instance_crn"
207283
},
208284
{
209-
"key": "scc_region",
210-
"options": [
211-
{
212-
"displayname": "Dallas (us-south)",
213-
"value": "us-south"
214-
},
215-
{
216-
"displayname": "Frankfurt (eu-de)",
217-
"value": "eu-de"
218-
},
219-
{
220-
"displayname": "Madrid (eu-es)",
221-
"value": "eu-es"
222-
},
223-
{
224-
"displayname": "Toronto (ca-tor)",
225-
"value": "ca-tor"
226-
}
227-
]
285+
"key": "existing_monitoring_crn"
228286
},
229287
{
230-
"key": "skip_scc_cos_auth_policy"
288+
"key": "skip_scc_cos_iam_auth_policy"
231289
},
232290
{
233-
"key": "scc_service_plan",
291+
"key": "existing_scc_cos_kms_key_crn"
292+
},
293+
{
294+
"key": "ibmcloud_kms_api_key"
295+
},
296+
{
297+
"key": "kms_endpoint_type",
234298
"options": [
235299
{
236-
"displayname": "Standard",
237-
"value": "security-compliance-center-standard-plan"
300+
"displayname": "Public",
301+
"value": "public"
238302
},
239303
{
240-
"displayname": "Trial",
241-
"value": "security-compliance-center-trial-plan"
304+
"displayname": "Private",
305+
"value": "private"
242306
}
243307
]
244308
},
245309
{
246-
"key": "existing_en_crn"
310+
"key": "skip_cos_kms_iam_auth_policy"
247311
},
248312
{
249-
"key": "en_source_name"
250-
},
251-
{
252-
"key": "en_source_description"
253-
},
254-
{
255-
"key": "scc_instance_tags"
313+
"key": "scc_cos_key_ring_name"
256314
},
257315
{
258-
"key": "skip_scc_workload_protection_auth_policy"
316+
"key": "scc_cos_key_name"
259317
},
260318
{
261319
"key": "profile_attachments"
@@ -304,28 +362,58 @@
304362
]
305363
},
306364
{
307-
"key": "scc_workload_protection_instance_tags"
365+
"key": "scc_workload_protection_instance_tags",
366+
"custom_config": {
367+
"grouping": "deployment",
368+
"original_grouping": "deployment",
369+
"config_constraints": {
370+
"type": "string"
371+
}
372+
}
308373
},
309374
{
310-
"key": "scc_workload_protection_resource_key_tags"
375+
"key": "scc_workload_protection_resource_key_tags",
376+
"custom_config": {
377+
"grouping": "deployment",
378+
"original_grouping": "deployment",
379+
"config_constraints": {
380+
"type": "string"
381+
}
382+
}
311383
},
312384
{
313-
"key": "scc_workload_protection_access_tags"
385+
"key": "scc_workload_protection_access_tags",
386+
"custom_config": {
387+
"grouping": "deployment",
388+
"original_grouping": "deployment",
389+
"config_constraints": {
390+
"type": "string"
391+
}
392+
}
314393
},
315394
{
316-
"key": "ibmcloud_kms_api_key"
395+
"key": "skip_scc_workload_protection_iam_auth_policy"
396+
},
397+
{
398+
"key": "existing_event_notifications_crn"
399+
},
400+
{
401+
"key": "event_notifications_source_name"
402+
},
403+
{
404+
"key": "event_notifications_source_description"
317405
},
318406
{
319-
"key": "scc_en_email_list"
407+
"key": "scc_event_notifications_email_list"
320408
},
321409
{
322-
"key": "scc_en_from_email"
410+
"key": "scc_event_notifications_from_email"
323411
},
324412
{
325-
"key": "scc_en_reply_to_email"
413+
"key": "scc_event_notifications_reply_to_email"
326414
},
327415
{
328-
"key": "cbr_rules"
416+
"key": "scc_instance_cbr_rules"
329417
}
330418
],
331419
"iam_permissions": [

0 commit comments

Comments
 (0)