Skip to content

refactor:update the prefix logic in DA #565

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 7 commits into from
Jan 24, 2025
Merged

refactor:update the prefix logic in DA #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
31b0ec9
refactor:update the prefix logic in DA
Jan 13, 2025
9577e34
update prefix value
Jan 15, 2025
84f9dfb
SKIP UPGRADE TEST
Jan 16, 2025
c044971
changed the description
Jan 22, 2025
afd33bf
Merge branch 'main' into 11959-prefix-pos
arya-girish-k Jan 22, 2025
828ae15
Merge branch 'main' into 11959-prefix-pos
arya-girish-k Jan 24, 2025
7efd747
Merge branch 'main' into 11959-prefix-pos
arya-girish-k Jan 24, 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: 3 additions & 1 deletion ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@
"key": "resource_group_name"
},
{
"key": "prefix"
"key": "prefix",
"required": true,
"description":"Prefix to add to all resources created by this solution. To not use any prefix value, you can enter the string `__NULL__`."
},
{
"key": "name"
Expand Down
8 changes: 4 additions & 4 deletions solutions/standard/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.1.6"
resource_group_name = var.use_existing_resource_group == false ? (var.prefix != null ? "${var.prefix}-${var.resource_group_name}" : var.resource_group_name) : null
resource_group_name = var.use_existing_resource_group == false ? ((var.prefix != null && var.prefix != "") ? "${var.prefix}-${var.resource_group_name}" : var.resource_group_name) : null
existing_resource_group_name = var.use_existing_resource_group == true ? var.resource_group_name : null
}

Expand All @@ -29,8 +29,8 @@ locals {

locals {
create_new_kms_key = !var.use_ibm_owned_encryption_key && var.existing_kms_key_crn == null ? true : false # no need to create any KMS resources if passing an existing key, or using IBM owned keys
postgres_key_name = var.prefix != null ? "${var.prefix}-${var.key_name}" : var.key_name
postgres_key_ring_name = var.prefix != null ? "${var.prefix}-${var.key_ring_name}" : var.key_ring_name
postgres_key_name = (var.prefix != null && var.prefix != "") ? "${var.prefix}-${var.key_name}" : var.key_name
postgres_key_ring_name = (var.prefix != null && var.prefix != "") ? "${var.prefix}-${var.key_ring_name}" : var.key_ring_name
}

module "kms" {
Expand Down Expand Up @@ -246,7 +246,7 @@ module "postgresql_db" {
source = "../../modules/fscloud"
depends_on = [time_sleep.wait_for_authorization_policy, time_sleep.wait_for_backup_kms_authorization_policy]
resource_group_id = module.resource_group.resource_group_id
name = var.prefix != null ? "${var.prefix}-${var.name}" : var.name
name = (var.prefix != null && var.prefix != "") ? "${var.prefix}-${var.name}" : var.name
region = var.region
remote_leader_crn = var.remote_leader_crn
skip_iam_authorization_policy = var.skip_pg_kms_auth_policy
Expand Down
4 changes: 2 additions & 2 deletions solutions/standard/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ variable "resource_group_name" {

variable "prefix" {
type = string
description = "Prefix to add to all resources created by this solution."
default = null
description = "Prefix to add to all resources created by this solution. To not use any prefix value, you can set this value to `null` or an empty string."
default = "postgresql"
}

variable "name" {
Expand Down