fixup

pulumi · May 3, 2024 · bfa1c22 · bfa1c22
1 parent cda4384
commit bfa1c22
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/pkg/resource/deploy/source_eval.go b/pkg/resource/deploy/source_eval.go
@@ -534,15 +534,16 @@ func (d *defaultProviders) getDefaultProviderRef(req providers.ProviderRequest)
  return res.ref, res.err
 }
 
-func (d *defaultProviders) setProviderAsDefault(ref providers.Reference, pkg, version, pluginDownloadURL string) error {
- if version != "" {
- version = "-" + version
+func (d *defaultProviders) setProviderAsDefault(ref providers.Reference, pkg, pluginDownloadURL string, version *semver.Version) error {
+ var versionStr string
+ if version != nil {
+ versionStr = "-" + version.String()
  }
  if pluginDownloadURL != "" {
  pluginDownloadURL = "-" + pluginDownloadURL
  }
 
- key := pkg + version + pluginDownloadURL
+ key := pkg + versionStr + pluginDownloadURL
  d.providers[key] = ref
  if d.explicitDefaultProviders == nil {
  d.explicitDefaultProviders = make(map[string]bool)
@@ -2151,7 +2152,7 @@ func (rm *resmon) RegisterDefaultProvider(
  return nil, rpcerror.New(codes.InvalidArgument, fmt.Sprintf("failed to get plugin download URL: %v", err))
  }
  if err := rm.defaultProviders.setProviderAsDefault(
- ref, provider.Pkg().String(), version.String(), pluginDownloadURL,
+ ref, provider.Pkg().String(), pluginDownloadURL, version,
  ); err != nil {
  return nil, rpcerror.New(codes.InvalidArgument, fmt.Sprintf("failed to set default provider: %v", err))
  }