Skip to content

Commit 71ea249

Browse files
whofflerwhoffler
committed
address ful-con feedback, add sec-enf wrapper
1 parent 5f78ba6 commit 71ea249

File tree

12 files changed

+190
-864
lines changed

12 files changed

+190
-864
lines changed

‎ibm_catalog.json‎

Lines changed: 12 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"solution"
2222
],
2323
"short_description": "Creates and configures an IBM Cloud Event Notifications instance.",
24-
"long_description": "This architecture supports creating and configuring an IBM Cloud Event Notifications instance.",
24+
"long_description": "This deployable architecture is used to provision and configure an [IBM Cloud Secrets Manager](https://www.ibm.com/products/event-notifications) instance.\n\n\n💡 This Terraform-based automation is part of a broader suite of IBM-maintained Infrastructure as Code (IaC) asset collection, each following the naming pattern \"Cloud automation for *servicename*\" and focusing on single IBM Cloud service. These single-service deployable architectures can be used on their own to streamline and automate service deployments through an [IaC approach](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-understanding-projects), or assembled together into a broader [automated IaC stack](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-config-stack) to automate the deployment of an end-to-end solution architecture.",
2525
"offering_docs_url": "https://github.com/terraform-ibm-modules/terraform-ibm-event-notifications/blob/main/solutions/standard/README.md",
2626
"offering_icon_url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-event-notifications/main/images/en_icon.svg",
2727
"provider_name": "IBM",
@@ -65,10 +65,7 @@
6565
"description": "Prefix to add to all resources created by this solution. To not use any prefix value, you can enter the string `__NULL__`."
6666
},
6767
{
68-
"key": "use_existing_resource_group"
69-
},
70-
{
71-
"key": "resource_group_name"
68+
"key": "existing_resource_group_name"
7269
},
7370
{
7471
"key": "region",
@@ -97,7 +94,7 @@
9794
]
9895
},
9996
{
100-
"key": "event_notification_name"
97+
"key": "event_notifications_name"
10198
},
10299
{
103100
"key": "service_plan",
@@ -113,23 +110,10 @@
113110
]
114111
},
115112
{
116-
"key": "service_endpoints",
117-
"options": [
118-
{
119-
"displayname": "public",
120-
"value": "public"
121-
},
122-
{
123-
"displayname": "public-and-private",
124-
"value": "public-and-private"
125-
}
126-
]
127-
},
128-
{
129-
"key": "tags"
113+
"key": "event_notifications_resource_tags"
130114
},
131115
{
132-
"key": "access_tags"
116+
"key": "event_notifications_access_tags"
133117
},
134118
{
135119
"key": "existing_kms_instance_crn",
@@ -140,45 +124,13 @@
140124
"required": true
141125
},
142126
{
143-
"key": "provider_visibility",
144-
"options": [
145-
{
146-
"displayname": "private",
147-
"value": "private"
148-
},
149-
{
150-
"displayname": "public",
151-
"value": "public"
152-
},
153-
{
154-
"displayname": "public-and-private",
155-
"value": "public-and-private"
156-
}
157-
]
158-
},
159-
{
160-
"displayname": "Existing Key Management Service root key CRN",
161127
"key": "existing_kms_root_key_crn"
162128
},
163129
{
164-
"displayname": "Key Management Service endpoint type",
165-
"key": "kms_endpoint_type",
166-
"options": [
167-
{
168-
"displayname": "public",
169-
"value": "public"
170-
},
171-
{
172-
"displayname": "private",
173-
"value": "private"
174-
}
175-
]
176-
},
177-
{
178-
"key": "en_key_ring_name"
130+
"key": "event_notifications_key_ring_name"
179131
},
180132
{
181-
"key": "en_key_name"
133+
"key": "event_notifications_key_name"
182134
},
183135
{
184136
"displayname": "Cloud Object Storage key ring name",
@@ -190,7 +142,7 @@
190142
},
191143
{
192144
"displayname": "Skip Event Notification Key Management Service auth policy",
193-
"key": "skip_en_kms_auth_policy"
145+
"key": "skip_event_notifications_kms_auth_policy"
194146
},
195147
{
196148
"displayname": "IBM Cloud Key Management Service apikey",
@@ -206,116 +158,41 @@
206158
},
207159
{
208160
"displayname": "Skip Event Notifications Cloud Object Storage auth policy",
209-
"key": "skip_en_cos_auth_policy"
161+
"key": "skip_event_notifications_cos_auth_policy"
210162
},
211163
{
212164
"displayname": "Skip Cloud Object Storage Key Management Service auth policy",
213165
"key": "skip_cos_kms_auth_policy"
214166
},
215167
{
216-
"displayname": "Cloud Object Storage instance name",
217-
"key": "cos_instance_name"
218-
},
219-
{
220-
"displayname": "Cloud Object Storage instance tags",
221-
"key": "cos_instance_tags"
222-
},
223-
{
224-
"displayname": "Cloud Object Storage instance access tags",
225-
"key": "cos_instance_access_tags"
168+
"key": "cos_bucket_access_tags"
226169
},
227170
{
228171
"key": "add_bucket_name_suffix"
229172
},
230-
{
231-
"displayname": "Cloud Object Storage plan",
232-
"key": "cos_plan",
233-
"options": [
234-
{
235-
"displayname": "Standard",
236-
"value": "standard"
237-
},
238-
{
239-
"displayname": "Lite",
240-
"value": "lite"
241-
},
242-
{
243-
"displayname": "One Rate",
244-
"value": "cos-one-rate-plan"
245-
}
246-
]
247-
},
248-
{
249-
"key": "cross_region_location"
250-
},
251173
{
252174
"displayname": "Cloud Object Storage bucket region",
253175
"key": "cos_bucket_region"
254176
},
255-
{
256-
"key": "archive_days"
257-
},
258-
{
259-
"key": "retention_enabled"
260-
},
261-
{
262-
"key": "management_endpoint_type_for_bucket",
263-
"options": [
264-
{
265-
"displayname": "private",
266-
"value": "private"
267-
},
268-
{
269-
"displayname": "public",
270-
"value": "public"
271-
},
272-
{
273-
"displayname": "direct",
274-
"value": "direct"
275-
}
276-
]
277-
},
278177
{
279178
"key": "existing_secrets_manager_instance_crn"
280179
},
281-
{
282-
"key": "existing_secrets_manager_endpoint_type",
283-
"options": [
284-
{
285-
"displayname": "private",
286-
"value": "private"
287-
},
288-
{
289-
"displayname": "public",
290-
"value": "public"
291-
}
292-
]
293-
},
294180
{
295181
"displayname": "Skip Event Notification Secrets Manager auth policy",
296-
"key": "skip_en_sm_auth_policy"
182+
"key": "skip_event_notifications_secrets_manager_auth_policy"
297183
},
298184
{
299185
"key": "service_credential_secrets"
300186
},
301187
{
302188
"key": "service_credential_names"
303189
},
304-
{
305-
"key": "existing_monitoring_crn"
306-
},
307190
{
308191
"displayname": "Existing Event Notifications instance CRN",
309-
"key": "existing_en_instance_crn"
192+
"key": "existing_event_notifications_instance_crn"
310193
},
311194
{
312195
"key":"cbr_rules"
313-
},
314-
{
315-
"key":"archive_filter_prefix"
316-
},
317-
{
318-
"key":"expire_filter_prefix"
319196
}
320197
],
321198
"iam_permissions": [
@@ -466,9 +343,6 @@
466343
{
467344
"key": "existing_kms_root_key_crn"
468345
},
469-
{
470-
"key": "existing_kms_key_name"
471-
},
472346
{
473347
"key": "kms_endpoint_type",
474348
"options": [
@@ -523,9 +397,6 @@
523397
{
524398
"key": "existing_cos_instance_crn"
525399
},
526-
{
527-
"key": "existing_cos_endpoint"
528-
},
529400
{
530401
"key": "cos_bucket_name"
531402
},
@@ -547,10 +418,6 @@
547418
{
548419
"key": "skip_cos_kms_auth_policy"
549420
},
550-
551-
{
552-
"key": "cross_region_location"
553-
},
554421
{
555422
"key": "cos_bucket_region"
556423
},

0 commit comments

Comments
 (0)