Skip to content

refactor: DA inputs best practices #988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ocofaigh merged 5 commits into from
May 12, 2025
Merged

refactor: DA inputs best practices #988

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
12c9816
refactor: DA inputs best practices
May 7, 2025
333b8fc
Added customconfig for tags_input
May 7, 2025
9dde2ad
Merge branch 'main' into 11571-issue
arya-girish-k May 7, 2025
2e6a4a9
reverted back all f5 variables
May 9, 2025
62f213c
reverted version
May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
711 changes: 380 additions & 331 deletions ibm_catalog.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions patterns/roks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,18 @@ 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
app_id = var.app_id
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
Expand Down
10 changes: 5 additions & 5 deletions patterns/roks/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions patterns/vpc/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,18 @@ 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
app_id = var.app_id
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
Expand Down
10 changes: 5 additions & 5 deletions patterns/vpc/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion patterns/vpc/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
10 changes: 5 additions & 5 deletions patterns/vsi/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,18 @@ 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
app_id = var.app_id
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
Expand Down
10 changes: 5 additions & 5 deletions patterns/vsi/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down