Skip to content

Commit e4837e8

Browse files
make db password optional for two way ssl
1 parent 43c7638 commit e4837e8

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

flow-state/store/postgres/connection.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ func NewDB(settings map[string]interface{}) (*sql.DB, error) {
8787
if cUser == "" {
8888
return nil, errors.New("Required Parameter User is missing")
8989
}
90-
cPassword := s.Password
91-
if cPassword == "" {
92-
return nil, errors.New("Required Parameter Password is missing")
93-
}
9490

9591
cMaxOpenConn := s.MaxOpenConnections
9692
if cMaxOpenConn == 0 {
@@ -143,12 +139,12 @@ func NewDB(settings map[string]interface{}) (*sql.DB, error) {
143139
var conninfo string
144140
if cTLSConfig == false {
145141
logCache.Debugf("Login attempting plain connection")
146-
conninfo = fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable connect_timeout=%d ", cHost, cPort, cUser, cPassword, cDbName, cConnTimeout)
142+
conninfo = fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable connect_timeout=%d ", cHost, cPort, cUser, s.Password, cDbName, cConnTimeout)
147143
} else {
148144
logCache.Debugf("Login attempting SSL connection")
149145
cTLSMode := s.TLSMode
150146
conninfo = fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=%s connect_timeout=%d ",
151-
cHost, cPort, cUser, cPassword, cDbName, decodeTLSParam(cTLSMode), cConnTimeout)
147+
cHost, cPort, cUser, s.Password, cDbName, decodeTLSParam(cTLSMode), cConnTimeout)
152148
//create temp file
153149
pwd, err := os.Getwd()
154150
if err != nil {

0 commit comments

Comments
 (0)