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

Allow empty api_key and endpoint_type 

These two provider options are optional though if they are not set,
the user will be prompted to enter values.

By changing them to use the envDefaultFuncAllowMissing, the values
are still passed in the environment if they are set and safely
discarded if they are not.
This commit is contained in:
Joe Topjian 2015-07-06 03:14:13 +00:00
parent e800a8d6cc
commit 5251193f87
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/providers/openstack/provider.go
View File

@ -44,7 +44,7 @@ func Provider() terraform.ResourceProvider {
"api_key": &schema.Schema{ "api_key": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
DefaultFunc: envDefaultFunc("OS_AUTH_TOKEN"), DefaultFunc: envDefaultFuncAllowMissing("OS_AUTH_TOKEN"),
}, },
"domain_id": &schema.Schema{ "domain_id": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
@ -64,7 +64,7 @@ func Provider() terraform.ResourceProvider {
"endpoint_type": &schema.Schema{ "endpoint_type": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
DefaultFunc: envDefaultFunc("OS_ENDPOINT_TYPE"), DefaultFunc: envDefaultFuncAllowMissing("OS_ENDPOINT_TYPE"),
}, },
}, },