From 3b3313938b71ffec8808c7508e137534e7d9e309 Mon Sep 17 00:00:00 2001 From: Jordan-Williams2 Date: Thu, 23 Jan 2025 10:53:45 +0000 Subject: [PATCH 1/3] feat: add catalog onboarding --- .catalog-onboard-pipeline.yaml | 14 ++ .releaserc | 3 + ibm_catalog.json | 296 +++++++++++++++++++++++++++++++++ 3 files changed, 313 insertions(+) create mode 100644 .catalog-onboard-pipeline.yaml create mode 100644 ibm_catalog.json diff --git a/.catalog-onboard-pipeline.yaml b/.catalog-onboard-pipeline.yaml new file mode 100644 index 00000000..c1931344 --- /dev/null +++ b/.catalog-onboard-pipeline.yaml @@ -0,0 +1,14 @@ +--- +apiVersion: v1 +offerings: + - name: deploy-arch-ibm-icd-rabbitmq + kind: solution + catalog_id: _ + offering_id: _ + variations: + - name: standard + mark_ready: true + install_type: fullstack + scc: + instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37 + region: us-south diff --git a/.releaserc b/.releaserc index 708916f7..4160e575 100644 --- a/.releaserc +++ b/.releaserc @@ -10,6 +10,9 @@ }], ["@semantic-release/exec", { "successCmd": "echo \"SEMVER_VERSION=${nextRelease.version}\" >> $GITHUB_ENV" + }], + ["@semantic-release/exec",{ + "publishCmd": "./ci/trigger-catalog-onboarding-pipeline.sh --version=v${nextRelease.version}" }] ] } diff --git a/ibm_catalog.json b/ibm_catalog.json new file mode 100644 index 00000000..ef598d85 --- /dev/null +++ b/ibm_catalog.json @@ -0,0 +1,296 @@ +{ + "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" + } + ] + }, + "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." + } + ] + }, + "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": true, + "options": [ + { + "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": "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" + } + ] + } + ] + } + ] + } From f40b071310b5c9d5af505e4dbf473882d9356ba4 Mon Sep 17 00:00:00 2001 From: Jordan-Williams2 Date: Thu, 23 Jan 2025 10:55:25 +0000 Subject: [PATCH 2/3] feat: add catalog onboarding --- images/rabbitmq_icon.svg | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 images/rabbitmq_icon.svg diff --git a/images/rabbitmq_icon.svg b/images/rabbitmq_icon.svg new file mode 100644 index 00000000..2eba4470 --- /dev/null +++ b/images/rabbitmq_icon.svg @@ -0,0 +1,19 @@ + + + + + + + + + From e01750c2bba53ad4f9ed8ce7964e30a31cc29956 Mon Sep 17 00:00:00 2001 From: Jordan-Williams2 Date: Thu, 23 Jan 2025 11:08:41 +0000 Subject: [PATCH 3/3] fix: update ids --- .catalog-onboard-pipeline.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.catalog-onboard-pipeline.yaml b/.catalog-onboard-pipeline.yaml index c1931344..24b56c2d 100644 --- a/.catalog-onboard-pipeline.yaml +++ b/.catalog-onboard-pipeline.yaml @@ -3,8 +3,8 @@ apiVersion: v1 offerings: - name: deploy-arch-ibm-icd-rabbitmq kind: solution - catalog_id: _ - offering_id: _ + catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd + offering_id: 01f5b01a-3650-4acf-aaf3-4790f7cbd422 variations: - name: standard mark_ready: true