Skip to content

Commit 43ba0e2

Browse files
Fix terraform formatting issues
- Apply terraform fmt to align with CI/CD formatting requirements - Fix alignment in locals.tf for database module references - Fix alignment in main.tf for database module parameters - Fix alignment in modules/database/main.tf
1 parent 4e414ca commit 43ba0e2

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

locals.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ locals {
3131
parameters = null
3232
}
3333

34-
aurora_database = try(module.aurora_database[0], local.default_database)
35-
mtls_database = try(module.database_mtls[0], local.default_database)
36-
enterprise_db = try(module.edb[0], local.default_database)
37-
standard_db = try(module.database[0], local.default_database)
34+
aurora_database = try(module.aurora_database[0], local.default_database)
35+
mtls_database = try(module.database_mtls[0], local.default_database)
36+
enterprise_db = try(module.edb[0], local.default_database)
37+
standard_db = try(module.database[0], local.default_database)
3838

3939
selected_database = (
4040
var.enable_aurora && var.db_use_mtls ? error("Both enable_aurora and db_use_mtls cannot be true.") :

main.tf

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -161,21 +161,21 @@ module "database" {
161161
source = "./modules/database"
162162
count = local.enable_database_module ? 1 : 0
163163

164-
db_size = var.db_size
165-
db_backup_retention = var.db_backup_retention
166-
db_backup_window = var.db_backup_window
167-
db_name = var.db_name
168-
db_parameters = var.db_parameters
169-
db_username = var.db_username
170-
engine_version = var.postgres_engine_version
171-
friendly_name_prefix = var.friendly_name_prefix
172-
network_id = local.network_id
173-
network_private_subnet_cidrs = var.network_private_subnet_cidrs
174-
network_subnets_private = local.network_private_subnets
175-
tfe_instance_sg = module.vm.tfe_instance_sg
176-
kms_key_arn = local.kms_key_arn
177-
allow_major_version_upgrade = var.allow_major_version_upgrade
178-
allow_multiple_azs = var.allow_multiple_azs
164+
db_size = var.db_size
165+
db_backup_retention = var.db_backup_retention
166+
db_backup_window = var.db_backup_window
167+
db_name = var.db_name
168+
db_parameters = var.db_parameters
169+
db_username = var.db_username
170+
engine_version = var.postgres_engine_version
171+
friendly_name_prefix = var.friendly_name_prefix
172+
network_id = local.network_id
173+
network_private_subnet_cidrs = var.network_private_subnet_cidrs
174+
network_subnets_private = local.network_private_subnets
175+
tfe_instance_sg = module.vm.tfe_instance_sg
176+
kms_key_arn = local.kms_key_arn
177+
allow_major_version_upgrade = var.allow_major_version_upgrade
178+
allow_multiple_azs = var.allow_multiple_azs
179179
enable_iam_database_authentication = var.postgres_enable_iam_auth && !var.postgres_use_password_auth
180180
}
181181

@@ -287,17 +287,17 @@ module "runtime_container_engine_config" {
287287
iact_time_limit = var.iact_subnet_time_limit
288288
run_pipeline_image = var.run_pipeline_image
289289

290-
database_name = local.database.name
291-
database_user = local.database.username
292-
database_password = local.database.password
293-
database_host = local.database.endpoint
294-
database_parameters = local.database.parameters
295-
database_use_mtls = var.db_use_mtls
296-
database_ca_cert_file = "/etc/ssl/private/terraform-enterprise/postgres/ca.crt"
297-
database_client_cert_file = "/etc/ssl/private/terraform-enterprise/postgres/cert.crt"
298-
database_client_key_file = "/etc/ssl/private/terraform-enterprise/postgres/key.key"
290+
database_name = local.database.name
291+
database_user = local.database.username
292+
database_password = local.database.password
293+
database_host = local.database.endpoint
294+
database_parameters = local.database.parameters
295+
database_use_mtls = var.db_use_mtls
296+
database_ca_cert_file = "/etc/ssl/private/terraform-enterprise/postgres/ca.crt"
297+
database_client_cert_file = "/etc/ssl/private/terraform-enterprise/postgres/cert.crt"
298+
database_client_key_file = "/etc/ssl/private/terraform-enterprise/postgres/key.key"
299299
database_passwordless_aws_use_iam = var.postgres_enable_iam_auth && !var.postgres_use_password_auth
300-
database_passwordless_aws_region = var.postgres_enable_iam_auth && !var.postgres_use_password_auth ? data.aws_region.current.name : ""
300+
database_passwordless_aws_region = var.postgres_enable_iam_auth && !var.postgres_use_password_auth ? data.aws_region.current.name : ""
301301

302302
explorer_database_name = local.explorer_database.name
303303
explorer_database_user = local.explorer_database.username

modules/database/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ resource "aws_db_instance" "postgresql" {
8383
kms_key_id = var.kms_key_arn
8484
storage_type = "gp2"
8585
vpc_security_group_ids = [aws_security_group.postgresql.id]
86-
86+
8787
# Enable IAM database authentication if requested
8888
iam_database_authentication_enabled = var.enable_iam_database_authentication
8989
}

0 commit comments

Comments
 (0)