Various changes to the PostgreSQL provider

builtin/providers/postgresql/GNUmakefile

@@ -0,0 +1,28 @@
+POSTGRES?=/opt/local/lib/postgresql96/bin/postgres
+PSQL?=/opt/local/lib/postgresql96/bin/psql
+
+PGDATA?=$(GOPATH)/src/github.com/hashicorp/terraform/builtin/providers/postgresql/data
+
+initdb::
+	/opt/local/lib/postgresql96/bin/initdb --no-locale -U postgres -D $(PGDATA)
+
+startdb::
+	2>&1 \
+	$(POSTGRES) \
+		-D $(PGDATA) \
+		-c log_connections=on \
+		-c log_disconnections=on \
+		-c log_duration=on \
+		-c log_statement=all \
+	| tee postgresql.log
+
+cleandb::
+	rm -rf $(PGDATA)
+
+freshdb:: cleandb initdb startdb
+
+test::
+	2>&1 PGSSLMODE=disable PGHOST=/tmp PGUSER=postgres make -C ../../.. testacc TEST=./builtin/providers/postgresql | tee test.log
+
+psql::
+	$(PSQL) -E postgres postgres

builtin/providers/postgresql/config.go

@@ -3,18 +3,22 @@ package postgresql
 import (
 	"database/sql"
 	"fmt"
+	"log"
 
 	_ "github.com/lib/pq" //PostgreSQL db
 )
 
 // Config - provider config
 type Config struct {
-	Host     string
-	Port     int
-	Username string
-	Password string
-	SslMode  string
-	Timeout  int
+	Host              string
+	Port              int
+	Database          string
+	Username          string
+	Password          string
+	SSLMode           string
+	ApplicationName   string
+	Timeout           int
+	ConnectTimeoutSec int
 }
 
 // Client struct holding connection string
