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

providers/aws: proper DefaultFunc to return nil if no env

This commit is contained in:
Mitchell Hashimoto 2014-09-09 21:46:50 -07:00
parent 281b59533d
commit 2317f7ea9b
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
builtin/providers/aws/provider.go
View File

@ -19,27 +19,21 @@ func Provider() *schema.Provider {
return &schema.Provider{ return &schema.Provider{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"region": &schema.Schema{ "region": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
DefaultFunc: func() (interface{}, error) { DefaultFunc: envDefaultFunc("AWS_REGION"),
return os.Getenv("AWS_REGION"), nil
},
}, },
"access_key": &schema.Schema{ "access_key": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
DefaultFunc: func() (interface{}, error) { DefaultFunc: envDefaultFunc("AWS_ACCESS_KEY"),
return os.Getenv("AWS_ACCESS_KEY"), nil
},
}, },
"secret_key": &schema.Schema{ "secret_key": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Required: true, Required: true,
DefaultFunc: func() (interface{}, error) { DefaultFunc: envDefaultFunc("AWS_SECRET_KEY"),
return os.Getenv("AWS_SECRET_KEY"), nil
},
}, },
}, },
@ -50,3 +44,13 @@ func Provider() *schema.Provider {
}, },
} }
} }
func envDefaultFunc(k string) schema.SchemaDefaultFunc {
return func() (interface{}, error) {
if v := os.Getenv(k); v != "" {
return v, nil
}
return nil, nil
}
}