From 61f47d440dafdc05ca960de70e2bc322606f4719 Mon Sep 17 00:00:00 2001 From: Joshua Seidel Date: Wed, 8 Jul 2015 20:06:37 -0400 Subject: [PATCH] correct space, fix reading of file --- .../provisioners/chef/resource_provisioner.go | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/builtin/provisioners/chef/resource_provisioner.go b/builtin/provisioners/chef/resource_provisioner.go index f8f75ab310..2b955d7340 100644 --- a/builtin/provisioners/chef/resource_provisioner.go +++ b/builtin/provisioners/chef/resource_provisioner.go @@ -175,6 +175,9 @@ func (r *ResourceProvisioner) Validate(c *terraform.ResourceConfig) (ws []string if p.ServerURL == "" { es = append(es, fmt.Errorf("Key not found: server_url")) } + if p.SecretKeyPath == "" { + es = append(es, fmt.Errorf("Key not found: secret_key_path")) + } if p.ValidationClientName == "" { es = append(es, fmt.Errorf("Key not found: validation_client_name")) } @@ -224,13 +227,19 @@ func (r *ResourceProvisioner) decodeConfig(c *terraform.ResourceConfig) (*Provis } if p.ValidationKeyPath != "" { - keyPath, err := homedir.Expand(p.ValidationKeyPath) + vkeyPath, err := homedir.Expand(p.ValidationKeyPath) if err != nil { return nil, fmt.Errorf("Error expanding the validation key path: %v", err) } - p.ValidationKeyPath = keyPath + p.ValidationKeyPath = vkeyPath } - + if p.SecretKeyPath != "" { + skeyPath, err := homedir.Expand(p.SecretKeyPath) + if err != nil { + return nil, fmt.Errorf("Error expanding the secret key path: %v", err) + } + p.SecretKeyPath = skeyPath + } if attrs, ok := c.Config["attributes"]; ok { p.Attributes, err = rawToJSON(attrs) if err != nil { @@ -336,7 +345,7 @@ func (p *Provisioner) deployConfigFiles( o terraform.UIOutput, comm communicator.Communicator, confDir string) error { - // Open the validation key file + // Open the validation key file f, err := os.Open(p.ValidationKeyPath) if err != nil { return err