Skip to content

Commit fd81f31

Browse files
aatreyee257aatreyee257
authored
fix: Improved variable handling to support null values for dns_config_name and ca_config_name inputs (#282)
1 parent 1fe5b1e commit fd81f31

File tree

4 files changed

+61
-60
lines changed

4 files changed

+61
-60
lines changed

‎solutions/fully-configurable/catalogValidationValues.json.template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"ibmcloud_api_key": $VALIDATION_APIKEY,
33
"existing_secrets_manager_crn": $SM_CRN,
4-
"prefix": $PREFIX,
54
"acme_letsencrypt_private_key": $ACME_KEY,
6-
"internet_services_crn": $CIS_ID
5+
"internet_services_crn": $CIS_ID,
6+
"prefix": $PREFIX
77
}

‎solutions/fully-configurable/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
########################################################################################################################
44

55
locals {
6-
prefix = var.prefix != null ? trimspace(var.prefix) != "" ? "${var.prefix}-" : "" : ""
76
parse_acme_lets_encrypt_private_key = var.acme_letsencrypt_private_key_secrets_manager_secret_crn != null ? 1 : 0
7+
prefix = var.prefix != null ? trimspace(var.prefix) != "" ? "${var.prefix}-" : "" : ""
88
}
99

1010
module "secrets_manager_crn_parser" {
@@ -40,8 +40,8 @@ module "secrets_manager_public_cert_engine" {
4040
internet_services_crn = var.internet_services_crn
4141
cis_account_id = var.internet_services_account_id
4242
internet_service_domain_id = var.internet_service_domain_id
43-
dns_config_name = var.dns_config_name
44-
ca_config_name = "${local.prefix}${var.ca_config_name}"
43+
dns_config_name = var.dns_config_name == null ? null : "${local.prefix}${var.dns_config_name}"
44+
ca_config_name = var.ca_config_name == null ? null : "${local.prefix}${var.ca_config_name}"
4545
lets_encrypt_environment = var.lets_encrypt_environment
4646
acme_letsencrypt_private_key = var.acme_letsencrypt_private_key
4747
service_endpoints = var.service_endpoints

‎tests/go.mod‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,25 @@ toolchain go1.25.1
77
require (
88
github.com/gruntwork-io/terratest v0.51.0
99
github.com/stretchr/testify v1.11.1
10-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.10
10+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.14
1111
)
1212

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

1920
require (
2021
dario.cat/mergo v1.0.0 // indirect
2122
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
22-
github.com/IBM-Cloud/power-go-client v1.12.0 // indirect
23-
github.com/IBM/cloud-databases-go-sdk v0.8.0 // indirect
23+
github.com/IBM-Cloud/power-go-client v1.13.0 // indirect
24+
github.com/IBM/cloud-databases-go-sdk v0.8.1 // indirect
2425
github.com/IBM/go-sdk-core v1.1.0
2526
github.com/IBM/go-sdk-core/v5 v5.21.0 // indirect
26-
github.com/IBM/platform-services-go-sdk v0.86.1 // indirect
27-
github.com/IBM/project-go-sdk v0.3.6 // indirect
27+
github.com/IBM/platform-services-go-sdk v0.89.0 // indirect
28+
github.com/IBM/project-go-sdk v0.3.9 // indirect
2829
github.com/IBM/schematics-go-sdk v0.4.0 // indirect
2930
github.com/IBM/vpc-go-sdk v1.0.2 // indirect
3031
github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -41,17 +42,17 @@ require (
4142
github.com/ghodss/yaml v1.0.0 // indirect
4243
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
4344
github.com/go-git/go-billy/v5 v5.6.2 // indirect
44-
github.com/go-git/go-git/v5 v5.16.2 // indirect
45+
github.com/go-git/go-git/v5 v5.16.3 // indirect
4546
github.com/go-logr/logr v1.4.2 // indirect
4647
github.com/go-logr/stdr v1.2.2 // indirect
4748
github.com/go-openapi/analysis v0.23.0 // indirect
48-
github.com/go-openapi/errors v0.22.2 // indirect
49+
github.com/go-openapi/errors v0.22.3 // indirect
4950
github.com/go-openapi/jsonpointer v0.21.1 // indirect
5051
github.com/go-openapi/jsonreference v0.21.0 // indirect
5152
github.com/go-openapi/loads v0.22.0 // indirect
5253
github.com/go-openapi/runtime v0.28.0 // indirect
5354
github.com/go-openapi/spec v0.21.0 // indirect
54-
github.com/go-openapi/strfmt v0.23.0 // indirect
55+
github.com/go-openapi/strfmt v0.24.0 // indirect
5556
github.com/go-openapi/swag v0.23.1 // indirect
5657
github.com/go-openapi/validate v0.24.0 // indirect
5758
github.com/go-playground/locales v0.14.1 // indirect
@@ -68,7 +69,7 @@ require (
6869
github.com/hashicorp/go-safetemp v1.0.0 // indirect
6970
github.com/hashicorp/go-version v1.7.0 // indirect
7071
github.com/hashicorp/hcl/v2 v2.22.0 // indirect
71-
github.com/hashicorp/terraform-json v0.26.0 // indirect
72+
github.com/hashicorp/terraform-json v0.27.2 // indirect
7273
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
7374
github.com/jinzhu/copier v0.4.0 // indirect
7475
github.com/josharian/intern v1.0.0 // indirect
@@ -80,7 +81,6 @@ require (
8081
github.com/mitchellh/go-homedir v1.1.0 // indirect
8182
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
8283
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
83-
github.com/mitchellh/mapstructure v1.5.0 // indirect
8484
github.com/oklog/ulid v1.3.1 // indirect
8585
github.com/opentracing/opentracing-go v1.2.0 // indirect
8686
github.com/pjbgf/sha1cd v0.3.2 // indirect
@@ -91,19 +91,19 @@ require (
9191
github.com/tmccombs/hcl2json v0.6.4 // indirect
9292
github.com/ulikunitz/xz v0.5.11 // indirect
9393
github.com/xanzy/ssh-agent v0.3.3 // indirect
94-
github.com/zclconf/go-cty v1.16.3 // indirect
95-
go.mongodb.org/mongo-driver v1.17.3 // indirect
94+
github.com/zclconf/go-cty v1.16.4 // indirect
95+
go.mongodb.org/mongo-driver v1.17.4 // indirect
9696
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
9797
go.opentelemetry.io/otel v1.35.0 // indirect
9898
go.opentelemetry.io/otel/metric v1.35.0 // indirect
9999
go.opentelemetry.io/otel/trace v1.35.0 // indirect
100-
golang.org/x/crypto v0.41.0 // indirect
101-
golang.org/x/mod v0.26.0 // indirect
102-
golang.org/x/net v0.42.0 // indirect
100+
golang.org/x/crypto v0.43.0 // indirect
101+
golang.org/x/mod v0.28.0 // indirect
102+
golang.org/x/net v0.45.0 // indirect
103103
golang.org/x/sync v0.17.0 // indirect
104-
golang.org/x/sys v0.35.0 // indirect
105-
golang.org/x/text v0.28.0 // indirect
106-
golang.org/x/tools v0.35.0 // indirect
104+
golang.org/x/sys v0.37.0 // indirect
105+
golang.org/x/text v0.30.0 // indirect
106+
golang.org/x/tools v0.37.0 // indirect
107107
gopkg.in/warnings.v0 v0.1.2 // indirect
108108
gopkg.in/yaml.v2 v2.4.0 // indirect
109109
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)