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

Add comments requesting that the testing-specific environment variables 

can be removed in Terraform 0.8.0
This commit is contained in:
Sean Chittenden 2016-09-05 16:24:26 -07:00
parent b68ef2c40b
commit ec130d538c
No known key found for this signature in database
GPG Key ID: 4EBC9DC16C2E5E16
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,8 +11,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,
// FIXME: Remove POSTGRESQL_HOST in 0.8
DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGHOST", "POSTGRESQL_HOST"}, nil), DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGHOST", "POSTGRESQL_HOST"}, nil),
Description: "The PostgreSQL server address", Description: "The PostgreSQL server address",
}, },
@ -23,14 +24,16 @@ func Provider() terraform.ResourceProvider {
Description: "The PostgreSQL server port", Description: "The PostgreSQL server port",
}, },
"username": { "username": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
// FIXME: Remove POSTGRESQL_USER in 0.8
DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGUSER", "POSTGRESQL_USER"}, nil), DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGUSER", "POSTGRESQL_USER"}, nil),
Description: "Username for PostgreSQL server connection", Description: "Username for PostgreSQL server connection",
}, },
"password": { "password": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
// FIXME: Remove POSTGRESQL_PASSWORD in 0.8
DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGPASSWORD", "POSTGRESQL_PASSWORD"}, nil), DefaultFunc: schema.MultiEnvDefaultFunc([]string{"PGPASSWORD", "POSTGRESQL_PASSWORD"}, nil),
Description: "Password for PostgreSQL server connection", Description: "Password for PostgreSQL server connection",
}, },