MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: connection_string should override other params (#10180)

Browse Source 
closes #9965
This commit is contained in:
Harshavardhana 2020-08-03 09:16:00 -07:00 committed by GitHub
parent d8be9f12a2
commit d61eac080b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile.arm.release
View File

@ -23,8 +23,7 @@ RUN \
chmod +x /usr/bin/minio && \ chmod +x /usr/bin/minio && \
chmod +x /usr/bin/docker-entrypoint.sh && \ chmod +x /usr/bin/docker-entrypoint.sh && \
chmod +x /usr/bin/verify-minio.sh && \ chmod +x /usr/bin/verify-minio.sh && \
curl -s -q -O https://raw.githubusercontent.com/minio/minio/master/CREDITS && \ curl -s -q -O https://raw.githubusercontent.com/minio/minio/master/CREDITS
/usr/bin/verify-minio.sh
EXPOSE 9000 EXPOSE 9000

2
cmd/config/notify/legacy.go
View File

@ -331,7 +331,7 @@ func SetNotifyPostgres(s config.Config, psqName string, cfg target.PostgreSQLArg
}, },
config.KV{ config.KV{
Key: target.PostgresUsername, Key: target.PostgresUsername,
Value: cfg.User, Value: cfg.Username,
}, },
config.KV{ config.KV{
Key: target.PostgresPassword, Key: target.PostgresPassword,

33
pkg/event/target/postgresql.go
View File

@ -116,7 +116,7 @@ type PostgreSQLArgs struct {
Table string `json:"table"` Table string `json:"table"`
Host xnet.Host `json:"host"` // default: localhost Host xnet.Host `json:"host"` // default: localhost
Port string `json:"port"` // default: 5432 Port string `json:"port"` // default: 5432
User string `json:"user"` // default: user running minio Username string `json:"username"` // default: user running minio
Password string `json:"password"` // default: no password Password string `json:"password"` // default: no password
Database string `json:"database"` // default: same as user Database string `json:"database"` // default: same as user
QueueDir string `json:"queueDir"` QueueDir string `json:"queueDir"`
@ -357,20 +357,23 @@ func (target *PostgreSQLTarget) executeStmts() error {
// NewPostgreSQLTarget - creates new PostgreSQL target. // NewPostgreSQLTarget - creates new PostgreSQL target.
func NewPostgreSQLTarget(id string, args PostgreSQLArgs, doneCh <-chan struct{}, loggerOnce func(ctx context.Context, err error, id interface{}, kind ...interface{}), test bool) (*PostgreSQLTarget, error) { func NewPostgreSQLTarget(id string, args PostgreSQLArgs, doneCh <-chan struct{}, loggerOnce func(ctx context.Context, err error, id interface{}, kind ...interface{}), test bool) (*PostgreSQLTarget, error) {
params := []string{args.ConnectionString} params := []string{args.ConnectionString}
if !args.Host.IsEmpty() { if args.ConnectionString == "" {
params = append(params, "host="+args.Host.String()) params = []string{}
} if !args.Host.IsEmpty() {
if args.Port != "" { params = append(params, "host="+args.Host.String())
params = append(params, "port="+args.Port) }
} if args.Port != "" {
if args.User != "" { params = append(params, "port="+args.Port)
params = append(params, "user="+args.User) }
} if args.Username != "" {
if args.Password != "" { params = append(params, "username="+args.Username)
params = append(params, "password="+args.Password) }
} if args.Password != "" {
if args.Database != "" { params = append(params, "password="+args.Password)
params = append(params, "dbname="+args.Database) }
if args.Database != "" {
params = append(params, "dbname="+args.Database)
}
} }
connStr := strings.Join(params, " ") connStr := strings.Join(params, " ")