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

No need to do this as they both are in their own scope

This commit is contained in:
Joshua Seidel 2015-07-09 09:31:31 -04:00
parent 4070805fcd
commit cda814d8b3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/provisioners/chef/resource_provisioner.go
View File

@ -224,18 +224,18 @@ func (r *ResourceProvisioner) decodeConfig(c *terraform.ResourceConfig) (*Provis
}
if p.ValidationKeyPath != "" {
vkeyPath, err := homedir.Expand(p.ValidationKeyPath)
keyPath, err := homedir.Expand(p.ValidationKeyPath)
if err != nil {
return nil, fmt.Errorf("Error expanding the validation key path: %v", err)
}
p.ValidationKeyPath = vkeyPath
p.ValidationKeyPath = keyPath
}
if p.SecretKeyPath != "" {
skeyPath, err := homedir.Expand(p.SecretKeyPath)
keyPath, err := homedir.Expand(p.SecretKeyPath)
if err != nil {
return nil, fmt.Errorf("Error expanding the secret key path: %v", err)
}
p.SecretKeyPath = skeyPath
p.SecretKeyPath = keyPath
}
if attrs, ok := c.Config["attributes"]; ok {
p.Attributes, err = rawToJSON(attrs)