Skip to content

Commit a257060

Browse files
Revert "fix: PGSQL JDBC password parsing (#10)" (#12)
This reverts commit 20883f3.
1 parent 20883f3 commit a257060

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

main.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package main
22

33
import (
4-
"fmt"
54
"flag"
65
"log"
76
"net/http"
@@ -15,12 +14,6 @@ var addr = flag.String("addr", ":8080", "http service address")
1514

1615
var (
1716
Logger *log.Logger
18-
host string = os.Getenv("DB_HOST")
19-
port string = os.Getenv("DB_PORT")
20-
user string = os.Getenv("DB_USER")
21-
password string = os.Getenv("DB_PASSWORD")
22-
dbname string = os.Getenv("DB_NAME")
23-
params string = os.Getenv("DB_PARAMS")
2417
)
2518

2619
func main() {
@@ -45,10 +38,7 @@ func main() {
4538
}
4639

4740
func getOrganizationId(userId string) string {
48-
psqlInfo := fmt.Sprintf(
49-
"host=%s port=%s user=%s password=%s dbname=%s %s",
50-
host, port, user, password, dbname, params)
51-
db, dberr := sql.Open("postgres", psqlInfo)
41+
db, dberr := sql.Open("postgres", os.Getenv("DB_DSN"))
5242
if dberr != nil {
5343
log.Fatal("Failed to open a DB connection: ", dberr)
5444
}

0 commit comments

Comments
 (0)