Skip to content

fix: crn parser #241

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 4 commits into from
Jun 27, 2025
Merged

fix: crn parser #241

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a665e5
fix: crn parser
Aayush-Abhyarthi Jun 26, 2025
1dcc460
fix: error
Aayush-Abhyarthi Jun 26, 2025
dda8db8
fix: redundant variable
Aayush-Abhyarthi Jun 26, 2025
7b2a353
add: planvalidation test
Aayush-Abhyarthi Jun 26, 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 main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ resource "ibm_sm_public_certificate_configuration_dns_cis" "public_dns_config" {

data "ibm_sm_arbitrary_secret" "ibm_secrets_manager_secret" {
provider = ibm.secret-store
count = var.private_key_secrets_manager_instance_guid != null ? 1 : 0
count = var.acme_letsencrypt_private_key == null ? 1 : 0
region = var.private_key_secrets_manager_region != null ? var.private_key_secrets_manager_region : var.region
instance_id = var.private_key_secrets_manager_instance_guid
secret_id = var.private_key_secrets_manager_secret_id
}

locals {
acme_letsencrypt_private_key = var.private_key_secrets_manager_instance_guid != null ? data.ibm_sm_arbitrary_secret.ibm_secrets_manager_secret[0].payload : var.acme_letsencrypt_private_key
acme_letsencrypt_private_key = var.acme_letsencrypt_private_key == null ? data.ibm_sm_arbitrary_secret.ibm_secrets_manager_secret[0].payload : var.acme_letsencrypt_private_key
}

# CA config - LetsEncrypt
Expand Down
8 changes: 5 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,7 +3,8 @@
########################################################################################################################

locals {
prefix = var.prefix != null ? trimspace(var.prefix) != "" ? "${var.prefix}-" : "" : ""
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
}

module "secrets_manager_crn_parser" {
Expand All @@ -13,6 +14,7 @@ module "secrets_manager_crn_parser" {
}

module "secret_crn_parser" {
count = local.parse_acme_lets_encrypt_private_key
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
version = "1.1.0"
crn = var.acme_letsencrypt_private_key_secrets_manager_secret_crn
Expand All @@ -22,8 +24,8 @@ locals {
existing_secrets_manager_guid = module.secrets_manager_crn_parser.service_instance
existing_secrets_manager_region = module.secrets_manager_crn_parser.region

secret_region = module.secret_crn_parser.region
secret_id = module.secret_crn_parser.resource
secret_region = local.parse_acme_lets_encrypt_private_key == 0 ? null : module.secret_crn_parser[0].region
secret_id = local.parse_acme_lets_encrypt_private_key == 0 ? null : module.secret_crn_parser[0].resource
}

module "secrets_manager_public_cert_engine" {
Expand Down
2 changes: 1 addition & 1 deletion tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func TestRunSolutionsFullyConfigurableUpgradeSchematics(t *testing.T) {
{Name: "prefix", Value: options.Prefix, DataType: "string"},
{Name: "existing_secrets_manager_crn", Value: permanentResources["secretsManagerCRN"], DataType: "string"},
{Name: "acme_letsencrypt_private_key_secrets_manager_secret_crn", Value: permanentResources["acme_letsencrypt_private_key_secret_crn"], DataType: "string"},
{Name: "dns_config_name", Value: "cert-dns", DataType: "string"},
{Name: "dns_config_name", Value: "cer-dns", DataType: "string"},
{Name: "internet_services_crn", Value: permanentResources["cisInstanceId"], DataType: "string"},
{Name: "skip_iam_authorization_policy", Value: true, DataType: "bool"}, // A permanent cis-sm auth policy already exists in the account
}
Expand Down