Skip to content

feat: Allow database username to be configured. #60

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 1 commit into from
Nov 25, 2025
Merged

feat: Allow database username to be configured. #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions .github/actions/setup-opentofu/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ runs:
"consumer_container_max" "consumer_cpu" "consumer_memory"
"consumer_message_threshold" "database_instance_count"
"database_instance_type" "database_password_rotation_frequency"
"database_skip_final_snapshot" "deletion_protection"
"deployment_environments" "environment" "export_expiration"
"image_tags_mutable" "key_recovery_period" "log_level" "program"
"project" "queue_empty_threshold" "redoer_container_count"
"redoer_cpu" "redoer_memory" "region" "repository"
"senzing_license_base64"
"database_skip_final_snapshot" "database_admin_username"
"deletion_protection" "deployment_environments" "environment"
"export_expiration" "image_tags_mutable" "key_recovery_period"
"log_level" "program" "project" "queue_empty_threshold"
"redoer_container_count" "redoer_cpu" "redoer_memory" "region"
"repository" "senzing_license_base64"
)
for var in ${variables[@]}; do
name="TF_VAR_$(echo $var | tr '[:lower:]' '[:upper:]')"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
TF_VAR_CONSUMER_CPU: ${{ secrets.TF_VAR_CONSUMER_CPU }}
TF_VAR_CONSUMER_MEMORY: ${{ secrets.TF_VAR_CONSUMER_MEMORY }}
TF_VAR_CONSUMER_MESSAGE_THRESHOLD: ${{ secrets.TF_VAR_CONSUMER_MESSAGE_THRESHOLD }}
TF_VAR_DATABASE_ADMIN_USERNAME: ${{ secrets.TF_VAR_DATABASE_ADMIN_USERNAME }}
TF_VAR_DATABASE_INSTANCE_COUNT: ${{ secrets.TF_VAR_DATABASE_INSTANCE_COUNT }}
TF_VAR_DATABASE_INSTANCE_TYPE: ${{ secrets.TF_VAR_DATABASE_INSTANCE_TYPE }}
TF_VAR_DATABASE_PASSWORD_ROTATION_FREQUENCY: ${{ secrets.TF_VAR_DATABASE_PASSWORD_ROTATION_FREQUENCY }}
Expand Down Expand Up @@ -107,6 +108,7 @@ jobs:
TF_VAR_CONSUMER_CPU: ${{ secrets.TF_VAR_CONSUMER_CPU }}
TF_VAR_CONSUMER_MEMORY: ${{ secrets.TF_VAR_CONSUMER_MEMORY }}
TF_VAR_CONSUMER_MESSAGE_THRESHOLD: ${{ secrets.TF_VAR_CONSUMER_MESSAGE_THRESHOLD }}
TF_VAR_DATABASE_ADMIN_USERNAME: ${{ secrets.TF_VAR_DATABASE_ADMIN_USERNAME }}
TF_VAR_DATABASE_INSTANCE_COUNT: ${{ secrets.TF_VAR_DATABASE_INSTANCE_COUNT }}
TF_VAR_DATABASE_INSTANCE_TYPE: ${{ secrets.TF_VAR_DATABASE_INSTANCE_TYPE }}
TF_VAR_DATABASE_PASSWORD_ROTATION_FREQUENCY: ${{ secrets.TF_VAR_DATABASE_PASSWORD_ROTATION_FREQUENCY }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/export.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
TF_VAR_CONSUMER_CPU: ${{ secrets.TF_VAR_CONSUMER_CPU }}
TF_VAR_CONSUMER_MEMORY: ${{ secrets.TF_VAR_CONSUMER_MEMORY }}
TF_VAR_CONSUMER_MESSAGE_THRESHOLD: ${{ secrets.TF_VAR_CONSUMER_MESSAGE_THRESHOLD }}
TF_VAR_DATABASE_ADMIN_USERNAME: ${{ secrets.TF_VAR_DATABASE_ADMIN_USERNAME }}
TF_VAR_DATABASE_INSTANCE_COUNT: ${{ secrets.TF_VAR_DATABASE_INSTANCE_COUNT }}
TF_VAR_DATABASE_INSTANCE_TYPE: ${{ secrets.TF_VAR_DATABASE_INSTANCE_TYPE }}
TF_VAR_DATABASE_PASSWORD_ROTATION_FREQUENCY: ${{ secrets.TF_VAR_DATABASE_PASSWORD_ROTATION_FREQUENCY }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/launch-tools.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
TF_VAR_CONSUMER_CPU: ${{ secrets.TF_VAR_CONSUMER_CPU }}
TF_VAR_CONSUMER_MEMORY: ${{ secrets.TF_VAR_CONSUMER_MEMORY }}
TF_VAR_CONSUMER_MESSAGE_THRESHOLD: ${{ secrets.TF_VAR_CONSUMER_MESSAGE_THRESHOLD }}
TF_VAR_DATABASE_ADMIN_USERNAME: ${{ secrets.TF_VAR_DATABASE_ADMIN_USERNAME }}
TF_VAR_DATABASE_INSTANCE_COUNT: ${{ secrets.TF_VAR_DATABASE_INSTANCE_COUNT }}
TF_VAR_DATABASE_INSTANCE_TYPE: ${{ secrets.TF_VAR_DATABASE_INSTANCE_TYPE }}
TF_VAR_DATABASE_PASSWORD_ROTATION_FREQUENCY: ${{ secrets.TF_VAR_DATABASE_PASSWORD_ROTATION_FREQUENCY }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/plan.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ on:
required: false
TF_VAR_CONSUMER_MESSAGE_THRESHOLD:
required: false
TF_VAR_DATABASE_ADMIN_USERNAME:
required: false
TF_VAR_DATABASE_INSTANCE_COUNT:
required: false
TF_VAR_DATABASE_INSTANCE_TYPE:
Expand Down Expand Up @@ -132,6 +134,7 @@ jobs:
TF_VAR_CONSUMER_CPU: ${{ secrets.TF_VAR_CONSUMER_CPU }}
TF_VAR_CONSUMER_MEMORY: ${{ secrets.TF_VAR_CONSUMER_MEMORY }}
TF_VAR_CONSUMER_MESSAGE_THRESHOLD: ${{ secrets.TF_VAR_CONSUMER_MESSAGE_THRESHOLD }}
TF_VAR_DATABASE_ADMIN_USERNAME: ${{ secrets.TF_VAR_DATABASE_ADMIN_USERNAME }}
TF_VAR_DATABASE_INSTANCE_COUNT: ${{ secrets.TF_VAR_DATABASE_INSTANCE_COUNT }}
TF_VAR_DATABASE_INSTANCE_TYPE: ${{ secrets.TF_VAR_DATABASE_INSTANCE_TYPE }}
TF_VAR_DATABASE_PASSWORD_ROTATION_FREQUENCY: ${{ secrets.TF_VAR_DATABASE_PASSWORD_ROTATION_FREQUENCY }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pull-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ jobs:
TF_VAR_CONSUMER_CPU: ${{ secrets.TF_VAR_CONSUMER_CPU }}
TF_VAR_CONSUMER_MEMORY: ${{ secrets.TF_VAR_CONSUMER_MEMORY }}
TF_VAR_CONSUMER_MESSAGE_THRESHOLD: ${{ secrets.TF_VAR_CONSUMER_MESSAGE_THRESHOLD }}
TF_VAR_DATABASE_ADMIN_USERNAME: ${{ secrets.TF_VAR_DATABASE_ADMIN_USERNAME }}
TF_VAR_DATABASE_INSTANCE_COUNT: ${{ secrets.TF_VAR_DATABASE_INSTANCE_COUNT }}
TF_VAR_DATABASE_INSTANCE_TYPE: ${{ secrets.TF_VAR_DATABASE_INSTANCE_TYPE }}
TF_VAR_DATABASE_PASSWORD_ROTATION_FREQUENCY: ${{ secrets.TF_VAR_DATABASE_PASSWORD_ROTATION_FREQUENCY }}
Expand Down
1 change: 1 addition & 0 deletions tofu/config/service/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ module "system" {

database_subnets = split(",", module.inputs.values["vpc/private_subnets"])
apply_database_updates_immediately = var.apply_database_updates_immediately
database_admin_username = var.database_admin_username
database_instance_count = var.database_instance_count
database_instance_type = var.database_instance_type
database_password_rotation_frequency = var.database_password_rotation_frequency
Expand Down
6 changes: 6 additions & 0 deletions tofu/config/service/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ variable "consumer_message_threshold" {
default = 250000
}

variable "database_admin_username" {
type = string
description = "Admin username for the database cluster."
default = "root"
}

variable "database_instance_count" {
type = number
description = "Number of instances in the database cluster."
Expand Down
2 changes: 1 addition & 1 deletion tofu/modules/system/database.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ module "database" {
kms_key_id = aws_kms_key.database.arn
backup_retention_period = 35

master_username = "root"
master_username = var.database_admin_username
manage_master_user_password_rotation = true
master_user_password_rotation_automatically_after_days = var.database_password_rotation_frequency

Expand Down
6 changes: 6 additions & 0 deletions tofu/modules/system/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ variable "consumer_message_threshold" {
default = 250000
}

variable "database_admin_username" {
type = string
description = "Admin username for the database cluster."
default = "root"
}

variable "database_instance_count" {
type = number
description = "Number of instances in the database cluster."
Expand Down
Loading