Skip to content

Commit c9bd7cd

Browse files
rajatagarwal-ibmrajatagarwal-ibm
committed
en migration
1 parent 27121e7 commit c9bd7cd

File tree

3 files changed

+168
-13
lines changed

3 files changed

+168
-13
lines changed

‎common-dev-assets‎

‎cra-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CRA_TARGETS:
55
CRA_IGNORE_RULES_FILE: "cra-tf-validate-ignore-rules.json" # CRA Ignore file to use. If not provided, it checks the repo root directory for `cra-tf-validate-ignore-rules.json`
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:
8-
TF_VAR_prefix: "test"
8+
TF_VAR_prefix: "test-fc"
99
TF_VAR_existing_resource_group_name: "Default"
1010
TF_VAR_existing_kms_instance_crn: "crn:v1:bluemix:public:hs-crypto:us-south:a/abac0df06b644a9cabc6e44f55b3880e:e6dce284-e80f-46e1-a3c1-830f7adff7a9::"
1111
TF_VAR_kms_endpoint_url: "https://e6dce284-e80f-46e1-a3c1-830f7adff7a9.api.private.us-south.hs-crypto.appdomain.cloud"

‎ibm_catalog.json‎

Lines changed: 166 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929
"features": [
3030
{
3131
"title": "Creates an IBM Cloud Event Notifications instance",
32-
"description": "Creates an IBM Cloud Event Notifications instance."
32+
"description": "For more details on an IBM Cloud Event Notifications instance, [see here](https://cloud.ibm.com/docs/event-notifications?topic=event-notifications-en-about)."
3333
},
3434
{
35-
"title": "Creates Key Rings and Keys",
36-
"description": "Creates Key Rings and Keys in an existing KMS instance used to encrypt data."
35+
"title": "Creates Key Rings and Keys to encrypt data",
36+
"description": "For more details on managing encryption using an existing Key Management Services (Key Protect or HPCS) instance, [see here](https://cloud.ibm.com/docs/event-notifications?topic=event-notifications-en-managing-encryption)."
3737
},
3838
{
3939
"title": "Collect events that fail delivery",
40-
"description": "Connect an existing IBM Cloud Object Storage service instance and bucket to collect events that fail delivery. Alternatively, create instances to connect to an Event Notifications instance."
40+
"description": "Connect an existing IBM Cloud Object Storage (COS) service instance and bucket to collect events that fail delivery. Alternatively, create instances to connect to an Event Notifications instance. For more details on integrating Cloud Object Storage for collecting failed events, [see here](https://cloud.ibm.com/docs/event-notifications?topic=event-notifications-en-destinations-cloud-object-storage)."
4141
}
4242
],
4343
"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 that repository [https://github.com/terraform-ibm-modules/terraform-ibm-event-notifications/issues](https://github.com/terraform-ibm-modules/terraform-ibm-event-notifications/issues). Please note this product is not supported via the IBM Cloud Support Center.",
@@ -66,7 +66,9 @@
6666
},
6767
{
6868
"key": "existing_resource_group_name",
69-
"required": true,
69+
"display_name": "resource_group",
70+
"required": false,
71+
"default_value": "Default",
7072
"custom_config": {
7173
"type": "resource_group",
7274
"grouping": "deployment",
@@ -175,11 +177,11 @@
175177
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
176178
"crn:v1:bluemix:public:iam::::role:Editor"
177179
],
178-
"service_name": "event-notifications"
180+
"service_name": "event-notifications",
181+
"notes": "[Optional] Required if you are creating an Event Notifications Instance."
179182
}
180183
],
181184
"architecture": {
182-
"descriptions": "This architecture supports creating and configuring an IBM Cloud Event Notifications instance.",
183185
"features": [
184186
{
185187
"title": "Creates an Event Notifications instance",
@@ -230,7 +232,9 @@
230232
},
231233
{
232234
"key": "existing_resource_group_name",
233-
"required": true,
235+
"display_name": "resource_group",
236+
"required": false,
237+
"default_value": "Default",
234238
"custom_config": {
235239
"type": "resource_group",
236240
"grouping": "deployment",
@@ -309,6 +313,7 @@
309313
},
310314
{
311315
"key": "kms_endpoint_type",
316+
"hidden": true,
312317
"options": [
313318
{
314319
"value": "public"
@@ -422,11 +427,66 @@
422427
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
423428
"crn:v1:bluemix:public:iam::::role:Editor"
424429
],
425-
"service_name": "event-notifications"
430+
"service_name": "event-notifications",
431+
"notes": "[Optional] Required if you are creating an Event Notifications Instance."
432+
},
433+
{
434+
"service_name": "atracker",
435+
"role_crns": [
436+
"crn:v1:bluemix:public:iam::::serviceRole:Writer",
437+
"crn:v1:bluemix:public:iam::::role:Editor"
438+
],
439+
"notes": "[Optional] Required if you are consuming Observability DA which creates Activity Tracker (AT) event routing instance."
440+
},
441+
{
442+
"role_crns": [
443+
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
444+
"crn:v1:bluemix:public:iam::::role:Editor"
445+
],
446+
"service_name": "sysdig-monitor",
447+
"notes": "[Optional] Required if you are consuming Observability DA which sets up Cloud monitoring."
448+
},
449+
{
450+
"role_crns": [
451+
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
452+
"crn:v1:bluemix:public:iam::::role:Editor"
453+
],
454+
"service_name": "logs",
455+
"notes": "[Optional] Required if you are consuming Observability DA which sets up Cloud logs."
456+
},
457+
{
458+
"role_crns": [
459+
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
460+
"crn:v1:bluemix:public:iam::::role:Editor"
461+
],
462+
"service_name": "cloud-object-storage",
463+
"notes": "[Optional] Required if COS is chosen for target of Activity Tracker Event routing or Cloud logs data or cloud logs metrics."
464+
},
465+
{
466+
"role_crns": [
467+
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
468+
"crn:v1:bluemix:public:iam::::role:Editor"
469+
],
470+
"service_name": "hs-crypto",
471+
"notes": "[Optional] Required if you are creating/configuring Hyper Protect Crypto Services (HPCS) instance for encryption."
472+
},
473+
{
474+
"role_crns": [
475+
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
476+
"crn:v1:bluemix:public:iam::::role:Editor"
477+
],
478+
"service_name": "kms",
479+
"notes": "[Optional] Required if you are creating/configuring Key Protect (KP) instance for encryption."
480+
},
481+
{
482+
"role_crns": [
483+
"crn:v1:bluemix:public:iam::::role:Administrator"
484+
],
485+
"service_name": "iam-identity",
486+
"notes": "[Optional] Required if Cloud automation for account configuration is enabled."
426487
}
427488
],
428489
"architecture": {
429-
"descriptions": "This architecture supports creating and configuring an IBM Cloud Event Notifications instance.",
430490
"features": [
431491
{
432492
"title": "Creates an Event Notifications instance",
@@ -451,7 +511,102 @@
451511
"description": "This architecture supports creating and configuring an IBM Cloud Event Notifications instance."
452512
}
453513
]
454-
}
514+
},
515+
"dependencies": [
516+
{
517+
"name": "deploy-arch-ibm-account-infra-base",
518+
"description": "This module prepares your IBM Cloud account with the necessary configurations to ensure a secure and organized environment for your architecture.",
519+
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
520+
"flavors": [
521+
"resource-group-only",
522+
"resource-groups-with-account-settings"
523+
],
524+
"default_flavour": "resource-group-only",
525+
"id": "63641cec-6093-4b4f-b7b0-98d2f4185cd6-global",
526+
"input_mapping": [
527+
{
528+
"dependency_input": "prefix",
529+
"version_input": "prefix",
530+
"reference_version": true
531+
},
532+
{
533+
"dependency_output": "observability_resource_group_name",
534+
"version_input": "existing_resource_group_name"
535+
},
536+
{
537+
"dependency_input": "provider_visibility",
538+
"version_input": "provider_visibility",
539+
"reference_version": true
540+
},
541+
{
542+
"version_input": "use_existing_resource_group",
543+
"value": true
544+
}
545+
],
546+
"optional": true,
547+
"on_by_default": false,
548+
"version": "v3.0.6"
549+
},
550+
{
551+
"name": "deploy-arch-ibm-observability",
552+
"flavors": [
553+
"instances"
554+
],
555+
"id": "a3137d28-79e0-479d-8a24-758ebd5a0eab-global",
556+
"catalog_id": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd",
557+
"input_mapping": [
558+
{
559+
"dependency_output": "cloud_monitoring_crn",
560+
"version_input": "existing_monitoring_crn"
561+
},
562+
{
563+
"dependency_input": "prefix",
564+
"version_input": "prefix",
565+
"reference_version": true
566+
},
567+
{
568+
"dependency_input": "region",
569+
"version_input": "region",
570+
"reference_version": true
571+
}
572+
],
573+
"optional": true,
574+
"on_by_default": true,
575+
"version": "2.11.0"
576+
},
577+
{
578+
"name": "deploy-arch-ibm-kms",
579+
"id": "2cad4789-fa90-4886-9c9e-857081c273ee-global",
580+
"flavors": [
581+
"fully-configurable"
582+
],
583+
"catalog_id": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd",
584+
"input_mapping": [
585+
{
586+
"dependency_output": "kms_instance_crn",
587+
"version_input": "existing_kms_instance_crn"
588+
},
589+
{
590+
"dependency_output": "kms_private_endpoint",
591+
"version_input": "kms_endpoint_url"
592+
},
593+
{
594+
"dependency_input": "prefix",
595+
"version_input": "prefix",
596+
"reference_version": true
597+
},
598+
{
599+
"dependency_input": "region",
600+
"version_input": "region",
601+
"reference_version": true
602+
}
603+
],
604+
"optional": true,
605+
"on_by_default": true,
606+
"version": "v5.1.2"
607+
}
608+
],
609+
"dependency_version_2": true
455610
}
456611
]
457612
}

0 commit comments

Comments
 (0)