Skip to content

Commit f0d53f1

Browse files
whofflerwhoffler
committed
align with redis
1 parent d1750a4 commit f0d53f1

File tree

14 files changed

+410
-410
lines changed

14 files changed

+410
-410
lines changed

‎.catalog-onboard-pipeline.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,9 @@ offerings:
1212
scc:
1313
instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
1414
region: us-south
15+
- name: security-enforced
16+
mark_ready: true
17+
install_type: fullstack
18+
scc:
19+
instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
20+
region: us-south

‎cra-config.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ CRA_TARGETS:
66
PROFILE_ID: "fe96bd4d-9b37-40f2-b39f-a62760e326a3" # SCC profile ID (currently set to 'IBM Cloud Framework for Financial Services' '1.7.0' profile).
77
CRA_ENVIRONMENT_VARIABLES:
88
TF_VAR_kms_encryption_enabled: true
9-
TF_VAR_use_ibm_owned_encryption_key: false
109
TF_VAR_existing_kms_key_crn: "crn:v1:bluemix:public:hs-crypto:us-south:a/abac0df06b644a9cabc6e44f55b3880e:e6dce284-e80f-46e1-a3c1-830f7adff7a9:key:76170fae-4e0c-48c3-8ebe-326059ebb533"
1110
TF_VAR_prefix: "test-postgres-fc"
1211
TF_VAR_existing_resource_group_name: "geretain-test-postgres"

‎ibm_catalog.json‎

