ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provider/postgresql: Quote connection string parameters

This commit is contained in:
Igor Dubinskiy 2016-12-23 00:39:26 -08:00
parent 2d894bae48
commit 56a1ea9012
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/providers/postgresql/GNUmakefile
View File

@ -4,7 +4,8 @@ PSQL?=/opt/local/lib/postgresql96/bin/psql
PGDATA?=$(GOPATH)/src/github.com/hashicorp/terraform/builtin/providers/postgresql/data PGDATA?=$(GOPATH)/src/github.com/hashicorp/terraform/builtin/providers/postgresql/data
initdb:: initdb::
/opt/local/lib/postgresql96/bin/initdb --no-locale -U postgres -D $(PGDATA) echo "" > pwfile
/opt/local/lib/postgresql96/bin/initdb --no-locale -U postgres -A md5 --pwfile=pwfile -D $(PGDATA)
startdb:: startdb::
2>&1 \ 2>&1 \
@ -18,6 +19,7 @@ startdb::
cleandb:: cleandb::
rm -rf $(PGDATA) rm -rf $(PGDATA)
rm -f pwfile
freshdb:: cleandb initdb startdb freshdb:: cleandb initdb startdb

2
builtin/providers/postgresql/config.go
View File

@ -31,7 +31,7 @@ type Client struct {
func (c *Config) NewClient() (*Client, error) { func (c *Config) NewClient() (*Client, error) {
// NOTE: dbname must come before user otherwise dbname will be set to // NOTE: dbname must come before user otherwise dbname will be set to
// user. // user.
const dsnFmt = "host=%s port=%d dbname=%s user=%s password=%s sslmode=%s fallback_application_name=%s connect_timeout=%d" const dsnFmt = "host='%s' port='%d' dbname='%s' user='%s' password='%s' sslmode='%s' fallback_application_name='%s' connect_timeout='%d'"
logDSN := fmt.Sprintf(dsnFmt, c.Host, c.Port, c.Database, c.Username, "<redacted>", c.SSLMode, c.ApplicationName, c.ConnectTimeoutSec) logDSN := fmt.Sprintf(dsnFmt, c.Host, c.Port, c.Database, c.Username, "<redacted>", c.SSLMode, c.ApplicationName, c.ConnectTimeoutSec)
log.Printf("[INFO] PostgreSQL DSN: `%s`", logDSN) log.Printf("[INFO] PostgreSQL DSN: `%s`", logDSN)

3
builtin/providers/postgresql/provider.go
View File

@ -112,11 +112,10 @@ func tfAppName() string {
const VersionPrerelease = terraform.VersionPrerelease const VersionPrerelease = terraform.VersionPrerelease
var versionString bytes.Buffer var versionString bytes.Buffer
fmt.Fprintf(&versionString, "'Terraform v%s", terraform.Version) fmt.Fprintf(&versionString, "Terraform v%s", terraform.Version)
if terraform.VersionPrerelease != "" { if terraform.VersionPrerelease != "" {
fmt.Fprintf(&versionString, "-%s", terraform.VersionPrerelease) fmt.Fprintf(&versionString, "-%s", terraform.VersionPrerelease)
} }
fmt.Fprintf(&versionString, "'")
return versionString.String() return versionString.String()
} }