Skip to content

Commit f260178

Browse files
Add GCP IAM database authentication support
- Add database_passwordless_gcp_use_default_credentials variable - Add DATABASE_AUTH_USE_GCP_IAM environment variable configuration - Required for GCP postgres passwordless authentication in terraform-google-terraform-enterprise
1 parent 6c5ed8a commit f260178

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

modules/runtime_container_engine_config/database_config.tf

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,20 @@ locals {
1616
TFE_DATABASE_PASSWORDLESS_AZURE_CLIENT_ID = var.database_passwordless_azure_client_id
1717
TFE_DATABASE_PASSWORDLESS_AWS_USE_INSTANCE_PROFILE = var.database_passwordless_aws_use_iam
1818
TFE_DATABASE_PASSWORDLESS_AWS_REGION = var.database_passwordless_aws_region
19+
TFE_DATABASE_PASSWORDLESS_GCP_USE_DEFAULT_CREDENTIALS = var.database_passwordless_gcp_use_default_credentials
1920
DATABASE_AUTH_USE_AWS_IAM = var.database_passwordless_aws_use_iam
2021
DATABASE_AUTH_AWS_DB_REGION = var.database_passwordless_aws_region
22+
DATABASE_AUTH_USE_GCP_IAM = var.database_passwordless_gcp_use_default_credentials
2123
}
2224
database_configuration = local.disk ? {} : local.database
2325
explorer_database = {
24-
TFE_EXPLORER_DATABASE_HOST = var.explorer_database_host
25-
TFE_EXPLORER_DATABASE_NAME = var.explorer_database_name
26-
TFE_EXPLORER_DATABASE_USER = var.explorer_database_user
27-
TFE_EXPLORER_DATABASE_PASSWORD = var.explorer_database_password
28-
TFE_EXPLORER_DATABASE_PARAMETERS = var.explorer_database_parameters
26+
TFE_EXPLORER_DATABASE_HOST = var.explorer_database_host
27+
TFE_EXPLORER_DATABASE_NAME = var.explorer_database_name
28+
TFE_EXPLORER_DATABASE_USER = var.explorer_database_user
29+
TFE_EXPLORER_DATABASE_PASSWORD = var.explorer_database_password
30+
TFE_EXPLORER_DATABASE_PARAMETERS = var.explorer_database_parameters
31+
TFE_EXPLORER_DATABASE_PASSWORDLESS_AZURE_USE_MSI = var.explorer_database_passwordless_azure_use_msi
32+
TFE_EXPLORER_DATABASE_PASSWORDLESS_AZURE_CLIENT_ID = var.explorer_database_passwordless_azure_client_id
2933
}
3034
explorer_database_configuration = var.explorer_database_host == null ? {} : local.explorer_database
3135
}

modules/runtime_container_engine_config/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,12 @@ variable "database_passwordless_aws_region" {
118118
description = "AWS region for IAM database authentication. Required when database_passwordless_aws_use_iam is true."
119119
}
120120

121+
variable "database_passwordless_gcp_use_default_credentials" {
122+
default = false
123+
type = bool
124+
description = "Whether or not to use Google Cloud default credentials (IAM) to connect to the PostgreSQL database. Defaults to false if no value is given."
125+
}
126+
121127
variable "explorer_database_host" {
122128
type = string
123129
default = null

0 commit comments

Comments
 (0)