diff --git a/config/config.go b/config/config.go index 200be74..0f17ee5 100644 --- a/config/config.go +++ b/config/config.go @@ -6,23 +6,13 @@ import ( // Config contains all needed configurations type Config struct { - DatabaseUser string - DatabaseHost string - DatabasePassword string - DatabaseName string + DatabaseConnection string } // LoadConfig from path func LoadConfig() (*Config, error) { configuration := Config{ - DatabaseUser: os.Getenv("BUDGETEER_DB_USER"), - DatabaseHost: os.Getenv("BUDGETEER_DB_HOST"), - DatabasePassword: os.Getenv("BUDGETEER_DB_PASS"), - DatabaseName: os.Getenv("BUDGETEER_DB_NAME"), - } - - if configuration.DatabaseName == "" { - configuration.DatabaseName = "budgeteer" + DatabaseConnection: os.Getenv("BUDGETEER_DB"), } return &configuration, nil diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index bb051d0..26843b0 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -18,15 +18,14 @@ services: - ~/.go:/go - ~/.cache:/.cache environment: - BUDGETEER_DB_NAME: budgeteer - BUDGETEER_DB_USER: budgeteer - BUDGETEER_DB_PASS: budgeteer - BUDGETEER_DB_HOST: db:5432 + BUDGETEER_DB: postgres://budgeteer:budgeteer@db:5432/budgeteer depends_on: - db db: image: postgres:14 + ports: + - 5432:5432 volumes: - db:/var/lib/postgresql/data environment: diff --git a/postgres/conn.go b/postgres/conn.go index e6d815e..7df859e 100644 --- a/postgres/conn.go +++ b/postgres/conn.go @@ -18,8 +18,7 @@ type Database struct { } // Connect to a database -func Connect(server string, user string, password string, database string) (*Database, error) { - connString := fmt.Sprintf("postgres://%s:%s@%s/%s", user, password, server, database) +func Connect(connString string) (*Database, error) { conn, err := sql.Open("pgx", connString) if err != nil { return nil, fmt.Errorf("open connection: %w", err)