Skip to content
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.

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

feat: re-add database ssl support #508

Merged
merged 1 commit into from
Sep 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@
],
"workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=cached",
"workspaceFolder": "/workspace",
"postAttachCommand": "make dev_setup"
"postAttachCommand": "sudo chown -R vscode:vscode /go && make dev_setup"
}
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ river-webui:
curl -L https://github.com/riverqueue/riverui/releases/latest/download/riverui_linux_amd64.gz | gzip -d > /tmp/riverui
chmod +x /tmp/riverui
@export $(shell grep -v '^#' .env | xargs) && \
VITE_RIVER_API_BASE_URL=http://localhost:8080/api DATABASE_URL=postgres://$$DB_USER:$$DB_PASS@dev.tycho:$$DB_PORT/$$DB_NAME /tmp/riverui
VITE_RIVER_API_BASE_URL=http://localhost:8080/api DATABASE_URL=postgres://$$DB_USER:$$DB_PASS@$$DB_HOST:$$DB_PORT/$$DB_NAME /tmp/riverui
2 changes: 1 addition & 1 deletion cmd/worker/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func main() {

log.Info().Str("commit", utils.Commit).Str("build_time", utils.BuildTime).Msg("starting worker")

dbString := fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s sslmode=%s", envAppConfig.DB_USER, envAppConfig.DB_PASS, envAppConfig.DB_HOST, envAppConfig.DB_PORT, envAppConfig.DB_NAME, envAppConfig.DB_SSL)
dbString := fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s sslmode=%s sslrootcert=%s", envAppConfig.DB_USER, envAppConfig.DB_PASS, envAppConfig.DB_HOST, envAppConfig.DB_PORT, envAppConfig.DB_NAME, envAppConfig.DB_SSL, envAppConfig.DB_SSL_ROOT_CERT)

db := database.NewDatabase(ctx, database.DatabaseConnectionInput{
DBString: dbString,
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ services:
- DB_PASS=PASSWORD
- DB_NAME=ganymede-prd
- DB_SSL=disable
#- DB_SSL_ROOT_CERT= # path to cert in the container if DB_SSL is not disabled
- JWT_SECRET=SECRET # set as a random string
- JWT_REFRESH_SECRET=SECRET # set as a random string
- TWITCH_CLIENT_ID= # from your twitch application
Expand Down
29 changes: 0 additions & 29 deletions internal/database/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,6 @@ type Database struct {
ConnPool *pgxpool.Pool
}

func InitializeDatabase(input DatabaseConnectionInput) {
client, err := ent.Open("postgres", input.DBString)

if err != nil {
log.Fatal().Err(err).Msg("error connecting to database")
}

if !input.IsWorker {
// Run auto migration
if err := client.Schema.Create(context.Background()); err != nil {
log.Fatal().Err(err).Msg("error running auto migration")
}
// check if any users exist
users, err := client.User.Query().All(context.Background())
if err != nil {
log.Panic().Err(err).Msg("error querying users")
}
// if no users exist, seed database
if len(users) == 0 {
// seed database
log.Debug().Msg("seeding database")
if err := seedDatabase(client); err != nil {
log.Panic().Err(err).Msg("error seeding database")
}
}
}
db = &Database{Client: client}
}

func DB() *Database {
return db
}
Expand Down
2 changes: 1 addition & 1 deletion internal/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func SetupApplication(ctx context.Context) (*Application, error) {
zerolog.SetGlobalLevel(zerolog.InfoLevel)
}

dbString := fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s sslmode=%s", envAppConfig.DB_USER, envAppConfig.DB_PASS, envAppConfig.DB_HOST, envAppConfig.DB_PORT, envAppConfig.DB_NAME, envAppConfig.DB_SSL)
dbString := fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s sslmode=%s sslrootcert=%s", envAppConfig.DB_USER, envAppConfig.DB_PASS, envAppConfig.DB_HOST, envAppConfig.DB_PORT, envAppConfig.DB_NAME, envAppConfig.DB_SSL, envAppConfig.DB_SSL_ROOT_CERT)

db := database.NewDatabase(ctx, database.DatabaseConnectionInput{
DBString: dbString,
Expand Down
Loading