From b471f6a1684320a90f65ef5aac7c0f87c69fb79b Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Fri, 10 Oct 2025 19:39:56 -0400 Subject: Remove the need for .env files --- scripts/lib/docker.sh | 92 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 31 deletions(-) (limited to 'scripts/lib/docker.sh') diff --git a/scripts/lib/docker.sh b/scripts/lib/docker.sh index 6488bb0..c6f3c34 100644 --- a/scripts/lib/docker.sh +++ b/scripts/lib/docker.sh @@ -4,21 +4,65 @@ readonly BOLT_DOCKER_LOADED=1 source "$(dirname "${BASH_SOURCE[0]}")/log.sh" +readonly BOLT_POSTGRES_DB="${POSTGRES_DB:-test_db}" +readonly BOLT_POSTGRES_USER="${POSTGRES_USER:-test_user}" +readonly BOLT_POSTGRES_PASSWORD="${POSTGRES_PASSWORD:-testpassword}" + +readonly BOLT_MYSQL_DATABASE="${MYSQL_DATABASE:-test_db}" +readonly BOLT_MYSQL_USER="${MYSQL_USER:-test_user}" +readonly BOLT_MYSQL_PASSWORD="${MYSQL_PASSWORD:-testpassword}" +readonly BOLT_MYSQL_ROOT_PASSWORD="${MYSQL_ROOT_PASSWORD:-testpassword}" + +readonly BOLT_MSSQL_SA_PASSWORD="${MSSQL_SA_PASSWORD:-TestPass123!}" + +# Generate database DSN string for a given database type +# +# DESCRIPTION: +# Creates a connection string using the same credentials as the Docker containers. +# This ensures perfect synchronization between container setup and Go test configuration. +# +# ARGUMENTS: +# $1: Database type (postgresql, mysql, mssql, sqlite3) +# +# OUTPUTS: +# Prints the DSN string to stdout +# +# RETURN: +# 0 - DSN generated successfully +# 1 - Unknown database type +# +docker_generate_dsn() { + local db_type="$1" + + case "$db_type" in + "postgresql") + echo "postgresql://${BOLT_POSTGRES_USER}:${BOLT_POSTGRES_PASSWORD}@localhost:5432/${BOLT_POSTGRES_DB}?sslmode=disable" + ;; + "mysql") + echo "${BOLT_MYSQL_USER}:${BOLT_MYSQL_PASSWORD}@tcp(localhost:3306)/${BOLT_MYSQL_DATABASE}?parseTime=true" + ;; + "mssql") + local url_encoded_password + url_encoded_password=$(printf %s "$BOLT_MSSQL_SA_PASSWORD" | jq --slurp --raw-input --raw-output @uri) + echo "sqlserver://sa:${url_encoded_password}@localhost:1433?database=master" + ;; + "sqlite3") + echo "/tmp/bolt_test.db" + ;; + *) + log_error "Unknown database type: $db_type" + return 1 + ;; + esac +} + # Start a PostgreSQL database container # # ARGUMENTS: # $1: Container name (default: bolt_postgresql_db) # -# ENVIRONMENT: -# - POSTGRES_DB (default: test_db) -# - POSTGRES_USER (default: test_user) -# - POSTGRES_PASSWORD (default: testpassword) -# docker_start_postgresql() { local container_name="${1:-bolt_postgresql_db}" - local postgres_db="${POSTGRES_DB:-test_db}" - local postgres_user="${POSTGRES_USER:-test_user}" - local postgres_password="${POSTGRES_PASSWORD:-testpassword}" log_info "Starting PostgreSQL container '$container_name'..." @@ -29,9 +73,9 @@ docker_start_postgresql() { --health-interval 10s \ --health-timeout 5s \ --health-retries 5 \ - --env POSTGRES_DB="$postgres_db" \ - --env POSTGRES_USER="$postgres_user" \ - --env POSTGRES_PASSWORD="$postgres_password" \ + --env POSTGRES_DB="$BOLT_POSTGRES_DB" \ + --env POSTGRES_USER="$BOLT_POSTGRES_USER" \ + --env POSTGRES_PASSWORD="$BOLT_POSTGRES_PASSWORD" \ postgres:16.1-alpine3.19 } @@ -40,18 +84,8 @@ docker_start_postgresql() { # ARGUMENTS: # $1: Container name (default: bolt_mysql_db) # -# ENVIRONMENT: -# - MYSQL_DATABASE (default: test_db) -# - MYSQL_USER (default: test_user) -# - MYSQL_PASSWORD (default: testpassword) -# - MYSQL_ROOT_PASSWORD (default: testpassword) -# docker_start_mysql() { local container_name="${1:-bolt_mysql_db}" - local mysql_database="${MYSQL_DATABASE:-test_db}" - local mysql_user="${MYSQL_USER:-test_user}" - local mysql_password="${MYSQL_PASSWORD:-testpassword}" - local mysql_root_password="${MYSQL_ROOT_PASSWORD:-testpassword}" log_info "Starting MySQL container '$container_name'..." @@ -62,10 +96,10 @@ docker_start_mysql() { --health-interval 10s \ --health-timeout 5s \ --health-retries 5 \ - --env MYSQL_DATABASE="$mysql_database" \ - --env MYSQL_USER="$mysql_user" \ - --env MYSQL_PASSWORD="$mysql_password" \ - --env MYSQL_ROOT_PASSWORD="$mysql_root_password" \ + --env MYSQL_DATABASE="$BOLT_MYSQL_DATABASE" \ + --env MYSQL_USER="$BOLT_MYSQL_USER" \ + --env MYSQL_PASSWORD="$BOLT_MYSQL_PASSWORD" \ + --env MYSQL_ROOT_PASSWORD="$BOLT_MYSQL_ROOT_PASSWORD" \ mysql:8.3 } @@ -74,25 +108,21 @@ docker_start_mysql() { # ARGUMENTS: # $1: Container name (default: bolt_mssql_db) # -# ENVIRONMENT: -# - MSSQL_SA_PASSWORD (default: TestPass123!) -# docker_start_mssql() { local container_name="${1:-bolt_mssql_db}" - local mssql_sa_password="${MSSQL_SA_PASSWORD:-TestPass123!}" log_info "Starting MSSQL container '$container_name'..." docker run --detach \ --name "$container_name" \ --publish 1433:1433 \ - --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $mssql_sa_password -Q 'SELECT 1' -C || exit 1" \ + --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $BOLT_MSSQL_SA_PASSWORD -Q 'SELECT 1' -C || exit 1" \ --health-interval 10s \ --health-timeout 3s \ --health-start-period 10s \ --health-retries 10 \ --env ACCEPT_EULA=Y \ - --env MSSQL_SA_PASSWORD="$mssql_sa_password" \ + --env MSSQL_SA_PASSWORD="$BOLT_MSSQL_SA_PASSWORD" \ mcr.microsoft.com/mssql/server:2022-latest } -- cgit v1.2.3