Skip to content

refactor: Update variable handling to correctly support null for dns_config_name and ca_config_name #282

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
merged 8 commits into from
Oct 16, 2025
Merged

refactor: Update variable handling to correctly support null for dns_config_name and ca_config_name #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5bbd546
Changed default value for ca_config to null
aatreyee257 Oct 9, 2025
f528500
Merge branch 'main' of https://github.com/terraform-ibm-modules/terra…
aatreyee257 Oct 9, 2025
c683a04
fixed pre-comit
aatreyee257 Oct 9, 2025
e1ceab6
resolved comments and fixed errors
aatreyee257 Oct 13, 2025
abc514b
SKIP UPGRADE TEST
aatreyee257 Oct 13, 2025
c756b2d
Merge branch 'main' into 15844
aatreyee257 Oct 14, 2025
288027e
fixes
aatreyee257 Oct 16, 2025
572c62c
Merge branch '15844' of https://github.com/terraform-ibm-modules/terr…
aatreyee257 Oct 16, 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
4 changes: 2 additions & 2 deletions solutions/fully-configurable/catalogValidationValues.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"ibmcloud_api_key": $VALIDATION_APIKEY,
"existing_secrets_manager_crn": $SM_CRN,
"prefix": $PREFIX,
"acme_letsencrypt_private_key": $ACME_KEY,
"internet_services_crn": $CIS_ID
"internet_services_crn": $CIS_ID,
"prefix": $PREFIX
}
6 changes: 3 additions & 3 deletions solutions/fully-configurable/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
########################################################################################################################

locals {
prefix = var.prefix != null ? trimspace(var.prefix) != "" ? "${var.prefix}-" : "" : ""
parse_acme_lets_encrypt_private_key = var.acme_letsencrypt_private_key_secrets_manager_secret_crn != null ? 1 : 0
prefix = var.prefix != null ? trimspace(var.prefix) != "" ? "${var.prefix}-" : "" : ""
}

module "secrets_manager_crn_parser" {
Expand Down Expand Up @@ -40,8 +40,8 @@ module "secrets_manager_public_cert_engine" {
internet_services_crn = var.internet_services_crn
cis_account_id = var.internet_services_account_id
internet_service_domain_id = var.internet_service_domain_id
dns_config_name = var.dns_config_name
ca_config_name = "${local.prefix}${var.ca_config_name}"
dns_config_name = var.dns_config_name == null ? null : "${local.prefix}${var.dns_config_name}"
ca_config_name = var.ca_config_name == null ? null : "${local.prefix}${var.ca_config_name}"
lets_encrypt_environment = var.lets_encrypt_environment
acme_letsencrypt_private_key = var.acme_letsencrypt_private_key
service_endpoints = var.service_endpoints
Expand Down
36 changes: 18 additions & 18 deletions tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,25 @@ toolchain go1.25.1
require (
github.com/gruntwork-io/terratest v0.51.0
github.com/stretchr/testify v1.11.1
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.10
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.14
)

require (
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
gopkg.in/go-playground/validator.v9 v9.31.0 // indirect
)

require (
dario.cat/mergo v1.0.0 // indirect
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
github.com/IBM-Cloud/power-go-client v1.12.0 // indirect
github.com/IBM/cloud-databases-go-sdk v0.8.0 // indirect
github.com/IBM-Cloud/power-go-client v1.13.0 // indirect
github.com/IBM/cloud-databases-go-sdk v0.8.1 // indirect
github.com/IBM/go-sdk-core v1.1.0
github.com/IBM/go-sdk-core/v5 v5.21.0 // indirect
github.com/IBM/platform-services-go-sdk v0.86.1 // indirect
github.com/IBM/project-go-sdk v0.3.6 // indirect
github.com/IBM/platform-services-go-sdk v0.89.0 // indirect
github.com/IBM/project-go-sdk v0.3.9 // indirect
github.com/IBM/schematics-go-sdk v0.4.0 // indirect
github.com/IBM/vpc-go-sdk v1.0.2 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
Expand All @@ -41,17 +42,17 @@ require (
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.6.2 // indirect
github.com/go-git/go-git/v5 v5.16.2 // indirect
github.com/go-git/go-git/v5 v5.16.3 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/analysis v0.23.0 // indirect
github.com/go-openapi/errors v0.22.2 // indirect
github.com/go-openapi/errors v0.22.3 // indirect
github.com/go-openapi/jsonpointer v0.21.1 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/loads v0.22.0 // indirect
github.com/go-openapi/runtime v0.28.0 // indirect
github.com/go-openapi/spec v0.21.0 // indirect
github.com/go-openapi/strfmt v0.23.0 // indirect
github.com/go-openapi/strfmt v0.24.0 // indirect
github.com/go-openapi/swag v0.23.1 // indirect
github.com/go-openapi/validate v0.24.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
Expand All @@ -68,7 +69,7 @@ require (
github.com/hashicorp/go-safetemp v1.0.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/hashicorp/hcl/v2 v2.22.0 // indirect
github.com/hashicorp/terraform-json v0.26.0 // indirect
github.com/hashicorp/terraform-json v0.27.2 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jinzhu/copier v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand All @@ -80,7 +81,6 @@ require (
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pjbgf/sha1cd v0.3.2 // indirect
Expand All @@ -91,19 +91,19 @@ require (
github.com/tmccombs/hcl2json v0.6.4 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/zclconf/go-cty v1.16.3 // indirect
go.mongodb.org/mongo-driver v1.17.3 // indirect
github.com/zclconf/go-cty v1.16.4 // indirect
go.mongodb.org/mongo-driver v1.17.4 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
golang.org/x/crypto v0.41.0 // indirect
golang.org/x/mod v0.26.0 // indirect
golang.org/x/net v0.42.0 // indirect
golang.org/x/crypto v0.43.0 // indirect
golang.org/x/mod v0.28.0 // indirect
golang.org/x/net v0.45.0 // indirect
golang.org/x/sync v0.17.0 // indirect
golang.org/x/sys v0.35.0 // indirect
golang.org/x/text v0.28.0 // indirect
golang.org/x/tools v0.35.0 // indirect
golang.org/x/sys v0.37.0 // indirect
golang.org/x/text v0.30.0 // indirect
golang.org/x/tools v0.37.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading