From 12c98168bccdf3c275f36ff25893cc0424883dc8 Mon Sep 17 00:00:00 2001 From: Arya Girish K Date: Wed, 7 May 2025 07:54:53 +0530 Subject: [PATCH 1/4] refactor: DA inputs best practices --- ibm_catalog.json | 660 ++++++++++++++++++------------------- patterns/roks/main.tf | 10 +- patterns/roks/variables.tf | 10 +- patterns/vpc/main.tf | 10 +- patterns/vpc/variables.tf | 10 +- patterns/vpc/version.tf | 2 +- patterns/vsi/main.tf | 10 +- patterns/vsi/variables.tf | 10 +- 8 files changed, 361 insertions(+), 361 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index e65772d47..54f7c61fd 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -60,32 +60,32 @@ "configuration": [ { "custom_config": { + "config_constraints": { + "generationType": "2" + }, "grouping": "deployment", "original_grouping": "deployment", - "type": "json_editor" + "type": "vpc_region" }, - "key": "override_json_string" + "key": "region", + "required": true, + "type": "string" }, { "custom_config": { "grouping": "deployment", "original_grouping": "deployment", - "type": "textarea" + "type": "json_editor" }, - "key": "user_data" + "key": "override_json_string" }, { "custom_config": { - "config_constraints": { - "generationType": "2" - }, "grouping": "deployment", "original_grouping": "deployment", - "type": "vpc_region" + "type": "textarea" }, - "key": "region", - "required": true, - "type": "string" + "key": "user_data" }, { "key": "ibmcloud_api_key" @@ -211,121 +211,122 @@ }, "release_notes_url": "https://cloud.ibm.com/docs/secure-infrastructure-vpc?topic=secure-infrastructure-vpc-secure-infrastructure-vpc-relnotes", "configuration": [ + { + "custom_config": { + "config_constraints": { + "generationType": "2" + }, + "grouping": "deployment", + "original_grouping": "deployment", + "type": "vpc_region" + }, + "key": "region", + "required": true + }, { "key": "ssh_public_key", "required": true }, { - "hidden": true, - "key": "teleport_domain" + "key": "ibmcloud_api_key" }, { - "hidden": true, - "key": "do_declaration_url" + "key": "prefix" }, { - "hidden": true, - "key": "template_version" + "key": "existing_ssh_key_name" }, { - "key": "teleport_hostname", - "hidden": true + "key": "tags" }, { - "hidden": true, - "key": "byol_license_basekey" + "key": "network_cidr" }, { - "hidden": true, - "key": "teleport_management_zones" + "key": "vpcs" }, { - "hidden": true, - "key": "tgrefresh_url" + "key": "enable_transit_gateway" }, { - "hidden": true, - "key": "vpn_firewall_type" + "key": "transit_gateway_global" }, { - "hidden": true, - "key": "domain" + "key": "add_atracker_route" }, { - "hidden": true, - "key": "license_sku_keyword_2" + "key": "hs_crypto_instance_name" }, { - "key": "add_edge_vpc", - "hidden": true + "key": "hs_crypto_resource_group" }, { - "hidden": true, - "key": "enable_f5_external_fip" + "key": "use_random_cos_suffix" }, { - "hidden": true, - "key": "teleport_vsi_image_name" + "key": "vsi_image_name" }, { - "hidden": true, - "key": "tgactive_url" + "key": "vsi_instance_profile" }, { - "hidden": true, - "key": "license_type" + "key": "vsi_per_subnet" }, { - "hidden": true, - "key": "f5_instance_profile" + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "type": "textarea" + }, + "key": "user_data" }, { - "hidden": true, - "key": "message_of_the_day" + "key": "use_legacy_network_interface" }, { - "hidden": true, - "key": "tgstandby_url" + "key": "add_edge_vpc", + "hidden": true }, { "hidden": true, - "key": "f5_image_name" + "key": "create_f5_network_on_management_vpc" }, { "hidden": true, - "key": "appid_name" + "key": "provision_teleport_in_f5" }, { "hidden": true, - "key": "license_password" + "key": "vpn_firewall_type" }, { "hidden": true, - "key": "provision_teleport_in_f5" + "key": "f5_image_name" }, { "hidden": true, - "key": "https_key" + "key": "f5_instance_profile" }, { "hidden": true, - "key": "https_cert" + "key": "hostname" }, { "hidden": true, - "key": "license_username" + "key": "domain" }, { "hidden": true, - "key": "teleport_license" + "key": "tmos_admin_password", + "type": "password" }, { "hidden": true, - "key": "enable_f5_management_fip" + "key": "license_type" }, { "hidden": true, - "key": "license_pool" + "key": "byol_license_basekey" }, { "hidden": true, @@ -333,72 +334,51 @@ }, { "hidden": true, - "key": "hostname" + "key": "license_username" }, { "hidden": true, - "key": "use_existing_appid" - }, - { - "custom_config": { - "grouping": "deployment", - "original_grouping": "deployment", - "type": "json_editor" - }, - "key": "override_json_string" + "key": "license_password" }, { - "custom_config": { - "grouping": "deployment", - "original_grouping": "deployment", - "type": "textarea" - }, - "key": "user_data" + "hidden": true, + "key": "license_pool" }, { "hidden": true, - "key": "tmos_admin_password", - "type": "password" + "key": "license_sku_keyword_1" }, { "hidden": true, - "key": "license_sku_keyword_1" + "key": "license_sku_keyword_2" }, { "hidden": true, - "key": "teleport_version" + "key": "license_unit_of_measure" }, { - "custom_config": { - "config_constraints": { - "generationType": "2" - }, - "grouping": "deployment", - "original_grouping": "deployment", - "type": "vpc_region" - }, - "key": "region", - "required": true + "hidden": true, + "key": "f5_declarative_onboarding_declaration_url" }, { - "key": "override", - "hidden": true + "hidden": true, + "key": "f5_telemetry_streaming_declaration_url" }, { "hidden": true, - "key": "teleport_admin_email" + "key": "f5_appsvcs_extension_declaration_url" }, { "hidden": true, - "key": "create_f5_network_on_management_vpc" + "key": "phone_home_url" }, { "hidden": true, - "key": "teleport_instance_profile" + "key": "template_source" }, { "hidden": true, - "key": "license_unit_of_measure" + "key": "template_version" }, { "hidden": true, @@ -406,83 +386,103 @@ }, { "hidden": true, - "key": "appid_resource_group" + "key": "tgactive_url" }, { "hidden": true, - "key": "phone_home_url" + "key": "tgstandby_url" }, { "hidden": true, - "key": "ts_declaration_url" + "key": "tgrefresh_url" }, { "hidden": true, - "key": "as3_declaration_url" + "key": "enable_f5_management_interface_floating_ip" }, { "hidden": true, - "key": "template_source" + "key": "enable_f5_external_interface_floating_ip" }, { - "key": "IC_SCHEMATICS_WORKSPACE_ID" + "hidden": true, + "key": "teleport_management_zones" }, { - "key": "add_atracker_route" + "hidden": true, + "key": "use_existing_appid" }, { - "key": "enable_transit_gateway" + "hidden": true, + "key": "appid_name" }, { - "key": "existing_ssh_key_name" + "hidden": true, + "key": "appid_resource_group" }, { - "key": "existing_vpc_cbr_zone_id" + "hidden": true, + "key": "teleport_instance_profile" }, { - "key": "hs_crypto_instance_name" + "hidden": true, + "key": "teleport_vsi_image_name" }, { - "key": "hs_crypto_resource_group" + "hidden": true, + "key": "teleport_license" }, { - "key": "ibmcloud_api_key" + "hidden": true, + "key": "https_cert" }, { - "key": "network_cidr" + "hidden": true, + "key": "https_key" }, { - "key": "prefix" + "key": "teleport_hostname", + "hidden": true }, { - "key": "skip_all_s2s_auth_policies" + "hidden": true, + "key": "teleport_domain" }, { - "key": "skip_kms_block_storage_s2s_auth_policy" + "hidden": true, + "key": "teleport_version" }, { - "key": "tags" + "hidden": true, + "key": "message_of_the_day" }, { - "key": "transit_gateway_global" + "hidden": true, + "key": "teleport_admin_email" }, { - "key": "use_legacy_network_interface" + "key": "skip_kms_block_storage_s2s_auth_policy" }, { - "key": "use_random_cos_suffix" + "key": "skip_all_s2s_auth_policies" }, { - "key": "vpcs" + "key": "override", + "hidden": true }, { - "key": "vsi_image_name" + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "type": "json_editor" + }, + "key": "override_json_string" }, { - "key": "vsi_instance_profile" + "key": "IC_SCHEMATICS_WORKSPACE_ID" }, { - "key": "vsi_per_subnet" + "key": "existing_vpc_cbr_zone_id" } ], "iam_permissions": [ @@ -634,64 +634,64 @@ "required": true }, { - "key": "access_tags" + "key": "ibmcloud_api_key" }, { - "key": "block_storage_volumes" + "key": "prefix" }, { - "key": "boot_volume_encryption_key" + "key": "vpc_id" }, { - "key": "enable_floating_ip" + "key": "existing_ssh_key_name" }, { - "key": "existing_ssh_key_name" + "key": "resource_tags" }, { - "key": "ibmcloud_api_key" + "key": "access_tags" }, { "key": "image_name" }, { - "key": "load_balancers" + "key": "vsi_instance_profile" }, { - "key": "placement_group_id" + "key": "user_data" }, { - "key": "prefix" + "key": "boot_volume_encryption_key" }, { - "key": "primary_vni_additional_ip_count" + "key": "vsi_per_subnet" }, { - "key": "resource_tags" + "key": "subnet_names" }, { "key": "security_group_ids" }, { - "key": "skip_iam_authorization_policy" + "key": "block_storage_volumes" }, { - "key": "subnet_names" + "key": "skip_iam_authorization_policy" }, { - "key": "use_legacy_network_interface" + "key": "enable_floating_ip" }, { - "key": "user_data" + "key": "placement_group_id" }, { - "key": "vpc_id" + "key": "load_balancers" }, { - "key": "vsi_instance_profile" + "key": "primary_vni_additional_ip_count" }, { - "key": "vsi_per_subnet" + "key": "use_legacy_network_interface" } ], "iam_permissions": [ @@ -800,14 +800,6 @@ }, "release_notes_url": "https://cloud.ibm.com/docs/secure-infrastructure-vpc?topic=secure-infrastructure-vpc-secure-infrastructure-vpc-relnotes", "configuration": [ - { - "custom_config": { - "grouping": "deployment", - "original_grouping": "deployment", - "type": "json_editor" - }, - "key": "override_json_string" - }, { "custom_config": { "config_constraints": { @@ -821,11 +813,40 @@ "required": true }, { - "key": "add_edge_vpc", - "hidden": true + "key": "ibmcloud_api_key" }, { - "key": "teleport_management_zones", + "key": "prefix" + }, + { + "key": "tags" + }, + { + "key": "network_cidr" + }, + { + "key": "vpcs" + }, + { + "key": "enable_transit_gateway" + }, + { + "key": "transit_gateway_global" + }, + { + "key": "add_atracker_route" + }, + { + "key": "hs_crypto_instance_name" + }, + { + "key": "hs_crypto_resource_group" + }, + { + "key": "use_random_cos_suffix" + }, + { + "key": "add_edge_vpc", "hidden": true }, { @@ -901,15 +922,15 @@ "hidden": true }, { - "key": "do_declaration_url", + "key": "f5_declarative_onboarding_declaration_url", "hidden": true }, { - "key": "as3_declaration_url", + "key": "f5_appsvcs_extension_declaration_url", "hidden": true }, { - "key": "ts_declaration_url", + "key": "f5_telemetry_streaming_declaration_url", "hidden": true }, { @@ -941,11 +962,15 @@ "hidden": true }, { - "key": "enable_f5_management_fip", + "key": "enable_f5_management_interface_floating_ip", + "hidden": true + }, + { + "key": "enable_f5_external_interface_floating_ip", "hidden": true }, { - "key": "enable_f5_external_fip", + "key": "teleport_management_zones", "hidden": true }, { @@ -1000,37 +1025,6 @@ "key": "teleport_admin_email", "hidden": true }, - { - "key": "override", - "hidden": true - }, - { - "key": "IC_SCHEMATICS_WORKSPACE_ID" - }, - { - "key": "add_atracker_route" - }, - { - "key": "enable_transit_gateway" - }, - { - "key": "existing_vpc_cbr_zone_id" - }, - { - "key": "hs_crypto_instance_name" - }, - { - "key": "hs_crypto_resource_group" - }, - { - "key": "ibmcloud_api_key" - }, - { - "key": "network_cidr" - }, - { - "key": "prefix" - }, { "key": "skip_all_s2s_auth_policies" }, @@ -1038,16 +1032,22 @@ "key": "skip_kms_block_storage_s2s_auth_policy" }, { - "key": "tags" + "key": "override", + "hidden": true }, { - "key": "transit_gateway_global" + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "type": "json_editor" + }, + "key": "override_json_string" }, { - "key": "use_random_cos_suffix" + "key": "IC_SCHEMATICS_WORKSPACE_ID" }, { - "key": "vpcs" + "key": "existing_vpc_cbr_zone_id" } ], "iam_permissions": [ @@ -1218,22 +1218,22 @@ "type": "string" }, { - "key": "entitlement" + "key": "ibmcloud_api_key" }, { - "key": "flavor" + "key": "prefix" }, { - "key": "ibmcloud_api_key" + "key": "resource_tags" }, { "key": "kube_version" }, { - "key": "prefix" + "key": "flavor" }, { - "key": "resource_tags" + "key": "entitlement" } ], "iam_permissions": [ @@ -1325,6 +1325,18 @@ }, "release_notes_url": "https://cloud.ibm.com/docs/secure-infrastructure-vpc?topic=secure-infrastructure-vpc-secure-infrastructure-vpc-relnotes", "configuration": [ + { + "custom_config": { + "config_constraints": { + "generationType": "2" + }, + "grouping": "deployment", + "original_grouping": "deployment", + "type": "vpc_region" + }, + "key": "region", + "required": true + }, { "key": "kube_version", "type": "string", @@ -1350,327 +1362,315 @@ "custom_config": {} }, { - "hidden": true, - "key": "tgactive_url" + "key": "ibmcloud_api_key" }, { - "hidden": true, - "key": "enable_f5_management_fip" + "key": "prefix" }, { - "hidden": true, - "key": "license_sku_keyword_1" + "key": "tags" }, { - "hidden": true, - "key": "enable_f5_external_fip" + "key": "network_cidr" }, { - "hidden": true, - "key": "vpn_firewall_type" + "key": "vpcs" }, { - "hidden": true, - "key": "license_type" + "key": "ignore_vpcs_for_cluster_deployment" }, { - "hidden": true, - "key": "byol_license_basekey" + "key": "enable_transit_gateway" }, { - "hidden": true, - "key": "teleport_vsi_image_name" + "key": "transit_gateway_global" }, { - "hidden": true, - "key": "message_of_the_day" + "key": "add_atracker_route" }, { - "hidden": true, - "key": "license_unit_of_measure" + "key": "hs_crypto_instance_name" }, { - "hidden": true, - "key": "teleport_admin_email" + "key": "hs_crypto_resource_group" }, { - "hidden": true, - "key": "hostname" + "key": "existing_kms_instance_name" }, { - "hidden": true, - "key": "ssh_public_key" + "key": "existing_kms_resource_group" }, { - "hidden": true, - "key": "existing_ssh_key_name" + "key": "existing_kms_endpoint_type" }, { - "custom_config": { - "config_constraints": { - "generationType": "2" - }, - "grouping": "deployment", - "original_grouping": "deployment", - "type": "vpc_region" - }, - "key": "region", - "required": true + "key": "use_random_cos_suffix" }, { - "hidden": true, - "key": "domain" + "key": "existing_cos_instance_name" }, { - "key": "phone_home_url", - "hidden": true + "key": "existing_cos_resource_group" }, { - "hidden": true, - "key": "tgstandby_url" + "key": "existing_cos_endpoint_type" }, { - "custom_config": { - "grouping": "deployment", - "original_grouping": "deployment", - "type": "json_editor" - }, - "key": "override_json_string" + "key": "use_existing_cos_for_vpc_flowlogs" }, { - "hidden": true, - "key": "appid_resource_group" + "key": "use_existing_cos_for_atracker" }, { - "hidden": true, - "key": "https_key" + "key": "cluster_zones" }, { - "hidden": true, - "key": "appid_name" + "key": "flavor" }, { - "key": "add_edge_vpc", - "hidden": true + "key": "workers_per_zone" }, { - "hidden": true, - "key": "tmos_admin_password", - "type": "password" + "key": "wait_till" }, { - "hidden": true, - "key": "teleport_management_zones" + "key": "kms_wait_for_apply" }, { - "hidden": true, - "key": "license_host" + "key": "entitlement" }, { - "hidden": true, - "key": "f5_instance_profile" + "key": "secondary_storage" }, { - "hidden": true, - "key": "license_sku_keyword_2" + "key": "cluster_addons" }, { - "hidden": true, - "key": "license_pool" + "key": "manage_all_cluster_addons" }, { - "hidden": true, - "key": "f5_image_name" + "key": "disable_outbound_traffic_protection" }, { - "hidden": true, - "key": "provision_teleport_in_f5" + "key": "cluster_force_delete_storage" }, { - "hidden": true, - "key": "as3_declaration_url" + "key": "operating_system" }, { - "hidden": true, - "key": "teleport_instance_profile" + "key": "verify_cluster_network_readiness" }, { - "hidden": true, - "key": "teleport_hostname" + "key": "use_ibm_cloud_private_api_endpoints" }, { - "hidden": true, - "key": "teleport_domain" + "key": "add_edge_vpc", + "hidden": true }, { "hidden": true, "key": "create_f5_network_on_management_vpc" }, - { - "key": "template_version", - "hidden": true - }, { "hidden": true, - "key": "app_id" + "key": "provision_teleport_in_f5" }, { "hidden": true, - "key": "teleport_license" + "key": "vpn_firewall_type" }, { "hidden": true, - "key": "use_existing_appid" + "key": "ssh_public_key" }, { "hidden": true, - "key": "teleport_version" + "key": "existing_ssh_key_name" }, { "hidden": true, - "key": "license_username" + "key": "f5_image_name" }, { "hidden": true, - "key": "tgrefresh_url" + "key": "f5_instance_profile" }, { "hidden": true, - "key": "https_cert" + "key": "hostname" }, { "hidden": true, - "key": "ts_declaration_url" + "key": "domain" }, { - "key": "override", - "hidden": true + "hidden": true, + "key": "tmos_admin_password", + "type": "password" }, { - "key": "cluster_zones" + "hidden": true, + "key": "license_type" }, { "hidden": true, - "key": "license_password" + "key": "byol_license_basekey" }, { "hidden": true, - "key": "do_declaration_url" + "key": "license_host" }, { - "key": "workers_per_zone" + "hidden": true, + "key": "license_username" }, { "hidden": true, - "key": "template_source" + "key": "license_password" }, { - "key": "IC_SCHEMATICS_WORKSPACE_ID" + "hidden": true, + "key": "license_pool" }, { - "key": "add_atracker_route" + "hidden": true, + "key": "license_sku_keyword_1" }, { - "key": "cluster_addons" + "hidden": true, + "key": "license_sku_keyword_2" }, { - "key": "cluster_force_delete_storage" + "hidden": true, + "key": "license_unit_of_measure" }, { - "key": "disable_outbound_traffic_protection" + "hidden": true, + "key": "f5_declarative_onboarding_declaration_url" }, { - "key": "enable_transit_gateway" + "hidden": true, + "key": "f5_appsvcs_extension_declaration_url" }, { - "key": "entitlement" + "hidden": true, + "key": "f5_telemetry_streaming_declaration_url" }, { - "key": "existing_cos_endpoint_type" + "key": "phone_home_url", + "hidden": true }, { - "key": "existing_cos_instance_name" + "hidden": true, + "key": "template_source" }, { - "key": "existing_cos_resource_group" + "key": "template_version", + "hidden": true }, { - "key": "existing_kms_endpoint_type" + "hidden": true, + "key": "app_id" }, { - "key": "existing_kms_instance_name" + "hidden": true, + "key": "tgactive_url" }, { - "key": "existing_kms_resource_group" + "hidden": true, + "key": "tgstandby_url" }, { - "key": "existing_vpc_cbr_zone_id" + "hidden": true, + "key": "tgrefresh_url" }, { - "key": "flavor" + "hidden": true, + "key": "enable_f5_management_interface_floating_ip" }, { - "key": "hs_crypto_instance_name" + "hidden": true, + "key": "enable_f5_external_interface_floating_ip" }, { - "key": "hs_crypto_resource_group" + "hidden": true, + "key": "teleport_management_zones" }, { - "key": "ibmcloud_api_key" + "hidden": true, + "key": "use_existing_appid" }, { - "key": "ignore_vpcs_for_cluster_deployment" + "hidden": true, + "key": "appid_name" }, { - "key": "kms_wait_for_apply" + "hidden": true, + "key": "appid_resource_group" }, { - "key": "manage_all_cluster_addons" + "hidden": true, + "key": "teleport_instance_profile" }, { - "key": "network_cidr" + "hidden": true, + "key": "teleport_vsi_image_name" }, { - "key": "operating_system" + "hidden": true, + "key": "teleport_license" }, { - "key": "prefix" + "hidden": true, + "key": "https_cert" }, { - "key": "secondary_storage" + "hidden": true, + "key": "https_key" }, { - "key": "skip_all_s2s_auth_policies" + "hidden": true, + "key": "teleport_hostname" }, { - "key": "skip_kms_block_storage_s2s_auth_policy" + "hidden": true, + "key": "teleport_domain" }, { - "key": "tags" + "hidden": true, + "key": "teleport_version" }, { - "key": "transit_gateway_global" + "hidden": true, + "key": "message_of_the_day" }, { - "key": "use_existing_cos_for_atracker" + "hidden": true, + "key": "teleport_admin_email" }, { - "key": "use_existing_cos_for_vpc_flowlogs" + "key": "skip_kms_block_storage_s2s_auth_policy" }, { - "key": "use_ibm_cloud_private_api_endpoints" + "key": "skip_all_s2s_auth_policies" }, { - "key": "use_random_cos_suffix" + "key": "override", + "hidden": true }, { - "key": "verify_cluster_network_readiness" + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "type": "json_editor" + }, + "key": "override_json_string" }, { - "key": "vpcs" + "key": "IC_SCHEMATICS_WORKSPACE_ID" }, { - "key": "wait_till" + "key": "existing_vpc_cbr_zone_id" } ], "iam_permissions": [ diff --git a/patterns/roks/main.tf b/patterns/roks/main.tf index 209e4d7c9..43b53ba5e 100644 --- a/patterns/roks/main.tf +++ b/patterns/roks/main.tf @@ -68,9 +68,9 @@ module "roks_landing_zone" { license_sku_keyword_1 = var.license_sku_keyword_1 license_sku_keyword_2 = var.license_sku_keyword_2 license_unit_of_measure = var.license_unit_of_measure - do_declaration_url = var.do_declaration_url - as3_declaration_url = var.as3_declaration_url - ts_declaration_url = var.ts_declaration_url + do_declaration_url = var.f5_declarative_onboarding_declaration_url + as3_declaration_url = var.f5_appsvcs_extension_declaration_url + ts_declaration_url = var.f5_telemetry_streaming_declaration_url phone_home_url = var.phone_home_url template_source = var.template_source template_version = var.template_version @@ -78,8 +78,8 @@ module "roks_landing_zone" { tgactive_url = var.tgactive_url tgstandby_url = var.tgstandby_url tgrefresh_url = var.tgrefresh_url - enable_f5_management_fip = var.enable_f5_management_fip - enable_f5_external_fip = var.enable_f5_external_fip + enable_f5_management_fip = var.enable_f5_management_interface_floating_ip + enable_f5_external_fip = var.enable_f5_external_interface_floating_ip use_existing_appid = var.use_existing_appid appid_name = var.appid_name appid_resource_group = var.appid_resource_group diff --git a/patterns/roks/variables.tf b/patterns/roks/variables.tf index ac5a55878..76630c3a4 100644 --- a/patterns/roks/variables.tf +++ b/patterns/roks/variables.tf @@ -473,19 +473,19 @@ variable "license_unit_of_measure" { default = "hourly" } -variable "do_declaration_url" { +variable "f5_declarative_onboarding_declaration_url" { description = "URL to fetch the f5-declarative-onboarding declaration" type = string default = "null" } -variable "as3_declaration_url" { +variable "f5_appsvcs_extension_declaration_url" { description = "URL to fetch the f5-appsvcs-extension declaration" type = string default = "null" } -variable "ts_declaration_url" { +variable "f5_telemetry_streaming_declaration_url" { description = "URL to fetch the f5-telemetry-streaming declaration" type = string default = "null" @@ -533,13 +533,13 @@ variable "tgrefresh_url" { default = "null" } -variable "enable_f5_management_fip" { +variable "enable_f5_management_interface_floating_ip" { description = "Enable F5 management interface floating IP. Conflicts with `enable_f5_external_fip`, VSI can only have one floating IP per instance." type = bool default = false } -variable "enable_f5_external_fip" { +variable "enable_f5_external_interface_floating_ip" { description = "Enable F5 external interface floating IP. Conflicts with `enable_f5_management_fip`, VSI can only have one floating IP per instance." type = bool default = false diff --git a/patterns/vpc/main.tf b/patterns/vpc/main.tf index fc0426da1..8389a4976 100644 --- a/patterns/vpc/main.tf +++ b/patterns/vpc/main.tf @@ -47,9 +47,9 @@ module "vpc_landing_zone" { license_sku_keyword_1 = var.license_sku_keyword_1 license_sku_keyword_2 = var.license_sku_keyword_2 license_unit_of_measure = var.license_unit_of_measure - do_declaration_url = var.do_declaration_url - as3_declaration_url = var.as3_declaration_url - ts_declaration_url = var.ts_declaration_url + do_declaration_url = var.f5_declarative_onboarding_declaration_url + as3_declaration_url = var.f5_appsvcs_extension_declaration_url + ts_declaration_url = var.f5_telemetry_streaming_declaration_url phone_home_url = var.phone_home_url template_source = var.template_source template_version = var.template_version @@ -57,8 +57,8 @@ module "vpc_landing_zone" { tgactive_url = var.tgactive_url tgstandby_url = var.tgstandby_url tgrefresh_url = var.tgrefresh_url - enable_f5_management_fip = var.enable_f5_management_fip - enable_f5_external_fip = var.enable_f5_external_fip + enable_f5_management_fip = var.enable_f5_management_interface_floating_ip + enable_f5_external_fip = var.enable_f5_external_interface_floating_ip use_existing_appid = var.use_existing_appid appid_name = var.appid_name appid_resource_group = var.appid_resource_group diff --git a/patterns/vpc/variables.tf b/patterns/vpc/variables.tf index 127a34100..623716dde 100644 --- a/patterns/vpc/variables.tf +++ b/patterns/vpc/variables.tf @@ -264,19 +264,19 @@ variable "license_unit_of_measure" { default = "hourly" } -variable "do_declaration_url" { +variable "f5_declarative_onboarding_declaration_url" { description = "URL to fetch the f5-declarative-onboarding declaration" type = string default = "null" } -variable "as3_declaration_url" { +variable "f5_appsvcs_extension_declaration_url" { description = "URL to fetch the f5-appsvcs-extension declaration" type = string default = "null" } -variable "ts_declaration_url" { +variable "f5_telemetry_streaming_declaration_url" { description = "URL to fetch the f5-telemetry-streaming declaration" type = string default = "null" @@ -324,13 +324,13 @@ variable "tgrefresh_url" { default = "null" } -variable "enable_f5_management_fip" { +variable "enable_f5_management_interface_floating_ip" { description = "Enable F5 management interface floating IP. Conflicts with `enable_f5_external_fip`, VSI can only have one floating IP per instance." type = bool default = false } -variable "enable_f5_external_fip" { +variable "enable_f5_external_interface_floating_ip" { description = "Enable F5 external interface floating IP. Conflicts with `enable_f5_management_fip`, VSI can only have one floating IP per instance." type = bool default = false diff --git a/patterns/vpc/version.tf b/patterns/vpc/version.tf index e34e3505d..ddf8e8ce1 100644 --- a/patterns/vpc/version.tf +++ b/patterns/vpc/version.tf @@ -3,7 +3,7 @@ ############################################################################## terraform { - required_version = ">= 1.3" + required_version = ">= 1.9" # renovate is set up to keep provider version at the latest for all DA solutions required_providers { ibm = { diff --git a/patterns/vsi/main.tf b/patterns/vsi/main.tf index 07b8eef34..6b996b64d 100644 --- a/patterns/vsi/main.tf +++ b/patterns/vsi/main.tf @@ -55,9 +55,9 @@ module "vsi_landing_zone" { license_sku_keyword_1 = var.license_sku_keyword_1 license_sku_keyword_2 = var.license_sku_keyword_2 license_unit_of_measure = var.license_unit_of_measure - do_declaration_url = var.do_declaration_url - as3_declaration_url = var.as3_declaration_url - ts_declaration_url = var.ts_declaration_url + do_declaration_url = var.f5_declarative_onboarding_declaration_url + as3_declaration_url = var.f5_appsvcs_extension_declaration_url + ts_declaration_url = var.f5_telemetry_streaming_declaration_url phone_home_url = var.phone_home_url template_source = var.template_source template_version = var.template_version @@ -65,8 +65,8 @@ module "vsi_landing_zone" { tgactive_url = var.tgactive_url tgstandby_url = var.tgstandby_url tgrefresh_url = var.tgrefresh_url - enable_f5_management_fip = var.enable_f5_management_fip - enable_f5_external_fip = var.enable_f5_external_fip + enable_f5_management_fip = var.enable_f5_management_interface_floating_ip + enable_f5_external_fip = var.enable_f5_external_interface_floating_ip teleport_management_zones = var.teleport_management_zones use_existing_appid = var.use_existing_appid appid_name = var.appid_name diff --git a/patterns/vsi/variables.tf b/patterns/vsi/variables.tf index 504773c47..f9fdb0dbe 100644 --- a/patterns/vsi/variables.tf +++ b/patterns/vsi/variables.tf @@ -309,19 +309,19 @@ variable "license_unit_of_measure" { default = "hourly" } -variable "do_declaration_url" { +variable "f5_declarative_onboarding_declaration_url" { description = "URL to fetch the f5-declarative-onboarding declaration" type = string default = "null" } -variable "as3_declaration_url" { +variable "f5_appsvcs_extension_declaration_url" { description = "URL to fetch the f5-appsvcs-extension declaration" type = string default = "null" } -variable "ts_declaration_url" { +variable "f5_telemetry_streaming_declaration_url" { description = "URL to fetch the f5-telemetry-streaming declaration" type = string default = "null" @@ -369,13 +369,13 @@ variable "tgrefresh_url" { default = "null" } -variable "enable_f5_management_fip" { +variable "enable_f5_management_interface_floating_ip" { description = "Enable F5 management interface floating IP. Conflicts with `enable_f5_external_fip`, VSI can only have one floating IP per instance." type = bool default = false } -variable "enable_f5_external_fip" { +variable "enable_f5_external_interface_floating_ip" { description = "Enable F5 external interface floating IP. Conflicts with `enable_f5_management_fip`, VSI can only have one floating IP per instance." type = bool default = false From 333b8fcd41714938d23a13ac27a4103280027e23 Mon Sep 17 00:00:00 2001 From: Arya Girish K Date: Wed, 7 May 2025 08:11:31 +0530 Subject: [PATCH 2/4] Added customconfig for tags_input --- ibm_catalog.json | 63 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 56 insertions(+), 7 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 54f7c61fd..3fa45e62d 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -94,7 +94,14 @@ "key": "prefix" }, { - "key": "resource_tags" + "key": "resource_tags", + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "string" + } + } }, { "key": "ssh_key" @@ -237,7 +244,14 @@ "key": "existing_ssh_key_name" }, { - "key": "tags" + "key": "tags", + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "string" + } + } }, { "key": "network_cidr" @@ -646,10 +660,24 @@ "key": "existing_ssh_key_name" }, { - "key": "resource_tags" + "key": "resource_tags", + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "string" + } + } }, { - "key": "access_tags" + "key": "access_tags", + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "string" + } + } }, { "key": "image_name" @@ -819,7 +847,14 @@ "key": "prefix" }, { - "key": "tags" + "key": "tags", + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "string" + } + } }, { "key": "network_cidr" @@ -1224,7 +1259,14 @@ "key": "prefix" }, { - "key": "resource_tags" + "key": "resource_tags", + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "string" + } + } }, { "key": "kube_version" @@ -1368,7 +1410,14 @@ "key": "prefix" }, { - "key": "tags" + "key": "tags", + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "string" + } + } }, { "key": "network_cidr" From 2e6a4a96efc0912fe0d196ab117a4e974c2405fc Mon Sep 17 00:00:00 2001 From: Arya Girish K Date: Fri, 9 May 2025 10:05:23 +0530 Subject: [PATCH 3/4] reverted back all f5 variables --- ibm_catalog.json | 30 +++++++++++++++--------------- patterns/roks/main.tf | 10 +++++----- patterns/roks/variables.tf | 10 +++++----- patterns/vpc/main.tf | 10 +++++----- patterns/vpc/variables.tf | 10 +++++----- patterns/vsi/main.tf | 10 +++++----- patterns/vsi/variables.tf | 10 +++++----- 7 files changed, 45 insertions(+), 45 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 3fa45e62d..3dc2734f8 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -372,15 +372,15 @@ }, { "hidden": true, - "key": "f5_declarative_onboarding_declaration_url" + "key": "do_declaration_url" }, { "hidden": true, - "key": "f5_telemetry_streaming_declaration_url" + "key": "ts_declaration_url" }, { "hidden": true, - "key": "f5_appsvcs_extension_declaration_url" + "key": "as3_declaration_url" }, { "hidden": true, @@ -412,11 +412,11 @@ }, { "hidden": true, - "key": "enable_f5_management_interface_floating_ip" + "key": "enable_f5_management_fip" }, { "hidden": true, - "key": "enable_f5_external_interface_floating_ip" + "key": "enable_f5_external_fip" }, { "hidden": true, @@ -957,15 +957,15 @@ "hidden": true }, { - "key": "f5_declarative_onboarding_declaration_url", + "key": "do_declaration_url", "hidden": true }, { - "key": "f5_appsvcs_extension_declaration_url", + "key": "as3_declaration_url", "hidden": true }, { - "key": "f5_telemetry_streaming_declaration_url", + "key": "ts_declaration_url", "hidden": true }, { @@ -997,11 +997,11 @@ "hidden": true }, { - "key": "enable_f5_management_interface_floating_ip", + "key": "enable_f5_management_fip", "hidden": true }, { - "key": "enable_f5_external_interface_floating_ip", + "key": "enable_f5_external_fip", "hidden": true }, { @@ -1595,15 +1595,15 @@ }, { "hidden": true, - "key": "f5_declarative_onboarding_declaration_url" + "key": "do_declaration_url" }, { "hidden": true, - "key": "f5_appsvcs_extension_declaration_url" + "key": "as3_declaration_url" }, { "hidden": true, - "key": "f5_telemetry_streaming_declaration_url" + "key": "ts_declaration_url" }, { "key": "phone_home_url", @@ -1635,11 +1635,11 @@ }, { "hidden": true, - "key": "enable_f5_management_interface_floating_ip" + "key": "enable_f5_management_fip" }, { "hidden": true, - "key": "enable_f5_external_interface_floating_ip" + "key": "enable_f5_external_fip" }, { "hidden": true, diff --git a/patterns/roks/main.tf b/patterns/roks/main.tf index 43b53ba5e..209e4d7c9 100644 --- a/patterns/roks/main.tf +++ b/patterns/roks/main.tf @@ -68,9 +68,9 @@ module "roks_landing_zone" { license_sku_keyword_1 = var.license_sku_keyword_1 license_sku_keyword_2 = var.license_sku_keyword_2 license_unit_of_measure = var.license_unit_of_measure - do_declaration_url = var.f5_declarative_onboarding_declaration_url - as3_declaration_url = var.f5_appsvcs_extension_declaration_url - ts_declaration_url = var.f5_telemetry_streaming_declaration_url + do_declaration_url = var.do_declaration_url + as3_declaration_url = var.as3_declaration_url + ts_declaration_url = var.ts_declaration_url phone_home_url = var.phone_home_url template_source = var.template_source template_version = var.template_version @@ -78,8 +78,8 @@ module "roks_landing_zone" { tgactive_url = var.tgactive_url tgstandby_url = var.tgstandby_url tgrefresh_url = var.tgrefresh_url - enable_f5_management_fip = var.enable_f5_management_interface_floating_ip - enable_f5_external_fip = var.enable_f5_external_interface_floating_ip + enable_f5_management_fip = var.enable_f5_management_fip + enable_f5_external_fip = var.enable_f5_external_fip use_existing_appid = var.use_existing_appid appid_name = var.appid_name appid_resource_group = var.appid_resource_group diff --git a/patterns/roks/variables.tf b/patterns/roks/variables.tf index da79946db..90525e51b 100644 --- a/patterns/roks/variables.tf +++ b/patterns/roks/variables.tf @@ -473,19 +473,19 @@ variable "license_unit_of_measure" { default = "hourly" } -variable "f5_declarative_onboarding_declaration_url" { +variable "do_declaration_url" { description = "URL to fetch the f5-declarative-onboarding declaration" type = string default = "null" } -variable "f5_appsvcs_extension_declaration_url" { +variable "as3_declaration_url" { description = "URL to fetch the f5-appsvcs-extension declaration" type = string default = "null" } -variable "f5_telemetry_streaming_declaration_url" { +variable "ts_declaration_url" { description = "URL to fetch the f5-telemetry-streaming declaration" type = string default = "null" @@ -533,13 +533,13 @@ variable "tgrefresh_url" { default = "null" } -variable "enable_f5_management_interface_floating_ip" { +variable "enable_f5_management_fip" { description = "Enable F5 management interface floating IP. Conflicts with `enable_f5_external_fip`, VSI can only have one floating IP per instance." type = bool default = false } -variable "enable_f5_external_interface_floating_ip" { +variable "enable_f5_external_fip" { description = "Enable F5 external interface floating IP. Conflicts with `enable_f5_management_fip`, VSI can only have one floating IP per instance." type = bool default = false diff --git a/patterns/vpc/main.tf b/patterns/vpc/main.tf index 8389a4976..fc0426da1 100644 --- a/patterns/vpc/main.tf +++ b/patterns/vpc/main.tf @@ -47,9 +47,9 @@ module "vpc_landing_zone" { license_sku_keyword_1 = var.license_sku_keyword_1 license_sku_keyword_2 = var.license_sku_keyword_2 license_unit_of_measure = var.license_unit_of_measure - do_declaration_url = var.f5_declarative_onboarding_declaration_url - as3_declaration_url = var.f5_appsvcs_extension_declaration_url - ts_declaration_url = var.f5_telemetry_streaming_declaration_url + do_declaration_url = var.do_declaration_url + as3_declaration_url = var.as3_declaration_url + ts_declaration_url = var.ts_declaration_url phone_home_url = var.phone_home_url template_source = var.template_source template_version = var.template_version @@ -57,8 +57,8 @@ module "vpc_landing_zone" { tgactive_url = var.tgactive_url tgstandby_url = var.tgstandby_url tgrefresh_url = var.tgrefresh_url - enable_f5_management_fip = var.enable_f5_management_interface_floating_ip - enable_f5_external_fip = var.enable_f5_external_interface_floating_ip + enable_f5_management_fip = var.enable_f5_management_fip + enable_f5_external_fip = var.enable_f5_external_fip use_existing_appid = var.use_existing_appid appid_name = var.appid_name appid_resource_group = var.appid_resource_group diff --git a/patterns/vpc/variables.tf b/patterns/vpc/variables.tf index 7ede76166..5b6a7c4a2 100644 --- a/patterns/vpc/variables.tf +++ b/patterns/vpc/variables.tf @@ -264,19 +264,19 @@ variable "license_unit_of_measure" { default = "hourly" } -variable "f5_declarative_onboarding_declaration_url" { +variable "do_declaration_url" { description = "URL to fetch the f5-declarative-onboarding declaration" type = string default = "null" } -variable "f5_appsvcs_extension_declaration_url" { +variable "as3_declaration_url" { description = "URL to fetch the f5-appsvcs-extension declaration" type = string default = "null" } -variable "f5_telemetry_streaming_declaration_url" { +variable "ts_declaration_url" { description = "URL to fetch the f5-telemetry-streaming declaration" type = string default = "null" @@ -324,13 +324,13 @@ variable "tgrefresh_url" { default = "null" } -variable "enable_f5_management_interface_floating_ip" { +variable "enable_f5_management_fip" { description = "Enable F5 management interface floating IP. Conflicts with `enable_f5_external_fip`, VSI can only have one floating IP per instance." type = bool default = false } -variable "enable_f5_external_interface_floating_ip" { +variable "enable_f5_external_fip" { description = "Enable F5 external interface floating IP. Conflicts with `enable_f5_management_fip`, VSI can only have one floating IP per instance." type = bool default = false diff --git a/patterns/vsi/main.tf b/patterns/vsi/main.tf index 6b996b64d..07b8eef34 100644 --- a/patterns/vsi/main.tf +++ b/patterns/vsi/main.tf @@ -55,9 +55,9 @@ module "vsi_landing_zone" { license_sku_keyword_1 = var.license_sku_keyword_1 license_sku_keyword_2 = var.license_sku_keyword_2 license_unit_of_measure = var.license_unit_of_measure - do_declaration_url = var.f5_declarative_onboarding_declaration_url - as3_declaration_url = var.f5_appsvcs_extension_declaration_url - ts_declaration_url = var.f5_telemetry_streaming_declaration_url + do_declaration_url = var.do_declaration_url + as3_declaration_url = var.as3_declaration_url + ts_declaration_url = var.ts_declaration_url phone_home_url = var.phone_home_url template_source = var.template_source template_version = var.template_version @@ -65,8 +65,8 @@ module "vsi_landing_zone" { tgactive_url = var.tgactive_url tgstandby_url = var.tgstandby_url tgrefresh_url = var.tgrefresh_url - enable_f5_management_fip = var.enable_f5_management_interface_floating_ip - enable_f5_external_fip = var.enable_f5_external_interface_floating_ip + enable_f5_management_fip = var.enable_f5_management_fip + enable_f5_external_fip = var.enable_f5_external_fip teleport_management_zones = var.teleport_management_zones use_existing_appid = var.use_existing_appid appid_name = var.appid_name diff --git a/patterns/vsi/variables.tf b/patterns/vsi/variables.tf index 0da6c29bd..c9d18a408 100644 --- a/patterns/vsi/variables.tf +++ b/patterns/vsi/variables.tf @@ -309,19 +309,19 @@ variable "license_unit_of_measure" { default = "hourly" } -variable "f5_declarative_onboarding_declaration_url" { +variable "do_declaration_url" { description = "URL to fetch the f5-declarative-onboarding declaration" type = string default = "null" } -variable "f5_appsvcs_extension_declaration_url" { +variable "as3_declaration_url" { description = "URL to fetch the f5-appsvcs-extension declaration" type = string default = "null" } -variable "f5_telemetry_streaming_declaration_url" { +variable "ts_declaration_url" { description = "URL to fetch the f5-telemetry-streaming declaration" type = string default = "null" @@ -369,13 +369,13 @@ variable "tgrefresh_url" { default = "null" } -variable "enable_f5_management_interface_floating_ip" { +variable "enable_f5_management_fip" { description = "Enable F5 management interface floating IP. Conflicts with `enable_f5_external_fip`, VSI can only have one floating IP per instance." type = bool default = false } -variable "enable_f5_external_interface_floating_ip" { +variable "enable_f5_external_fip" { description = "Enable F5 external interface floating IP. Conflicts with `enable_f5_management_fip`, VSI can only have one floating IP per instance." type = bool default = false From 62f213cfe154e3aada14c51e8dad4033b081d04d Mon Sep 17 00:00:00 2001 From: Arya Girish K Date: Fri, 9 May 2025 10:16:19 +0530 Subject: [PATCH 4/4] reverted version --- patterns/vpc/version.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patterns/vpc/version.tf b/patterns/vpc/version.tf index 83a8ebc1f..7db1c1da1 100644 --- a/patterns/vpc/version.tf +++ b/patterns/vpc/version.tf @@ -3,7 +3,7 @@ ############################################################################## terraform { - required_version = ">= 1.9" + required_version = ">= 1.3" # renovate is set up to keep provider version at the latest for all DA solutions required_providers { ibm = {