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

Remove non-standard environment variables in prep for 0.8.

This commit is contained in:
Sean Chittenden 2016-12-12 15:21:00 -08:00
parent 6ed37770c3
commit 2ecd42c0be
No known key found for this signature in database
GPG Key ID: 4EBC9DC16C2E5E16
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,10 +14,9 @@ func Provider() terraform.ResourceProvider {
return &schema.Provider{ return &schema.Provider{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"host": { "host": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
// TODO(sean@): Remove POSTGRESQL_HOST in 0.8 DefaultFunc: schema.EnvDefaultFunc("PGHOST", nil),
DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGHOST", "POSTGRESQL_HOST"}, nil),
Description: "Name of PostgreSQL server address to connect to", Description: "Name of PostgreSQL server address to connect to",
}, },
"port": { "port": {
@ -33,17 +32,15 @@ func Provider() terraform.ResourceProvider {
DefaultFunc: schema.EnvDefaultFunc("PGDATABASE", "postgres"), DefaultFunc: schema.EnvDefaultFunc("PGDATABASE", "postgres"),
}, },
"username": { "username": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
// TODO(sean@): Remove POSTGRESQL_USER in 0.8 DefaultFunc: schema.EnvDefaultFunc("PGUSER", "postgres"),
DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGUSER", "POSTGRESQL_USER"}, "postgres"),
Description: "PostgreSQL user name to connect as", Description: "PostgreSQL user name to connect as",
}, },
"password": { "password": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
// TODO(sean@): Remove POSTGRESQL_PASSWORD in 0.8 DefaultFunc: schema.EnvDefaultFunc("PGPASSWORD", nil),
DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGPASSWORD", "POSTGRESQL_PASSWORD"}, nil),
Description: "Password to be used if the PostgreSQL server demands password authentication", Description: "Password to be used if the PostgreSQL server demands password authentication",
}, },
"sslmode": { "sslmode": {