internal/providercache: fix error message for protocol mismatch (#24818)
There was a bug in the installer trying to pass a nil error.
This commit is contained in:
parent
87bce5f9dd
commit
ce03f1255f
|
@ -505,7 +505,7 @@ func (c *InitCommand) getProviders(earlyConfig *earlyconfig.Config, state *state
|
||||||
diags = diags.Append(tfdiags.Sourceless(
|
diags = diags.Append(tfdiags.Sourceless(
|
||||||
tfdiags.Error,
|
tfdiags.Error,
|
||||||
"Failed to install provider",
|
"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) {
|
FetchPackageSuccess: func(provider addrs.Provider, version getproviders.Version, localDir string, authResult *getproviders.PackageAuthenticationResult) {
|
||||||
|
|
|
@ -343,7 +343,8 @@ NeedProvider:
|
||||||
protoErr = providerProtocolTooOld
|
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 {
|
if cb := evts.FetchPackageFailure; cb != nil {
|
||||||
cb(provider, version, err)
|
cb(provider, version, err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue