From 194bc9419a2b306d81968faa9dbd9db9f980064a Mon Sep 17 00:00:00 2001 From: Thomas Gummerer Date: Fri, 3 May 2024 13:39:48 +0200 Subject: [PATCH] fixup --- pkg/resource/deploy/source_eval.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/resource/deploy/source_eval.go b/pkg/resource/deploy/source_eval.go index a0b7bc1f8888..f56eb56e6fac 100644 --- a/pkg/resource/deploy/source_eval.go +++ b/pkg/resource/deploy/source_eval.go @@ -534,15 +534,18 @@ 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 +2154,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)) }