Skip to content

Commit

Permalink
fix/revert aws mod
Browse files Browse the repository at this point in the history
  • Loading branch information
kaiden-araki committed Mar 6, 2025
1 parent 661abfc commit a2b7b9e
Showing 1 changed file with 28 additions and 29 deletions.
57 changes: 28 additions & 29 deletions sequencer/database/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package database
import (
"context"
"database/sql"
"encoding/json"
"fmt"
"math/big"
"os"
Expand Down Expand Up @@ -75,34 +74,34 @@ func GetAwsSecrets(secretName, region string) (string, error) {
}

func GetDbCredentials() (port int, host, user, password, dbname, sslMode string) {
appMode := os.Getenv("APP_MODE")
sslMode = "disable"
if appMode == "test" || appMode == "main" {
sslMode = "require"
var secrets string
var err error
if appMode == "test" {
secrets, err = GetAwsSecrets(os.Getenv("TEST_AWS_DB_SECRET_NAME"), os.Getenv("AWS_REGION"))
} else {
secrets, err = GetAwsSecrets(os.Getenv("MAIN_AWS_DB_SECRET_NAME"), os.Getenv("AWS_REGION"))
}
if err != nil {
panic(err)
}
if secrets == "" {
panic("No secrets found in AWS Secrets Manager.")
}
var creds DBCredentials
err = json.Unmarshal([]byte(secrets), &creds)
if err != nil {
panic(err)
}
// TODO: for some reason RDS doesn't save dbname in the secrets, need to investigate
if creds.Dbname == "" {
creds.Dbname = "postgres"
}
return creds.Port, creds.Host, creds.Username, creds.Password, creds.Dbname, sslMode
}
// appMode := os.Getenv("APP_MODE")
// sslMode = "disable"
// if appMode == "test" || appMode == "main" {
// sslMode = "require"
// var secrets string
// var err error
// if appMode == "test" {
// secrets, err = GetAwsSecrets(os.Getenv("TEST_AWS_DB_SECRET_NAME"), os.Getenv("AWS_REGION"))
// } else {
// secrets, err = GetAwsSecrets(os.Getenv("MAIN_AWS_DB_SECRET_NAME"), os.Getenv("AWS_REGION"))
// }
// if err != nil {
// panic(err)
// }
// if secrets == "" {
// panic("No secrets found in AWS Secrets Manager.")
// }
// var creds DBCredentials
// err = json.Unmarshal([]byte(secrets), &creds)
// if err != nil {
// panic(err)
// }
// // TODO: for some reason RDS doesn't save dbname in the secrets, need to investigate
// if creds.Dbname == "" {
// creds.Dbname = "postgres"
// }
// return creds.Port, creds.Host, creds.Username, creds.Password, creds.Dbname, sslMode
// }

// running locally
host = os.Getenv("PGHOST")
Expand Down

0 comments on commit a2b7b9e

Please sign in to comment.