diff --git a/examples/complete/main.tf b/examples/complete/main.tf index b8637434..0ada25fc 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -104,7 +104,7 @@ module "icd_rabbitmq" { use_ibm_owned_encryption_key = false use_same_kms_key_for_backups = false kms_key_crn = module.key_protect_all_inclusive.keys["icd.${local.data_key_name}"].crn - backup_encryption_key_crn = module.key_protect_all_inclusive.keys["icd.${local.data_key_name}"].crn + backup_encryption_key_crn = module.key_protect_all_inclusive.keys["icd.${local.backups_key_name}"].crn service_credential_names = { "rabbitmq_admin" : "Administrator", "rabbitmq_operator" : "Operator", diff --git a/ibm_catalog.json b/ibm_catalog.json index 398dfa9a..ca71b6b6 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -1,301 +1,326 @@ { - "products": [ - { - "name": "deploy-arch-ibm-icd-rabbitmq", - "label": "Cloud automation for Messages for RabbitMQ", - "product_kind": "solution", - "tags": [ - "ibm_created", - "target_terraform", - "terraform", - "data_management", - "solution" - ], - "keywords": [ - "rabbitmq", - "IaC", - "infrastructure as code", - "terraform", - "solution", - "rabbitmq standard", - "cache", - "in memory" - ], - "short_description": "Creates and configures an instance of IBM Cloud Databases for RabbitMQ.", - "long_description": "This architecture supports creating and configuring an instance of Databases for RabbitMQ with KMS encryption.", - "offering_docs_url": "https://github.com/terraform-ibm-modules/terraform-ibm-icd-rabbitmq/blob/main/README.md", - "offering_icon_url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-icd-rabbitmq/main/images/rabbitmq_icon.svg", - "provider_name": "IBM", - "features": [ - { - "title": "Creates an instance of Databases for RabbitMQ", - "description": "Creates and configures an IBM Cloud Databases for RabbitMQ instance." - }, - { - "title": "Supports KMS encryption", - "description": "Provides KMS encryption for the data that you store in the database." + "products": [ + { + "name": "deploy-arch-ibm-icd-rabbitmq", + "label": "Cloud automation for Messages for RabbitMQ", + "product_kind": "solution", + "tags": [ + "ibm_created", + "target_terraform", + "terraform", + "data_management", + "solution" + ], + "keywords": [ + "rabbitmq", + "IaC", + "infrastructure as code", + "terraform", + "solution", + "rabbitmq standard", + "cache", + "in memory" + ], + "short_description": "Creates and configures an instance of IBM Cloud Databases for RabbitMQ.", + "long_description": "This architecture supports creating and configuring an instance of Databases for RabbitMQ with KMS encryption.", + "offering_docs_url": "https://github.com/terraform-ibm-modules/terraform-ibm-icd-rabbitmq/blob/main/README.md", + "offering_icon_url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-icd-rabbitmq/main/images/rabbitmq_icon.svg", + "provider_name": "IBM", + "features": [ + { + "title": "Creates an instance of Databases for RabbitMQ", + "description": "Creates and configures an IBM Cloud Databases for RabbitMQ instance." + }, + { + "title": "Supports KMS encryption", + "description": "Provides KMS encryption for the data that you store in the database." + }, + { + "title": "Supports autoscaling", + "description": "Provides the autoscaling to allow the database to increase resources in response to usage." + }, + { + "title": "Supports backup restoration", + "description": "Provides database restoration using a backup created by a deployment with the same service ID." + } + ], + "flavors": [ + { + "label": "Standard", + "name": "standard", + "install_type": "fullstack", + "working_directory": "solutions/standard", + "compliance": { + "authority": "scc-v3", + "profiles": [ + { + "profile_name": "IBM Cloud Framework for Financial Services", + "profile_version": "1.7.0" + } + ] }, - { - "title": "Supports autoscaling", - "description": "Provides the autoscaling to allow the database to increase resources in response to usage." + "iam_permissions": [ + { + "role_crns": [ + "crn:v1:bluemix:public:iam::::role:Administrator" + ], + "service_name": "all-account-management-services" + }, + { + "role_crns": [ + "crn:v1:bluemix:public:iam::::role:Editor" + ], + "service_name": "messages-for-rabbitmq" + }, + { + "role_crns": [ + "crn:v1:bluemix:public:iam::::serviceRole:Manager", + "crn:v1:bluemix:public:iam::::role:Editor" + ], + "service_name": "kms" + } + ], + "architecture": { + "descriptions": "This architecture creates an instance of IBM CLoud Messages for RabbitMQ instance with KMS encryption. Supports autoscaling.", + "features": [ + { + "title": " Creates an instance of Databases for RabbitMQ", + "description": "This architecture creates an instance of IBM Cloud Messages for RabbitMQ with KMS encryption. It accepts or creates a resource group, and provides autoscaling rules." + } + ], + "diagrams": [ + { + "diagram": { + "caption": "Messages for RabbitMQ instance on IBM Cloud", + "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-icd-rabbitmq/main/reference-architecture/deployable-architecture-rabbitmq.svg", + "type": "image/svg+xml" + }, + "description": "This architecture supports creating and configuring an instance of Messages for RabbitMQ instance with KMS encryption." + } + ] }, - { - "title": "Supports backup restoration", - "description": "Provides database restoration using a backup created by a deployment with the same service ID." - } - ], - "flavors": [ - { - "label": "Standard", - "name": "standard", - "install_type": "fullstack", - "working_directory": "solutions/standard", - "compliance": { - "authority": "scc-v3", - "profiles": [ + "configuration": [ + { + "key": "ibmcloud_api_key" + }, + { + "key": "provider_visibility", + "options": [ + { + "displayname": "private", + "value": "private" + }, { - "profile_name": "IBM Cloud Framework for Financial Services", - "profile_version": "1.7.0" + "displayname": "public", + "value": "public" + }, + { + "displayname": "public-and-private", + "value": "public-and-private" } ] }, - "iam_permissions": [ - { - "role_crns": [ - "crn:v1:bluemix:public:iam::::role:Administrator" - ], - "service_name": "all-account-management-services" - }, - { - "role_crns": [ - "crn:v1:bluemix:public:iam::::role:Editor" - ], - "service_name": "messages-for-rabbitmq" - }, - { - "role_crns": [ - "crn:v1:bluemix:public:iam::::serviceRole:Manager", - "crn:v1:bluemix:public:iam::::role:Editor" - ], - "service_name": "kms" - } - ], - "architecture": { - "descriptions": "This architecture creates an instance of IBM CLoud Messages for RabbitMQ instance with KMS encryption. Supports autoscaling.", - "features": [ + { + "key": "use_existing_resource_group" + }, + { + "key": "resource_group_name" + }, + { + "key": "prefix" + }, + { + "key": "name" + }, + { + "key": "region", + "required": true, + "default_value": "us-south", + "options": [ + { + "displayname": "Chennai (che01)", + "value": "che01" + }, + { + "displayname": "Dallas (us-south)", + "value": "us-south" + }, + { + "displayname": "Frankfurt (eu-de)", + "value": "eu-de" + }, { - "title": " Creates an instance of Databases for RabbitMQ", - "description": "This architecture creates an instance of IBM Cloud Messages for RabbitMQ with KMS encryption. It accepts or creates a resource group, and provides autoscaling rules." + "displayname": "London (eu-gb)", + "value": "eu-gb" + }, + { + "displayname": "Madrid (eu-es)", + "value": "eu-es" + }, + { + "displayname": "Osaka (jp-osa)", + "value": "jp-osa" + }, + { + "displayname": "Paris (par01)", + "value": "par01" + }, + { + "displayname": "Sao Paulo (br-sao)", + "value": "br-sao" + }, + { + "displayname": "Sydney (au-syd)", + "value": "au-syd" + }, + { + "displayname": "Toronto (ca-tor)", + "value": "ca-tor" + }, + { + "displayname": "Tokyo (jp-tok)", + "value": "jp-tok" + }, + { + "displayname": "Washington (us-east)", + "value": "us-east" } - ], - "diagrams": [ + ] + }, + { + "key": "rabbitmq_version", + "required": true, + "options": [ { - "diagram": { - "caption": "Messages for RabbitMQ instance on IBM Cloud", - "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-icd-rabbitmq/main/reference-architecture/deployable-architecture-rabbitmq.svg", - "type": "image/svg+xml" - }, - "description": "This architecture supports creating and configuring an instance of Messages for RabbitMQ instance with KMS encryption." + "displayname": "3.9", + "value": "3.9" + }, + { + "displayname": "3.12", + "value": "3.12" + }, + { + "displayname": "3.13", + "value": "3.13" } ] }, - "configuration": [ - { - "key": "ibmcloud_api_key" - }, - { - "key": "provider_visibility", - "options": [ - { - "displayname": "private", - "value": "private" - }, - { - "displayname": "public", - "value": "public" - }, - { - "displayname": "public-and-private", - "value": "public-and-private" - } - ] - }, - { - "key": "use_existing_resource_group" - }, - { - "key": "resource_group_name" - }, - { - "key": "prefix" - }, - { - "key": "name" - }, - { - "key": "region", - "required": true, - "default_value": "us-south", - "options": [ - { - "displayname": "Chennai (che01)", - "value": "che01" - }, - { - "displayname": "Dallas (us-south)", - "value": "us-south" - }, - { - "displayname": "Frankfurt (eu-de)", - "value": "eu-de" - }, - { - "displayname": "London (eu-gb)", - "value": "eu-gb" - }, - { - "displayname": "Madrid (eu-es)", - "value": "eu-es" - }, - { - "displayname": "Osaka (jp-osa)", - "value": "jp-osa" - }, - { - "displayname": "Paris (par01)", - "value": "par01" - }, - { - "displayname": "Sao Paulo (br-sao)", - "value": "br-sao" - }, - { - "displayname": "Sydney (au-syd)", - "value": "au-syd" - }, - { - "displayname": "Toronto (ca-tor)", - "value": "ca-tor" - }, - { - "displayname": "Tokyo (jp-tok)", - "value": "jp-tok" - }, - { - "displayname": "Washington (us-east)", - "value": "us-east" - } - ] - }, - { - "key": "rabbitmq_version", - "required": false, - "default_value": "__NULL__", - "options": [ - { - "displayname": "preferred", - "value": "__NULL__" - }, - { - "displayname": "6.2", - "value": "6.2" - }, - { - "displayname": "7.2", - "value": "7.2" - } - ] - }, - { - "key": "members" - }, - { - "key": "member_memory_mb" - }, - { - "key": "member_cpu_count" - }, - { - "key": "member_disk_mb" - }, - { - "key": "member_host_flavor" - }, - { - "key": "service_credential_names" - }, - { - "key": "admin_pass" - }, - { - "key": "users" - }, - { - "key": "tags" - }, - { - "key": "ibmcloud_kms_api_key" - }, - { - "key": "existing_kms_instance_crn", - "required": true - }, - { - "key": "existing_kms_key_crn" - }, - { - "key": "kms_endpoint_type", - "options": [ - { - "displayname": "public", - "value": "public" - }, - { - "displayname": "private", - "value": "private" + { + "key": "members" + }, + { + "key": "member_memory_mb" + }, + { + "key": "member_cpu_count" + }, + { + "key": "member_disk_mb" + }, + { + "key": "member_host_flavor" + }, + { + "key": "service_credential_names" + }, + { + "key": "admin_pass" + }, + { + "key": "users" + }, + { + "key": "tags", + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "string" } - ] - }, - { - "key": "key_ring_name" - }, - { - "key": "key_name" - }, - { - "key": "auto_scaling" - }, - { - "key": "existing_secrets_manager_instance_crn" - }, - { - "key": "existing_secrets_manager_endpoint_type", - "options": [ - { - "displayname": "public", - "value": "public" - }, - { - "displayname": "private", - "value": "private" + } + }, + { + "key": "access_tags", + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "string" } - ] - }, - { - "key": "service_credential_secrets" - }, - { - "key": "skip_rabbitmq_sm_auth_policy" - }, - { - "key": "skip_rabbitmq_kms_auth_policy" - }, - { - "key": "backup_crn" } - ] - } - ] - } - ] - } + }, + { + "key": "use_ibm_owned_encryption_key" + }, + { + "key": "ibmcloud_kms_api_key" + }, + { + "key": "existing_kms_instance_crn", + "required": true + }, + { + "key": "existing_kms_key_crn" + }, + { + "key": "kms_endpoint_type", + "options": [ + { + "displayname": "public", + "value": "public" + }, + { + "displayname": "private", + "value": "private" + } + ] + }, + { + "key": "key_ring_name" + }, + { + "key": "key_name" + }, + { + "key": "auto_scaling" + }, + { + "key": "existing_secrets_manager_instance_crn" + }, + { + "key": "existing_secrets_manager_endpoint_type", + "options": [ + { + "displayname": "public", + "value": "public" + }, + { + "displayname": "private", + "value": "private" + } + ] + }, + { + "key": "service_credential_secrets" + }, + { + "key": "skip_rabbitmq_sm_auth_policy" + }, + { + "key": "skip_rabbitmq_kms_auth_policy" + }, + { + "key": "backup_crn" + }, + { + "key": "existing_backup_kms_key_crn" + }, + { + "key": "use_default_backup_encryption_key" + } + ] + } + ] + } + ] +}