From beca6de71ba2c87c981cf12a997eb6008984c801 Mon Sep 17 00:00:00 2001 From: Paschalis Tsilias Date: Tue, 28 Jan 2020 15:33:42 +0200 Subject: [PATCH] Add packer.ExpandUser() function to support tilde in usage of config.ValidationKeyPath (#8657) --- provisioner/chef-client/provisioner.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/provisioner/chef-client/provisioner.go b/provisioner/chef-client/provisioner.go index cd0a32ff0..c2feca22b 100644 --- a/provisioner/chef-client/provisioner.go +++ b/provisioner/chef-client/provisioner.go @@ -276,8 +276,12 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C } if p.config.ValidationKeyPath != "" { + path, err := packer.ExpandUser(p.config.ValidationKeyPath) + if err != nil { + return fmt.Errorf("Error while expanding a tilde in the validation key: %s", err) + } remoteValidationKeyPath = fmt.Sprintf("%s/validation.pem", p.config.StagingDir) - if err := p.uploadFile(ui, comm, remoteValidationKeyPath, p.config.ValidationKeyPath); err != nil { + if err := p.uploadFile(ui, comm, remoteValidationKeyPath, path); err != nil { return fmt.Errorf("Error copying validation key: %s", err) } }