@@ -25,8 +29,14 @@ type Client struct {
 
 // NewClient returns new client config
 func (c *Config) NewClient() (*Client, error) {
-	connStr := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=postgres sslmode=%s connect_timeout=%d", c.Host, c.Port, c.Username, c.Password, c.SslMode, c.Timeout)
+	// NOTE: dbname must come before user otherwise dbname will be set to
+	// user.
+	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)
+	log.Printf("[INFO] PostgreSQL DSN: `%s`", logDSN)
+
+	connStr := fmt.Sprintf(dsnFmt, c.Host, c.Port, c.Database, c.Username, c.Password, c.SSLMode, c.ApplicationName, c.ConnectTimeoutSec)
 	client := Client{
 		connStr:  connStr,
 		username: c.Username,

builtin/providers/postgresql/helpers.go

@@ -0,0 +1,24 @@
+package postgresql
+
+import (
+	"fmt"
+	"strings"
+)
+
+// pqQuoteLiteral returns a string literal safe for inclusion in a PostgreSQL
+// query as a parameter.  The resulting string still needs to be wrapped in
+// single quotes in SQL (i.e. fmt.Sprintf(`'%s'`, pqQuoteLiteral("str"))).  See
+// quote_literal_internal() in postgresql/backend/utils/adt/quote.c:77.
+func pqQuoteLiteral(in string) string {
+	in = strings.Replace(in, `\`, `\\`, -1)
+	in = strings.Replace(in, `'`, `''`, -1)
+	return in
+}
+
+func validateConnLimit(v interface{}, key string) (warnings []string, errors []error) {
+	value := v.(int)
+	if value < -1 {
+		errors = append(errors, fmt.Errorf("%s can not be less than -1", key))
+	}
+	return
+}

builtin/providers/postgresql/provider.go

@@ -1,6 +1,9 @@
 package postgresql
 
 import (
+	"bytes"
+	"fmt"
+
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
@@ -12,61 +15,89 @@ func Provider() terraform.ResourceProvider {
 		Schema: map[string]*schema.Schema{
 			"host": {
 				Type:        schema.TypeString,
-				Required:    true,
-				DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGHOST", "POSTGRESQL_HOST"}, nil),
-				Description: "The PostgreSQL server address",
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("PGHOST", nil),
+				Description: "Name of PostgreSQL server address to connect to",
 			},
 			"port": {
 				Type:        schema.TypeInt,
 				Optional:    true,
-				Default:     5432,
-				Description: "The PostgreSQL server port",
+				DefaultFunc: schema.EnvDefaultFunc("PGPORT", 5432),
+				Description: "The PostgreSQL port number to connect to at the server host, or socket file name extension for Unix-domain connections",
+			},
+			"database": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: "The name of the database to connect to in order to conenct to (defaults to `postgres`).",
+				DefaultFunc: schema.EnvDefaultFunc("PGDATABASE", "postgres"),
 			},
 			"username": {
 				Type:        schema.TypeString,
-				Required:    true,
-				DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGUSER", "POSTGRESQL_USER"}, nil),
-				Description: "Username for PostgreSQL server connection",
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("PGUSER", "postgres"),
+				Description: "PostgreSQL user name to connect as",
 			},
 			"password": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGPASSWORD", "POSTGRESQL_PASSWORD"}, nil),
-				Description: "Password for PostgreSQL server connection",
+				DefaultFunc: schema.EnvDefaultFunc("PGPASSWORD", nil),
+				Description: "Password to be used if the PostgreSQL server demands password authentication",
 			},
-			"ssl_mode": {
+			"sslmode": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				DefaultFunc: schema.EnvDefaultFunc("PGSSLMODE", "require"),
-				Description: "Connection mode for PostgreSQL server",
+				DefaultFunc: schema.EnvDefaultFunc("PGSSLMODE", nil),
+				Description: "This option determines whether or with what priority a secure SSL TCP/IP connection will be negotiated with the PostgreSQL server",
+			},
+			"ssl_mode": {
+				Type:       schema.TypeString,
+				Optional:   true,
+				Deprecated: "Rename PostgreSQL provider `ssl_mode` attribute to `sslmode`",
 			},
 			"connect_timeout": {
-				Type:        schema.TypeInt,
-				Optional:    true,
-				Default:     15,
-				DefaultFunc: schema.EnvDefaultFunc("PGCONNECT_TIMEOUT", nil),
-				Description: "Maximum wait for connection, in seconds. Zero or not specified means wait indefinitely.",
+				Type:         schema.TypeInt,
+				Optional:     true,
+				DefaultFunc:  schema.EnvDefaultFunc("PGCONNECT_TIMEOUT", 180),
+				Description:  "Maximum wait for connection, in seconds. Zero or not specified means wait indefinitely.",
+				ValidateFunc: validateConnTimeout,
 			},
 		},
 
 		ResourcesMap: map[string]*schema.Resource{
 			"postgresql_database":  resourcePostgreSQLDatabase(),
-			"postgresql_role":      resourcePostgreSQLRole(),
 			"postgresql_extension": resourcePostgreSQLExtension(),
+			"postgresql_schema":    resourcePostgreSQLSchema(),
+			"postgresql_role":      resourcePostgreSQLRole(),
 		},
 
 		ConfigureFunc: providerConfigure,
 	}
 }
 
+func validateConnTimeout(v interface{}, key string) (warnings []string, errors []error) {
+	value := v.(int)
+	if value < 0 {
+		errors = append(errors, fmt.Errorf("%s can not be less than 0", key))
+	}
+	return
+}
+
 func providerConfigure(d *schema.ResourceData) (interface{}, error) {
+	var sslMode string
+	if sslModeRaw, ok := d.GetOk("sslmode"); ok {
+		sslMode = sslModeRaw.(string)
+	} else {
+		sslMode = d.Get("ssl_mode").(string)
+	}
 	config := Config{
-		Host:     d.Get("host").(string),
-		Port:     d.Get("port").(int),
-		Username: d.Get("username").(string),
-		Password: d.Get("password").(string),
-		SslMode:  d.Get("ssl_mode").(string),
-		Timeout:  d.Get("connect_timeout").(int),
+		Host:              d.Get("host").(string),
+		Port:              d.Get("port").(int),
+		Database:          d.Get("database").(string),
+		Username:          d.Get("username").(string),
+		Password:          d.Get("password").(string),
+		SSLMode:           sslMode,
+		ApplicationName:   tfAppName(),
+		ConnectTimeoutSec: d.Get("connect_timeout").(int),
 	}
 
 	client, err := config.NewClient()
@@ -76,3 +107,16 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 
 	return client, nil
 }
+
+func tfAppName() string {
+	const VersionPrerelease = terraform.VersionPrerelease
+	var versionString bytes.Buffer
+
+	fmt.Fprintf(&versionString, "'Terraform v%s", terraform.Version)
+	if terraform.VersionPrerelease != "" {
+		fmt.Fprintf(&versionString, "-%s", terraform.VersionPrerelease)
+	}
+	fmt.Fprintf(&versionString, "'")
+
+	return versionString.String()
+}

builtin/providers/postgresql/provider_test.go

@@ -36,7 +36,4 @@ func testAccPreCheck(t *testing.T) {
 	if v := os.Getenv("PGUSER"); v == "" {
 		t.Fatal("PGUSER must be set for acceptance tests")
 	}
-	if v := os.Getenv("PGPASSWORD"); v == "" && host != "localhost" {
-		t.Fatal("PGPASSWORD must be set for acceptance tests if PGHOST is not localhost")
-	}
 }