From ce03f1255fa3f21a6a40d9eb2e13240f3313b2b2 Mon Sep 17 00:00:00 2001 From: Kristin Laemmert Date: Thu, 30 Apr 2020 11:12:04 -0400 Subject: [PATCH] internal/providercache: fix error message for protocol mismatch (#24818) There was a bug in the installer trying to pass a nil error. --- command/init.go | 2 +- internal/providercache/installer.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/command/init.go b/command/init.go index e5890a62b..49351e208 100644 --- a/command/init.go +++ b/command/init.go @@ -505,7 +505,7 @@ func (c *InitCommand) getProviders(earlyConfig *earlyconfig.Config, state *state diags = diags.Append(tfdiags.Sourceless( tfdiags.Error, "Failed to install provider", - fmt.Sprintf("Error while installing %s v%s: %s.", provider.ForDisplay(), version, err), + fmt.Sprintf("Error while installing %s v%s: %s", provider.ForDisplay(), version, err), )) }, FetchPackageSuccess: func(provider addrs.Provider, version getproviders.Version, localDir string, authResult *getproviders.PackageAuthenticationResult) { diff --git a/internal/providercache/installer.go b/internal/providercache/installer.go index b87600a63..1f446cd49 100644 --- a/internal/providercache/installer.go +++ b/internal/providercache/installer.go @@ -343,7 +343,8 @@ NeedProvider: protoErr = providerProtocolTooOld } - errs[provider] = fmt.Errorf(protoErr, provider, version, tfversion.String(), closestAvailable.String(), closestAvailable.String(), getproviders.VersionConstraintsString(reqs[provider])) + err := fmt.Errorf(protoErr, provider, version, tfversion.String(), closestAvailable.String(), closestAvailable.String(), getproviders.VersionConstraintsString(reqs[provider])) + errs[provider] = err if cb := evts.FetchPackageFailure; cb != nil { cb(provider, version, err) }