Lines changed: 116 additions & 50 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": [
@@ -30,26 +31,27 @@
3031
"support_details": "This product is in the community registry, as such support is handled through the originated repo. If you experience issues please open an issue in the repository [https://github.com/terraform-ibm-modules/terraform-ibm-icd-postgresql/issues](https://github.com/terraform-ibm-modules/terraform-ibm-icd-postgresql/issues). Please note this product is not supported via the IBM Cloud Support Center.",
3132
"features": [
3233
{
33-
"title": "Creates an instance of Databases for PostgreSQL",
34-
"description": "Creates and configures an IBM Cloud Databases for PostgreSQL instance."
34+
"title": "KMS encryption",
35+
"description": "Provides [KMS encryption](https://cloud.ibm.com/docs/databases-for-postgresql?topic=databases-for-postgresql-key-protect&interface=ui) for the data that you store in the database, enhancing data security."
3536
},
3637
{
37-
"title": "Supports KMS encryption",
38-
"description": "Provides KMS encryption for the data that you store in the database."
38+
"title": "Autoscaling",
39+
"description": "Provides the [autoscaling](https://cloud.ibm.com/docs/databases-for-postgresql?topic=databases-for-postgresql-autoscaling&interface=ui) to allow the database to increase resources in response to usage."
3940
},
4041
{
41-
"title": "Supports autoscaling",
42-
"description": "Provides the autoscaling to allow the database to increase resources in response to usage."
42+
"title": "Access tags",
43+
"description": "Attaches access tags to the PostgreSQL instance."
4344
},
4445
{
45-
"title": "Supports backup restoration",
46-
"description": "Provides database restoration using a backup created by a deployment with the same service ID."
46+
"title": "Backup restoration",
47+
"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."
4748
}
4849
],
4950
"flavors": [
5051
{
5152
"label": "Fully configurable",
5253
"name": "fully-configurable",
54+
"index": 1,
5355
"install_type": "fullstack",
5456
"working_directory": "solutions/fully-configurable",
5557
"compliance": {
@@ -79,14 +81,22 @@
7981
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
8082
"crn:v1:bluemix:public:iam::::role:Editor"
8183
],
82-
"service_name": "kms"
84+
"service_name": "kms",
85+
"notes": "[Optional] Editor access is required to create keys. It is required only if KMS encryption is enabled."
86+
},
87+
{
88+
"role_crns": [
89+
"crn:v1:bluemix:public:iam::::role:Editor"
90+
],
91+
"service_name": "hs-crypto",
92+
"notes": "[Optional] Editor access is required to create keys in HPCS. It is required only if KMS encryption is enabled."
8393
}
8494
],
8595
"architecture": {
8696
"features": [
8797
{
88-
"title": " Creates an instance of Databases for PostgreSQL",
89-
"description": "This architecture creates an instance of IBM Cloud Databases for PostgreSQL with KMS encryption. It accepts or creates a resource group, and provides autoscaling rules."
98+
"title": " ",
99+
"description": "Configured to use IBM secure by default standards, but can be edited to fit your use case."
90100
}
91101
],
92102
"diagrams": [
@@ -106,6 +116,7 @@
106116
},
107117
{
108118
"key": "provider_visibility",
119+
"hidden": true,
109120
"options": [
110121
{
111122
"displayname": "private",
@@ -140,7 +151,6 @@
140151
{
141152
"key": "region",
142153
"required": true,
143-
"default_value": "us-south",
144154
"options": [
145155
{
146156
"displayname": "Chennai (che01)",
@@ -192,9 +202,6 @@
192202
}
193203
]
194204
},
195-
{
196-
"key": "postgresql_name"
197-
},
198205
{
199206
"key": "postgresql_version",
200207
"required": false,
@@ -226,6 +233,31 @@
226233
}
227234
]
228235
},
236+
{
237+
"key": "name"
238+
},
239+
{
240+
"key": "postgresql_resource_tags",
241+
"type": "array",
242+
"custom_config": {
243+
"grouping": "deployment",
244+
"original_grouping": "deployment",
245+
"config_constraints": {
246+
"type": "string"
247+
}
248+
}
249+
},
250+
{
251+
"key": "postgresql_access_tags",
252+
"type": "array",
253+
"custom_config": {
254+
"grouping": "deployment",
255+
"original_grouping": "deployment",
256+
"config_constraints": {
257+
"type": "string"
258+
}
259+
}
260+
},
229261
{
230262
"key": "members"
231263
},
@@ -242,31 +274,48 @@
242274
"key": "member_host_flavor"
243275
},
244276
{
245-
"key": "configuration"
246-
},
247-
{
248-
"key": "service_credential_names"
277+
"key": "auto_scaling"
249278
},
250279
{
251-
"key": "admin_pass"
280+
"key": "configuration"
252281
},
253282
{
254-
"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+
"displayname": "public-and-private",
295+
"value": "public-and-private"
296+
}
297+
]
255298
},
256299
{
257-
"key": "postgresql_resource_tags"
300+
"key": "service_credential_names"
258301
},
259302
{
260-
"key": "postgresql_access_tags"
303+
"key": "admin_pass"
261304
},
262305
{
263-
"key": "kms_encryption_enabled"
306+
"key": "users",
307+
"type": "array",
308+
"custom_config": {
309+
"type": "textarea",
310+
"grouping": "deployment",
311+
"original_grouping": "deployment"
312+
}
264313
},
265314
{
266-
"key": "use_ibm_owned_encryption_key"
315+
"key": "ibmcloud_kms_api_key"
267316
},
268317
{
269-
"key": "ibmcloud_kms_api_key"
318+
"key": "kms_encryption_enabled"
270319
},
271320
{
272321
"key": "existing_kms_instance_crn"
@@ -276,6 +325,7 @@
276325
},
277326
{
278327
"key": "kms_endpoint_type",
328+
"hidden": true,
279329
"options": [
280330
{
281331
"displayname": "public",
@@ -287,18 +337,12 @@
287337
}
288338
]
289339
},
290-
{
291-
"key": "skip_postgresql_kms_auth_policy"
292-
},
293340
{
294341
"key": "key_ring_name"
295342
},
296343
{
297344
"key": "key_name"
298345
},
299-
{
300-
"key": "auto_scaling"
301-
},
302346
{
303347
"key": "backup_crn"
304348
},
@@ -309,19 +353,20 @@
309353
"key": "use_default_backup_encryption_key"
310354
},
311355
{
312-
"key": "remote_leader_crn"
356+
"key": "skip_postgresql_kms_auth_policy"
313357
},
314358
{
315359
"key": "existing_postgresql_instance_crn"
316360
},
317361
{
318-
"key": "service_endpoints"
362+
"key": "remote_leader_crn"
319363
}
320364
]
321365
},
322366
{
323367
"label": "Security enforced",
324368
"name": "security-enforced",
369+
"index": 2,
325370
"install_type": "fullstack",
326371
"working_directory": "solutions/security-enforced",
327372
"compliance": {
@@ -396,7 +441,6 @@
396441
{
397442
"key": "region",
398443
"required": true,
399-
"default_value": "us-south",
400444
"options": [
401445
{
402446
"displayname": "Chennai (che01)",
@@ -448,9 +492,6 @@
448492
}
449493
]
450494
},
451-
{
452-
"key": "postgresql_name"
453-
},
454495
{
455496
"key": "postgresql_version",
456497
"required": false,
@@ -482,6 +523,31 @@
482523
}
483524
]
484525
},
526+
{
527+
"key": "name"
528+
},
529+
{
530+
"key": "postgresql_resource_tags",
531+
"type": "array",
532+
"custom_config": {
533+
"grouping": "deployment",
534+
"original_grouping": "deployment",
535+
"config_constraints": {
536+
"type": "string"
537+
}
538+
}
539+
},
540+
{
541+
"key": "postgresql_access_tags",
542+
"type": "array",
543+
"custom_config": {
544+
"grouping": "deployment",
545+
"original_grouping": "deployment",
546+
"config_constraints": {
547+
"type": "string"
548+
}
549+
}
550+
},
485551
{
486552
"key": "members"
487553
},
@@ -497,6 +563,9 @@
497563
{
498564
"key": "member_host_flavor"
499565
},
566+
{
567+
"key": "auto_scaling"
568+
},
500569
{
501570
"key": "configuration"
502571
},
@@ -506,14 +575,17 @@
506575
{
507576
"key": "admin_pass"
508577
},
509-
{
510-
"key": "users"
511-
},
512-
{
513-
"key": "postgresql_resource_tags"
578+
{
579+
"key": "skip_postgresql_kms_auth_policy"
514580
},
515581
{
516-
"key": "postgresql_access_tags"
582+
"key": "users",
583+
"type": "array",
584+
"custom_config": {
585+
"type": "textarea",
586+
"grouping": "deployment",
587+
"original_grouping": "deployment"
588+
}
517589
},
518590
{
519591
"key": "ibmcloud_kms_api_key"
@@ -524,18 +596,12 @@
524596
{
525597
"key": "existing_kms_key_crn"
526598
},
527-
{
528-
"key": "skip_postgresql_kms_auth_policy"
529-
},
530599
{
531600
"key": "key_ring_name"
532601
},
533602
{
534603
"key": "key_name"
535604
},
536-
{
537-
"key": "auto_scaling"
538-
},
539605
{
540606
"key": "backup_crn"
541607
},

‎solutions/fully-configurable/README.md‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
# IBM Cloud Databases for PostgreSQL (Fully Configurable)
2-
3-
## Prerequisites
4-
- An existing resource group
5-
6-
This architecture creates an instance of IBM Cloud Databases for PostgreSQL and supports provisioning of the following resources:
7-
8-
- A KMS root key, if one is not passed in.
9-
- An IBM Cloud Databases for PostgreSQL instance with KMS encryption.
10-
- Autoscaling rules for the database instance, if provided.
11-
12-
![fscloud-postgresql](../../reference-architecture/deployable-architecture-postgresql.svg)
1+
# Cloud automation for PostgreSQL (Fully configurable)
132

143
:exclamation: **Important:** This solution is not intended to be called by other modules because it contains a provider configuration and is not compatible with the `for_each`, `count`, and `depends_on` arguments. For more information, see [Providers Within Modules](https://developer.hashicorp.com/terraform/language/modules/develop/providers).

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
"ibmcloud_api_key": $VALIDATION_APIKEY,
33
"region": "us-south",
44
"postgresql_resource_tags": $TAGS,
5-
"postgresql_name": $PREFIX,
5+
"name": $PREFIX,
66
"existing_resource_group_name": $PREFIX,
77
"kms_encryption_enabled": true,
8-
"use_ibm_owned_encryption_key": false,
98
"existing_kms_instance_crn": $HPCS_US_SOUTH_CRN
109
}

0 commit comments

Comments
 (0)