Skip to content

Commit bc8a701

Browse files
whofflerwhoffler
committed
align with redis
1 parent 19a4b75 commit bc8a701

File tree

9 files changed

+164
-183
lines changed

9 files changed

+164
-183
lines changed

‎ibm_catalog.json‎

Lines changed: 105 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"target_terraform",
1010
"terraform",
1111
"data_management",
12+
"database",
1213
"solution"
1314
],
1415
"keywords": [
@@ -92,20 +93,8 @@
9293
"architecture": {
9394
"features": [
9495
{
95-
"title": "KMS encryption",
96-
"description": "Provides [KMS encryption](https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-key-protect&interface=ui) for the data that you store in the database, enhancing data security."
97-
},
98-
{
99-
"title": "Autoscaling",
100-
"description": "Provides the [autoscaling](https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-autoscaling&interface=ui) to allow the database to increase resources in response to usage."
101-
},
102-
{
103-
"title": "Access tags",
104-
"description": "Attaches access tags to the Elasticsearch instance."
105-
},
106-
{
107-
"title": "Backup restoration",
108-
"description": "Provides [database restoration](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-dashboard-backups&interface=ui) using a backup created by a deployment with the same service ID."
96+
"title": " ",
97+
"description": "Configured to use IBM secure by default standards, but can be edited to fit your use case."
10998
}
11099
],
111100
"diagrams": [
@@ -211,38 +200,6 @@
211200
}
212201
]
213202
},
214-
{
215-
"key": "elasticsearch_name"
216-
},
217-
{
218-
"key": "existing_elasticsearch_instance_crn"
219-
},
220-
{
221-
"key": "plan",
222-
"options": [
223-
{
224-
"displayname": "enterprise",
225-
"value": "enterprise"
226-
},
227-
{
228-
"displayname": "platinum",
229-
"value": "platinum"
230-
}
231-
]
232-
},
233-
{
234-
"key": "service_endpoints",
235-
"options": [
236-
{
237-
"displayname": "private",
238-
"value": "private"
239-
},
240-
{
241-
"displayname": "public",
242-
"value": "public"
243-
}
244-
]
245-
},
246203
{
247204
"key": "elasticsearch_version",
248205
"required": false,
@@ -266,6 +223,22 @@
266223
}
267224
]
268225
},
226+
{
227+
"key": "name"
228+
},
229+
{
230+
"key": "plan",
231+
"options": [
232+
{
233+
"displayname": "enterprise",
234+
"value": "enterprise"
235+
},
236+
{
237+
"displayname": "platinum",
238+
"value": "platinum"
239+
}
240+
]
241+
},
269242
{
270243
"key": "elasticsearch_resource_tags",
271244
"type": "array",
@@ -288,9 +261,6 @@
288261
}
289262
}
290263
},
291-
{
292-
"key": "auto_scaling"
293-
},
294264
{
295265
"key": "members"
296266
},
@@ -307,10 +277,26 @@
307277
"key": "member_host_flavor"
308278
},
309279
{
310-
"key": "admin_pass"
280+
"key": "auto_scaling"
311281
},
312282
{
313-
"key": "users",
283+
"key": "service_endpoints",
284+
"options": [
285+
{
286+
"displayname": "private",
287+
"value": "private"
288+
},
289+
{
290+
"displayname": "public",
291+
"value": "public"
292+
}
293+
]
294+
},
295+
{
296+
"key": "service_credential_names"
297+
},
298+
{
299+
"key": "service_credential_secrets",
314300
"type": "array",
315301
"custom_config": {
316302
"type": "textarea",
@@ -319,13 +305,14 @@
319305
}
320306
},
321307
{
322-
"key": "service_credential_names"
308+
"key": "admin_pass"
323309
},
324310
{
325311
"key": "existing_secrets_manager_instance_crn"
326312
},
327313
{
328314
"key": "existing_secrets_manager_endpoint_type",
315+
"hidden": true,
329316
"options": [
330317
{
331318
"displayname": "public",
@@ -338,7 +325,19 @@
338325
]
339326
},
340327
{
341-
"key": "service_credential_secrets",
328+
"key": "skip_elasticsearch_to_secrets_manager_auth_policy"
329+
},
330+
{
331+
"key": "admin_pass_secrets_manager_secret_group"
332+
},
333+
{
334+
"key": "admin_pass_secrets_manager_secret_name"
335+
},
336+
{
337+
"key": "use_existing_admin_pass_secrets_manager_secret_group"
338+
},
339+
{
340+
"key": "users",
342341
"type": "array",
343342
"custom_config": {
344343
"type": "textarea",
@@ -347,22 +346,20 @@
347346
}
348347
},
349348
{
350-
"key": "use_existing_admin_pass_secrets_manager_secret_group"
351-
},
352-
{
353-
"key": "admin_pass_secrets_manager_secret_name"
349+
"key": "ibmcloud_kms_api_key"
354350
},
355351
{
356-
"key": "admin_pass_secrets_manager_secret_group"
352+
"key": "kms_encryption_enabled"
357353
},
358354
{
359-
"key": "skip_elasticsearch_to_secrets_manager_auth_policy"
355+
"key": "existing_kms_instance_crn"
360356
},
361357
{
362-
"key": "ibmcloud_kms_api_key"
358+
"key": "existing_kms_key_crn"
363359
},
364360
{
365361
"key": "kms_endpoint_type",
362+
"hidden": true,
366363
"options": [
367364
{
368365
"displayname": "public",
@@ -375,31 +372,25 @@
375372
]
376373
},
377374
{
378-
"key": "kms_encryption_enabled"
375+
"key": "key_ring_name"
379376
},
380377
{
381-
"key": "existing_kms_instance_crn"
378+
"key": "key_name"
382379
},
383380
{
384-
"key": "existing_kms_key_crn"
381+
"key": "elasticsearch_backup_crn"
385382
},
386383
{
387384
"key": "existing_backup_kms_key_crn"
388385
},
389386
{
390387
"key": "use_default_backup_encryption_key"
391388
},
392-
{
393-
"key": "key_ring_name"
394-
},
395-
{
396-
"key": "key_name"
397-
},
398389
{
399390
"key": "skip_elasticsearch_kms_auth_policy"
400391
},
401392
{
402-
"key": "elasticsearch_backup_crn"
393+
"key": "existing_elasticsearch_instance_crn"
403394
},
404395
{
405396
"key": "enable_elser_model"
@@ -484,15 +475,28 @@
484475
"role_crns": [
485476
"crn:v1:bluemix:public:iam::::role:Editor"
486477
],
487-
"service_name": "databases-for-elasticsearch"
478+
"service_name": "databases-for-redis"
479+
},
480+
{
481+
"role_crns": [
482+
"crn:v1:bluemix:public:iam::::role:Editor"
483+
],
484+
"service_name": "kms",
485+
"notes": "[Optional] Editor access is required to create keys. It is required only if KMS encryption is enabled."
486+
},
487+
{
488+
"role_crns": [
489+
"crn:v1:bluemix:public:iam::::role:Editor"
490+
],
491+
"service_name": "hs-crypto",
492+
"notes": "[Optional] Editor access is required to create keys in HPCS. It is required only if KMS encryption is enabled."
488493
}
489494
],
490495
"architecture": {
491-
"descriptions": "This architecture creates an instance of IBM Cloud Databases for Elasticsearch instance with KMS encryption. Supports autoscaling.",
492496
"features": [
493497
{
494-
"title": " Creates an instance of Databases for Elasticsearch",
495-
"description": "This architecture creates an instance of IBM Cloud Databases for Elasticsearch with KMS encryption. It accepts or creates a resource group, and provides autoscaling rules."
498+
"title": " ",
499+
"description": "Configured to use IBM secure by default standards that can't be changed."
496500
}
497501
],
498502
"diagrams": [
@@ -581,13 +585,7 @@
581585
}
582586
]
583587
},
584-
{
585-
"key": "elasticsearch_name"
586-
},
587-
{
588-
"key": "existing_elasticsearch_instance_crn"
589-
},
590-
{
588+
{
591589
"key": "plan",
592590
"options": [
593591
{
@@ -623,6 +621,9 @@
623621
}
624622
]
625623
},
624+
{
625+
"key": "name"
626+
},
626627
{
627628
"key": "elasticsearch_resource_tags",
628629
"type": "array",
@@ -645,9 +646,6 @@
645646
}
646647
}
647648
},
648-
{
649-
"key": "auto_scaling"
650-
},
651649
{
652650
"key": "members"
653651
},
@@ -664,10 +662,13 @@
664662
"key": "member_host_flavor"
665663
},
666664
{
667-
"key": "admin_pass"
665+
"key": "auto_scaling"
668666
},
669667
{
670-
"key": "users",
668+
"key": "service_credential_names"
669+
},
670+
{
671+
"key": "service_credential_secrets",
671672
"type": "array",
672673
"custom_config": {
673674
"type": "textarea",
@@ -676,31 +677,31 @@
676677
}
677678
},
678679
{
679-
"key": "service_credential_names"
680+
"key": "admin_pass"
680681
},
681682
{
682683
"key": "existing_secrets_manager_instance_crn"
683684
},
684685
{
685-
"key": "service_credential_secrets",
686-
"type": "array",
687-
"custom_config": {
688-
"type": "textarea",
689-
"grouping": "deployment",
690-
"original_grouping": "deployment"
691-
}
686+
"key": "skip_elasticsearch_to_secrets_manager_auth_policy"
692687
},
693688
{
694-
"key": "use_existing_admin_pass_secrets_manager_secret_group"
689+
"key": "admin_pass_secrets_manager_secret_group"
695690
},
696691
{
697692
"key": "admin_pass_secrets_manager_secret_name"
698693
},
699694
{
700-
"key": "admin_pass_secrets_manager_secret_group"
695+
"key": "use_existing_admin_pass_secrets_manager_secret_group"
701696
},
702697
{
703-
"key": "skip_elasticsearch_to_secrets_manager_auth_policy"
698+
"key": "users",
699+
"type": "array",
700+
"custom_config": {
701+
"type": "textarea",
702+
"grouping": "deployment",
703+
"original_grouping": "deployment"
704+
}
704705
},
705706
{
706707
"key": "ibmcloud_kms_api_key"
@@ -711,20 +712,23 @@
711712
{
712713
"key": "existing_kms_key_crn"
713714
},
714-
{
715-
"key": "existing_backup_kms_key_crn"
716-
},
717715
{
718716
"key": "key_ring_name"
719717
},
720718
{
721719
"key": "key_name"
722720
},
721+
{
722+
"key": "elasticsearch_backup_crn"
723+
},
724+
{
725+
"key": "existing_backup_kms_key_crn"
726+
},
723727
{
724728
"key": "skip_elasticsearch_kms_auth_policy"
725729
},
726730
{
727-
"key": "elasticsearch_backup_crn"
731+
"key": "existing_elasticsearch_instance_crn"
728732
},
729733
{
730734
"key": "enable_elser_model"

‎solutions/fully-configurable/catalogValidationValues.json.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"ibmcloud_api_key": $VALIDATION_APIKEY,
33
"region": "us-south",
44
"elasticsearch_resource_tags": $TAGS,
5-
"elasticsearch_name": $PREFIX,
5+
"name": $PREFIX,
66
"existing_resource_group_name": "geretain-test-permanent",
77
"kms_encryption_enabled": true,
88
"existing_kms_instance_crn": $HPCS_US_SOUTH_CRN

0 commit comments

Comments
 (0)