tinkering

hashicorp · Aug 14, 2018 · dc0c2d1 · dc0c2d1
1 parent 67d78ec
commit dc0c2d1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/common/progress.go b/common/progress.go
@@ -9,7 +9,7 @@ import (
 )
 
 // Default progress bar appearance
-func GetNewProgressBar(ui *packer.Ui) pb.ProgressBar {
+func GetNewProgressBar(ui *packer.Ui, uiWidth int) pb.ProgressBar {
 	bar := pb.New64(0)
 	bar.ShowPercent = true
 	bar.ShowCounters = true
@@ -29,14 +29,7 @@ func GetNewProgressBar(ui *packer.Ui) pb.ProgressBar {
 	UI := *ui
 
 	// Now check the UI's width to adjust the progress bar
-	uiWidth := UI.GetMinimumLength() + len("\n")
-
-	// If the UI's width is signed, then this interface doesn't really
-	// benefit from a progress bar
-	if uiWidth < 0 {
-		log.Println("Refusing to render progress-bar for unsupported UI.")
-		return *bar
-	}
+	uiWidth = uiWidth + len("\n")
 	bar.Callback = UI.Message
 
 	// Figure out the terminal width if possible

diff --git a/common/step_download.go b/common/step_download.go
@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"log"
+	"reflect"
 	"time"
 
 	"github.com/hashicorp/packer/helper/multistep"
@@ -47,7 +48,7 @@ type StepDownload struct {
 	Extension string
 }
 
-func (s *StepDownload) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
+func (s *StepDownload) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	cache := state.Get("cache").(packer.Cache)
 	ui := state.Get("ui").(packer.Ui)
 
@@ -64,7 +65,9 @@ func (s *StepDownload) Run(_ context.Context, state multistep.StateBag) multiste
 	ui.Say(fmt.Sprintf("Downloading or copying %s", s.Description))
 
 	// Get a default-looking progress bar and connect it to the ui.
-	bar := GetNewProgressBar(&ui)
+	myConfig := reflect.Indirect(reflect.ValueOf(state.Get("config")))
+	packerConf := myConfig.FieldByName("PackerConfig").Interface().(PackerConfig)
+	bar := GetNewProgressBar(&ui, len(packerConf.PackerBuildName)+len("==> : \n")) // this is stolen from ui.Message's prefix function
 
 	// First try to use any already downloaded file
 	// If it fails, proceed to regular download logic
@@ -145,8 +148,9 @@ func (s *StepDownload) download(config *DownloadConfig, state multistep.StateBag
 	var path string
 	ui := state.Get("ui").(packer.Ui)
 
-	// Get a default-looking progress bar and connect it to the ui.
-	bar := GetNewProgressBar(&ui)
+	myConfig := reflect.Indirect(reflect.ValueOf(state.Get("config")))
+	packerConf := myConfig.FieldByName("PackerConfig").Interface().(PackerConfig)
+	bar := GetNewProgressBar(&ui, len(packerConf.PackerBuildName)+len("==> : \n")) // this is stolen from ui.Message's prefix function
 
 	// Create download client with config and progress bar
 	download := NewDownloadClient(config, bar)

diff --git a/provisioner/file/provisioner.go b/provisioner/file/provisioner.go
@@ -127,7 +127,7 @@ func (p *Provisioner) ProvisionDownload(ui packer.Ui, comm packer.Communicator)
 		defer f.Close()
 
 		// Get a default progress bar
-		pb := common.GetNewProgressBar(&ui)
+		pb := common.GetNewProgressBar(&ui, 10)
 		bar := pb.Start()
 		defer bar.Finish()
 
@@ -177,7 +177,7 @@ func (p *Provisioner) ProvisionUpload(ui packer.Ui, comm packer.Communicator) er
 		}
 
 		// Get a default progress bar
-		pb := common.GetNewProgressBar(&ui)
+		pb := common.GetNewProgressBar(&ui, 10)
 		bar := pb.Start()
 		defer bar.Finish()
 

diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -600,7 +600,7 @@
 			"revisionTime": "2018-02-10T03:43:46Z"
 		},
 		{
-			"checksumSHA1": "Lf3uUXTkKK5DJ37BxQvxO1Fq+K8=",
+			"checksumSHA1": "dvabztWVQX8f6oMLRyv4dLH+TGY=",
 			"comment": "v1.0.0-3-g6d21280",
 			"path": "github.com/davecgh/go-spew/spew",
 			"revision": "346938d642f2ec3594ed81d874461961cd0faa76",