Remove non-standard environment variables in prep for 0.8.
This commit is contained in:
parent
6ed37770c3
commit
2ecd42c0be
|
@ -16,8 +16,7 @@ func Provider() terraform.ResourceProvider {
|
|||
"host": {
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
// TODO(sean@): Remove POSTGRESQL_HOST in 0.8
|
||||
DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGHOST", "POSTGRESQL_HOST"}, nil),
|
||||
DefaultFunc: schema.EnvDefaultFunc("PGHOST", nil),
|
||||
Description: "Name of PostgreSQL server address to connect to",
|
||||
},
|
||||
"port": {
|
||||
|
@ -35,15 +34,13 @@ func Provider() terraform.ResourceProvider {
|
|||
"username": {
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
// TODO(sean@): Remove POSTGRESQL_USER in 0.8
|
||||
DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGUSER", "POSTGRESQL_USER"}, "postgres"),
|
||||
DefaultFunc: schema.EnvDefaultFunc("PGUSER", "postgres"),
|
||||
Description: "PostgreSQL user name to connect as",
|
||||
},
|
||||
"password": {
|
||||
Type: schema.TypeString,
|
||||
Optional: true,
|
||||
// TODO(sean@): Remove POSTGRESQL_PASSWORD in 0.8
|
||||
DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGPASSWORD", "POSTGRESQL_PASSWORD"}, nil),
|
||||
DefaultFunc: schema.EnvDefaultFunc("PGPASSWORD", nil),
|
||||
Description: "Password to be used if the PostgreSQL server demands password authentication",
|
||||
},
|
||||
"sslmode": {
|
||||
|
|
Loading…
Reference in New Issue