From cdd0c2506b83157be7b84324c255550b7b8be441 Mon Sep 17 00:00:00 2001 From: shemau Date: Tue, 17 Jun 2025 11:19:53 +0100 Subject: [PATCH 1/4] fix: clean up legacy catalog modules --- .catalog-onboard-pipeline.yaml | 12 ---- catalogValidationValues.json.template | 1 - .../catalogValidationValues.json.template | 5 -- .../catalogValidationValues.json.template | 6 -- ibm_catalog.json | 70 ------------------- 5 files changed, 94 deletions(-) delete mode 100644 .catalog-onboard-pipeline.yaml delete mode 100644 catalogValidationValues.json.template delete mode 100644 examples/basic/catalogValidationValues.json.template delete mode 100644 examples/complete/catalogValidationValues.json.template delete mode 100644 ibm_catalog.json diff --git a/.catalog-onboard-pipeline.yaml b/.catalog-onboard-pipeline.yaml deleted file mode 100644 index e689f5a..0000000 --- a/.catalog-onboard-pipeline.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: v1 -offerings: - - name: terraform-ibm-kms-key-ring - kind: module - catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd - offering_id: 0efb177d-37a3-468d-b09a-6b863a293310 - examples: - - name: basic - mark_ready: true - - name: complete - mark_ready: true diff --git a/catalogValidationValues.json.template b/catalogValidationValues.json.template deleted file mode 100644 index 0967ef4..0000000 --- a/catalogValidationValues.json.template +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/examples/basic/catalogValidationValues.json.template b/examples/basic/catalogValidationValues.json.template deleted file mode 100644 index 55d5589..0000000 --- a/examples/basic/catalogValidationValues.json.template +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ibmcloud_api_key": $VALIDATION_APIKEY, - "existing_kms_instance_guid": $HPCS_US_SOUTH_GUID, - "prefix": $PREFIX -} diff --git a/examples/complete/catalogValidationValues.json.template b/examples/complete/catalogValidationValues.json.template deleted file mode 100644 index d761afa..0000000 --- a/examples/complete/catalogValidationValues.json.template +++ /dev/null @@ -1,6 +0,0 @@ -{ - "ibmcloud_api_key": $VALIDATION_APIKEY, - "region": "us-south", - "resource_tags": $TAGS, - "prefix": $PREFIX -} diff --git a/ibm_catalog.json b/ibm_catalog.json deleted file mode 100644 index bf163c0..0000000 --- a/ibm_catalog.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "products": [ - { - "name": "terraform-ibm-kms-key-ring", - "label": "KMS Key Ring module", - "product_kind": "module", - "tags": [ - "dev_ops", - "target_terraform", - "terraform", - "module", - "ibm_created" - ], - "keywords": [ - "terraform", - "key protect", - "hpcs", - "key ring", - "encryption" - ], - "short_description": "Terraform module to create a key ring in an IBM Key Management Service", - "long_description": "Use this module to create a key ring to help organize keys in an IBM Key Management Services (KMS) instance. The KMS can be IBM Key Protect or IBM Cloud Hyper Protect Crypto Services(HPCS) instance. For more information, about key rings, see [creating key rings in Key Protect](https://cloud.ibm.com/docs/key-protect?topic=key-protect-grouping-keys#create-key-ring-api) and [managing key rings in HPCS](https://cloud.ibm.com/docs/hs-crypto?topic=hs-crypto-managing-key-rings&interface=ui).\n\n### Usage\n```hcl\nprovider \"ibm\" {\n ibmcloud_api_key = \"XXXXXXXXXX\"\n # Must be the same region the KMS instance is in\n region = \"us-south\"\n}\n\nmodule \"kms_key_ring\" {\n # Replace \"X.X.X\" with a release version to lock into a specific release\n source = \"https://cm.globalcatalog.cloud.ibm.com/api/v1-beta/offering/source?archive=tgz&kind=terraform&name=terraform-ibm-kms-key-ring&version=X.X.X\"\n instance_id = \"XXxxXXxx-xxxx-XXXX-xxxx-XXxxXXxx\"\n key_ring_id = \"my-key-ring\"\n}\n```", - "offering_docs_url": "https://github.com/terraform-ibm-modules/terraform-ibm-kms-key-ring/blob/main/README.md", - "offering_icon_url": "https://raw.githubusercontent.com/terraform-ibm-modules/documentation/main/icons/key_protect_icon.svg", - "provider_name": "IBM", - "features": [ - { - "title": "Create a KMS key ring", - "description": "Create a key ring in an IBM Key Management Service (KMS) instance." - } - ], - "flavors": [ - { - "label": "Basic", - "name": "basic", - "working_directory": "examples/basic", - "architecture": { - "diagrams": [ - { - "diagram": { - "caption": "Basic example", - "url": "https://raw.githubusercontent.com/terraform-ibm-modules/documentation/main/icons/ModuleExampleDiagram.svg", - "type": "image/svg+xml" - }, - "description": "A simple example that shows how to create a key ring in an existing IBM Hyper Protect Crypto Service (HPCS) instance." - } - ] - } - }, - { - "label": "Complete", - "name": "complete", - "working_directory": "examples/complete", - "architecture": { - "diagrams": [ - { - "diagram": { - "caption": "Complete example", - "url": "https://raw.githubusercontent.com/terraform-ibm-modules/documentation/main/icons/ModuleExampleDiagram.svg", - "type": "image/svg+xml" - }, - "description": "A complete example showing how to provision a Key Protect instance, a new key ring, and a new key." - } - ] - } - } - ] - } - ] -} From 209c3b0399ae79f3996a2f130905d7ebc8915506 Mon Sep 17 00:00:00 2001 From: shemau Date: Tue, 17 Jun 2025 11:25:05 +0100 Subject: [PATCH 2/4] fix: bump common-dev-assets --- common-dev-assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-dev-assets b/common-dev-assets index 1f72de0..ef001d7 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 1f72de03a36f8ee5522aaacf0ba410b6481122e9 +Subproject commit ef001d79c2f055862a5ebecf59725e443ffb0f5b From 796f284c9157c299f143a02d9d0975623268749c Mon Sep 17 00:00:00 2001 From: shemau Date: Tue, 17 Jun 2025 15:41:18 +0100 Subject: [PATCH 3/4] fix: address review comments --- .releaserc | 1 - 1 file changed, 1 deletion(-) diff --git a/.releaserc b/.releaserc index 708916f..34bfd69 100644 --- a/.releaserc +++ b/.releaserc @@ -9,7 +9,6 @@ "assets": "false" }], ["@semantic-release/exec", { - "successCmd": "echo \"SEMVER_VERSION=${nextRelease.version}\" >> $GITHUB_ENV" }] ] } From 4e5d74bcc293077f62190d13b54e70c9d4b1b35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Conall=20=C3=93=20Cofaigh?= Date: Tue, 17 Jun 2025 18:52:10 +0100 Subject: [PATCH 4/4] Update .releaserc --- .releaserc | 1 + 1 file changed, 1 insertion(+) diff --git a/.releaserc b/.releaserc index 34bfd69..708916f 100644 --- a/.releaserc +++ b/.releaserc @@ -9,6 +9,7 @@ "assets": "false" }], ["@semantic-release/exec", { + "successCmd": "echo \"SEMVER_VERSION=${nextRelease.version}\" >> $GITHUB_ENV" }] ] }