From f4c648f649cff90a590dbce6e8757b62dc69e7c5 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Wed, 16 Aug 2017 16:37:48 +0200 Subject: [PATCH 1/2] tools/terraform-bundle: Add missing Ui to ProviderInstaller (fix crash) --- tools/terraform-bundle/package.go | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/terraform-bundle/package.go b/tools/terraform-bundle/package.go index 2f0f33a89..6a6a40941 100644 --- a/tools/terraform-bundle/package.go +++ b/tools/terraform-bundle/package.go @@ -91,6 +91,7 @@ func (c *PackageCommand) Run(args []string) int { OS: osName, Arch: archName, + Ui: c.ui, } for name, constraints := range config.Providers { From bcd692af06ad8d7217692defb9b5d012cf3ccc51 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Wed, 16 Aug 2017 17:30:10 +0200 Subject: [PATCH 2/2] tools/terraform-bundle: Refactor & simplify messages --- tools/terraform-bundle/package.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/terraform-bundle/package.go b/tools/terraform-bundle/package.go index 6a6a40941..6c7ee51ed 100644 --- a/tools/terraform-bundle/package.go +++ b/tools/terraform-bundle/package.go @@ -19,8 +19,6 @@ import ( "github.com/mitchellh/cli" ) -const releasesBaseURL = "https://releases.hashicorp.com" - type PackageCommand struct { ui cli.Ui } @@ -94,16 +92,20 @@ func (c *PackageCommand) Run(args []string) int { Ui: c.ui, } + if len(config.Providers) > 0 { + c.ui.Output(fmt.Sprintf("Checking for available provider plugins on %s...", + discovery.GetReleaseHost())) + } + for name, constraints := range config.Providers { - c.ui.Info(fmt.Sprintf("Fetching provider %q...", name)) for _, constraint := range constraints { - meta, err := installer.Get(name, constraint.MustParse()) + c.ui.Output(fmt.Sprintf("- Resolving %q provider (%s)...", + name, constraint)) + _, err := installer.Get(name, constraint.MustParse()) if err != nil { - c.ui.Error(fmt.Sprintf("Failed to resolve %s provider %s: %s", name, constraint, err)) + c.ui.Error(fmt.Sprintf("- Failed to resolve %s provider %s: %s", name, constraint, err)) return 1 } - - c.ui.Info(fmt.Sprintf("- %q resolved to %s", constraint, meta.Version)) } } @@ -184,7 +186,7 @@ func (c *PackageCommand) bundleFilename(version discovery.VersionStr, time time. func (c *PackageCommand) coreURL(version discovery.VersionStr, osName, archName string) string { return fmt.Sprintf( "%s/terraform/%s/terraform_%s_%s_%s.zip", - releasesBaseURL, version, version, osName, archName, + discovery.GetReleaseHost(), version, version, osName, archName, ) }