From 5ec6eb63012bee680b3a840ca015cc1b2f44d941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Conall=20=C3=93=20Cofaigh?= Date: Tue, 10 Dec 2024 11:06:53 +0000 Subject: [PATCH] fix: remove extension type (#807) --- .catalog-onboard-pipeline.yaml | 6 - ibm_catalog.json | 107 ------------------ solutions/mock-da-extension/README.md | 3 - .../catalogValidationValues.json.template | 6 - solutions/mock-da-extension/main.tf | 30 ----- solutions/mock-da-extension/outputs.tf | 13 --- solutions/mock-da-extension/provider.tf | 5 - solutions/mock-da-extension/variables.tf | 39 ------- solutions/mock-da-extension/version.tf | 9 -- 9 files changed, 218 deletions(-) delete mode 100644 solutions/mock-da-extension/README.md delete mode 100644 solutions/mock-da-extension/catalogValidationValues.json.template delete mode 100644 solutions/mock-da-extension/main.tf delete mode 100644 solutions/mock-da-extension/outputs.tf delete mode 100644 solutions/mock-da-extension/provider.tf delete mode 100644 solutions/mock-da-extension/variables.tf delete mode 100644 solutions/mock-da-extension/version.tf diff --git a/.catalog-onboard-pipeline.yaml b/.catalog-onboard-pipeline.yaml index 6c0eb33..c403ec6 100644 --- a/.catalog-onboard-pipeline.yaml +++ b/.catalog-onboard-pipeline.yaml @@ -20,12 +20,6 @@ offerings: catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd offering_id: 50c034fb-a0ba-412f-acca-20fa1258b818 variations: - - name: quickstart - mark_ready: true - install_type: fullstack - destroy_resources_on_failure: true - destroy_workspace_on_failure: false - import_only: true - name: standard mark_ready: true install_type: fullstack diff --git a/ibm_catalog.json b/ibm_catalog.json index 76f381d..ce35739 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -282,113 +282,6 @@ } ] } - }, - { - "label": "QuickStart Mock", - "name": "quickstart", - "install_type": "fullstack", - "working_directory": "solutions/mock-da-extension", - "dependency_version_2": true, - "dependencies": [ - { - "flavors": [ - "standard" - ], - "id": "95fccffc-ae3b-42df-b6d9-80be5914d852-global", - "name": "deploy-arch-ibm-slz-ocp", - "version": ">=1.0.0", - "optional": true - }, - { - "flavors": [ - "standard" - ], - "id": "9fc0fa64-27af-4fed-9dce-47b3640ba739-global", - "name": "deploy-arch-ibm-slz-vpc", - "version": ">=1.0.0", - "optional": true - }, - { - "flavors": [ - "standard" - ], - "id": "ef663980-4c71-4fac-af4f-4a510a9bcf68-global", - "name": "deploy-arch-ibm-slz-vsi", - "version": ">=1.0.0", - "optional": true - } - ], - "compliance": { - "authority": "scc-v3", - "profiles": [ - { - "profile_name": "IBM Cloud Framework for Financial Services", - "profile_version": "1.7.0" - } - ] - }, - "configuration": [ - { - "custom_config": { - "config_constraints": { - "generationType": "2" - }, - "grouping": "deployment", - "original_grouping": "deployment", - "type": "vpc_region" - }, - "key": "region", - "required": true - }, - { - "key": "provider_visibility", - "options": [ - { - "displayname": "private", - "value": "private" - }, - { - "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": "is.vpc" - } - ], - "architecture": { - "descriptions": "mock", - "features": [ - { - "title": "Feature 1", - "description": "Feature 1 description" - }, - { - "title": "Feature 2", - "description": "Feature 2 description" - } - ], - "diagrams": [ - { - "diagram": { - "caption": "Mock Module", - "url": "https://www.svgrepo.com/show/532064/rainbow.svg", - "type": "image/svg+xml" - }, - "description": "This is a mock module diagram" - } - ] - } } ] } diff --git a/solutions/mock-da-extension/README.md b/solutions/mock-da-extension/README.md deleted file mode 100644 index 36db2fc..0000000 --- a/solutions/mock-da-extension/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Complete example - -An basic example showing how to consume the module. diff --git a/solutions/mock-da-extension/catalogValidationValues.json.template b/solutions/mock-da-extension/catalogValidationValues.json.template deleted file mode 100644 index 0a521fd..0000000 --- a/solutions/mock-da-extension/catalogValidationValues.json.template +++ /dev/null @@ -1,6 +0,0 @@ -{ - "ibmcloud_api_key": $VALIDATION_APIKEY, - "resource_group": $RG_NAME, - "resource_tags": $TAGS, - "prefix": $PREFIX -} diff --git a/solutions/mock-da-extension/main.tf b/solutions/mock-da-extension/main.tf deleted file mode 100644 index 4eb443f..0000000 --- a/solutions/mock-da-extension/main.tf +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################## -# Resource Group -# (if var.resource_group is null, create a new RG using var.prefix) -############################################################################## - -resource "ibm_resource_group" "resource_group" { - count = var.resource_group != null ? 0 : 1 - name = "${var.prefix}-rg" - quota_id = null -} - -data "ibm_resource_group" "existing_resource_group" { - count = var.resource_group != null ? 1 : 0 - name = var.resource_group -} - -locals { - resource_group_id = var.resource_group != null ? data.ibm_resource_group.existing_resource_group[0].id : ibm_resource_group.resource_group[0].id -} - -############################################################################# -# Call root level module to create SSH key -############################################################################# - -module "mock_module" { - source = "../.." - name = var.prefix - resource_group_id = local.resource_group_id - tags = var.resource_tags -} diff --git a/solutions/mock-da-extension/outputs.tf b/solutions/mock-da-extension/outputs.tf deleted file mode 100644 index ff2192c..0000000 --- a/solutions/mock-da-extension/outputs.tf +++ /dev/null @@ -1,13 +0,0 @@ -############################################################################## -# Outputs -############################################################################## - -output "ssh_key_id" { - description = "The ID of the ssh key" - value = module.mock_module.ssh_key_id -} - -output "fingerprint" { - description = "SSH key Fingerprint info" - value = module.mock_module.fingerprint -} diff --git a/solutions/mock-da-extension/provider.tf b/solutions/mock-da-extension/provider.tf deleted file mode 100644 index f69fb6d..0000000 --- a/solutions/mock-da-extension/provider.tf +++ /dev/null @@ -1,5 +0,0 @@ -provider "ibm" { - ibmcloud_api_key = var.ibmcloud_api_key - region = var.region - visibility = var.provider_visibility -} diff --git a/solutions/mock-da-extension/variables.tf b/solutions/mock-da-extension/variables.tf deleted file mode 100644 index 0890d4c..0000000 --- a/solutions/mock-da-extension/variables.tf +++ /dev/null @@ -1,39 +0,0 @@ -variable "ibmcloud_api_key" { - type = string - description = "The IBM Cloud API Key" - sensitive = true -} - -variable "provider_visibility" { - description = "Set the visibility value for the IBM terraform provider. Supported values are `public`, `private`, `public-and-private`. [Learn more](https://registry.terraform.io/providers/IBM-Cloud/ibm/latest/docs/guides/custom-service-endpoints)." - type = string - default = "private" - - validation { - condition = contains(["public", "private", "public-and-private"], var.provider_visibility) - error_message = "Invalid visibility option. Allowed values are 'public', 'private', or 'public-and-private'." - } -} -variable "region" { - type = string - description = "Region to provision all resources created by this example" - default = "us-south" -} - -variable "prefix" { - type = string - description = "Prefix to append to all resources created by this example" - default = "mock" -} - -variable "resource_group" { - type = string - description = "An existing resource group name to use for this example, if unset a new resource group will be created" - default = null -} - -variable "resource_tags" { - type = list(string) - description = "Optional list of tags to be added to created resources" - default = [] -} diff --git a/solutions/mock-da-extension/version.tf b/solutions/mock-da-extension/version.tf deleted file mode 100644 index 7a9229f..0000000 --- a/solutions/mock-da-extension/version.tf +++ /dev/null @@ -1,9 +0,0 @@ -terraform { - required_version = ">= 1.0.0" - required_providers { - ibm = { - source = "IBM-Cloud/ibm" - version = ">= 1.71.3" - } - } -}