diff --git a/pkg/plugins/go.mod b/pkg/plugins/go.mod index b6629fbee29..9bcc74e80f6 100644 --- a/pkg/plugins/go.mod +++ b/pkg/plugins/go.mod @@ -4,7 +4,6 @@ go 1.25.5 require ( github.com/Machiel/slugify v1.0.1 - github.com/Masterminds/semver/v3 v3.4.0 github.com/ProtonMail/go-crypto v1.3.0 github.com/gobwas/glob v0.2.3 github.com/google/go-cmp v0.7.0 diff --git a/pkg/plugins/go.sum b/pkg/plugins/go.sum index 87c76f9717c..2bd8adfbad2 100644 --- a/pkg/plugins/go.sum +++ b/pkg/plugins/go.sum @@ -2,8 +2,6 @@ github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEK github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Machiel/slugify v1.0.1 h1:EfWSlRWstMadsgzmiV7d0yVd2IFlagWH68Q+DcYCm4E= github.com/Machiel/slugify v1.0.1/go.mod h1:fTFGn5uWEynW4CUMG7sWkYXOf1UgDxyTM3DbR6Qfg3k= -github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= -github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw= diff --git a/pkg/server/wire_gen.go b/pkg/server/wire_gen.go index 36f13d7f382..9da2a58c9c3 100644 --- a/pkg/server/wire_gen.go +++ b/pkg/server/wire_gen.go @@ -715,8 +715,8 @@ func Initialize(ctx context.Context, cfg *setting.Cfg, opts Options, apiOpts api return nil, err } pluginscdnService := pluginscdn.ProvideService(pluginManagementCfg) - moduleHashCalculator := pluginassets2.ProvideModuleHashCalculator(pluginManagementCfg, pluginscdnService, signatureSignature, inMemory) - pluginassetsService := pluginassets2.ProvideService(pluginManagementCfg, pluginscdnService, moduleHashCalculator) + calculator := pluginassets2.ProvideModuleHashCalculator(pluginManagementCfg, pluginscdnService, signatureSignature, inMemory) + pluginassetsService := pluginassets2.ProvideService(pluginManagementCfg, pluginscdnService, calculator) avatarCacheServer := avatar.ProvideAvatarCacheServer(cfg) prefService := prefimpl.ProvideService(sqlStore, cfg) dashboardPermissionsService, err := ossaccesscontrol.ProvideDashboardPermissions(cfg, featureToggles, routeRegisterImpl, sqlStore, accessControl, ossLicensingService, dashboardService, folderimplService, acimplService, teamService, userService, actionSetService, dashboardServiceImpl, eventualRestConfigProvider) @@ -1384,8 +1384,8 @@ func InitializeForTest(ctx context.Context, t sqlutil.ITestDB, testingT interfac return nil, err } pluginscdnService := pluginscdn.ProvideService(pluginManagementCfg) - moduleHashCalculator := pluginassets2.ProvideModuleHashCalculator(pluginManagementCfg, pluginscdnService, signatureSignature, inMemory) - pluginassetsService := pluginassets2.ProvideService(pluginManagementCfg, pluginscdnService, moduleHashCalculator) + calculator := pluginassets2.ProvideModuleHashCalculator(pluginManagementCfg, pluginscdnService, signatureSignature, inMemory) + pluginassetsService := pluginassets2.ProvideService(pluginManagementCfg, pluginscdnService, calculator) avatarCacheServer := avatar.ProvideAvatarCacheServer(cfg) prefService := prefimpl.ProvideService(sqlStore, cfg) dashboardPermissionsService, err := ossaccesscontrol.ProvideDashboardPermissions(cfg, featureToggles, routeRegisterImpl, sqlStore, accessControl, ossLicensingService, dashboardService, folderimplService, acimplService, teamService, userService, actionSetService, dashboardServiceImpl, eventualRestConfigProvider)