iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clearer error message for artifice users. OCD nits and logging

This commit is contained in:
DanHam 2019-08-21 14:07:55 +01:00
parent e9ab2203ba
commit 7770ade74c
No known key found for this signature in database
GPG Key ID: 58E79AEDD6AA987E
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
post-processor/vagrant-cloud/post-processor.go
View File

@ -12,6 +12,7 @@ import (
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"log"
"os" "os"
"strings" "strings"
@ -95,7 +96,7 @@ func (p *PostProcessor) Configure(raws ...interface{}) error {
// Accumulate any errors // Accumulate any errors
errs := new(packer.MultiError) errs := new(packer.MultiError)
// required configuration // Required configuration
templates := map[string]*string{ templates := map[string]*string{
"box_tag": &p.config.Tag, "box_tag": &p.config.Tag,
"version": &p.config.Version, "version": &p.config.Version,
@ -109,7 +110,7 @@ func (p *PostProcessor) Configure(raws ...interface{}) error {
} }
} }
// create the HTTP client // Create the HTTP client
p.client, err = VagrantCloudClient{}.New(p.config.VagrantCloudUrl, p.config.AccessToken, p.insecureSkipTLSVerify) p.client, err = VagrantCloudClient{}.New(p.config.VagrantCloudUrl, p.config.AccessToken, p.insecureSkipTLSVerify)
if err != nil { if err != nil {
errs = packer.MultiErrorAppend( errs = packer.MultiErrorAppend(
@ -132,7 +133,7 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact
// We assume that there is only one .box file to upload // We assume that there is only one .box file to upload
if !strings.HasSuffix(artifact.Files()[0], ".box") { if !strings.HasSuffix(artifact.Files()[0], ".box") {
return nil, false, false, fmt.Errorf( return nil, false, false, fmt.Errorf(
"Unknown files in artifact, vagrant box is required: %s", artifact.Files()) "Unknown files in artifact, Vagrant box with .box suffix is required as first artifact file: %s", artifact.Files())
} }
if p.warnAtlasToken { if p.warnAtlasToken {
@ -231,6 +232,8 @@ func providerFromBuilderName(name string) string {
// Returns the Vagrant provider the box is intended for use with by // Returns the Vagrant provider the box is intended for use with by
// reading the metadata file packaged inside the box // reading the metadata file packaged inside the box
func providerFromVagrantBox(boxfile string) (providerName string, err error) { func providerFromVagrantBox(boxfile string) (providerName string, err error) {
log.Println("Attempting to determine provider from metadata in box file. This may take some time...")
f, err := os.Open(boxfile) f, err := os.Open(boxfile)
if err != nil { if err != nil {
return "", fmt.Errorf("Error attempting to open box file: %s", err) return "", fmt.Errorf("Error attempting to open box file: %s", err)