mirror of
https://github.com/grafana/grafana.git
synced 2025-07-30 01:42:28 +08:00

* Plugins: Angular detector: Remote patterns fetching * Renamed PatternType to GCOMPatternType * Renamed files * Renamed more files * Moved files again * Add type checks, unexport GCOM structs * Cache failures, update log messages, fix GCOM URL * Fail silently for unknown pattern types, update docstrings * Fix tests * Rename gcomPattern.Value to gcomPattern.Pattern * Refactoring * Add FlagPluginsRemoteAngularDetectionPatterns feature flag * Fix tests * Re-generate feature flags * Add TestProvideInspector, renamed TestDefaultStaticDetectorsInspector * Add TestProvideInspector * Add TestContainsBytesDetector and TestRegexDetector * Renamed getter to provider * More tests * TestStaticDetectorsProvider, TestSequenceDetectorsProvider * GCOM tests * Lint * Made detector.detect unexported, updated docstrings * Allow changing grafana.com URL * Fix API path, add more logs * Update tryUpdateRemoteDetectors docstring * Use angulardetector http client * Return false, nil if module.js does not exist * Chore: Split angualrdetector into angularinspector and angulardetector packages Moved files around, changed references and fixed tests: - Split the old angulardetector package into angular/angulardetector and angular/angularinspector - angulardetector provides the detection structs/interfaces (Detector, DetectorsProvider...) - angularinspector provides the actual angular detection service used directly in pluginsintegration - Exported most of the stuff that was private and now put into angulardetector, as it is not required by angularinspector * Renamed detector.go -> angulardetector.go and inspector.go -> angularinspector.go Forgot to rename those two files to match the package's names * Renamed angularinspector.ProvideInspector to angularinspector.ProvideService * Renamed "harcoded" to "static" and "remote" to "dynamic" from PR review, matches the same naming schema used for signing keys fetching * WIP: Angular: cache patterns in db, moved gcom into pluginsintegration More similar to signing keys fetching * Rename package, refactoring * try to solve circular import * Fix merge conflict on updated angular patterns * Fix circular imports * Fix wire gen * Add docstrings, refactoring * Removed angualrdetectorsprovider dependency into angularpatternsstore * Moved GCOM test files * Removed GCOM cache * Renamed Detect to DetectAngular and Detector to AngularDetector * Fix call to NewGCOMDetectorsProvider in newDynamicInspector * Removed unused test function newError500GCOMScenario * Added angularinspector service definition in pluginsintegration * refactoring * lint * Fix angularinspector TestProvideService * cleanup * Await initial restore * Register dynamicAngularDetector background service * Removed static detectors provider from pluginsintegration * Add tests for kvstore * Add more tests * order imports in dynamic_test.go * Fix potential panic in dynamic_test * Add "runs the job periodically" test * lint * add timeout to test * refactoring * Removed context.Context from DetectorsProvider * Refactoring, ensure angular dynamic background service is not started if feature flag is off * Fix deadlock on startup * Fix angulardetectorsprovider tests * Revert "Removed context.Context from DetectorsProvider" This reverts commit 4e8c6dded70844709400fa0ce4ce45e66c8458ca. * Fix wrong argument number in dynamic_teset * Standardize gcom http client * Reduce context timeout for angular inspector in plugins loader * Simplify initial restore logic * Fix dynamic detectors provider tests * Chore: removed angulardetector/provider.go * Add more tests * Removed backgroundJob interface, PR review feedback * Update tests * PR review feedback: remove ErrNoCachedValue from kv store Get * Update tests * PR review feedback: add IsDisabled and remove nop background srevice * Update tests * Remove initialRestore channel, use mux instead * Removed backgroundJobInterval, use package-level variable instead * Add TestDynamicAngularDetectorsProviderBackgroundService * Removed timeouts * pr review feedback: restore from store before returning the service * Update tests * Log duration on startup restore and cron run * Switch cron job start log to debug level * Do not attempt to restore if disabled
151 lines
6.8 KiB
Go
151 lines
6.8 KiB
Go
package pluginsintegration
|
|
|
|
import (
|
|
"github.com/google/wire"
|
|
"github.com/grafana/grafana/pkg/infra/tracing"
|
|
"github.com/grafana/grafana/pkg/plugins"
|
|
"github.com/grafana/grafana/pkg/plugins/backendplugin/coreplugin"
|
|
"github.com/grafana/grafana/pkg/plugins/backendplugin/provider"
|
|
pCfg "github.com/grafana/grafana/pkg/plugins/config"
|
|
"github.com/grafana/grafana/pkg/plugins/manager"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/client"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/filestore"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/loader"
|
|
pAngularInspector "github.com/grafana/grafana/pkg/plugins/manager/loader/angular/angularinspector"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/loader/assetpath"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/loader/finder"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/process"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/registry"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/signature"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/sources"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/store"
|
|
"github.com/grafana/grafana/pkg/plugins/oauth"
|
|
"github.com/grafana/grafana/pkg/plugins/pluginscdn"
|
|
"github.com/grafana/grafana/pkg/plugins/repo"
|
|
"github.com/grafana/grafana/pkg/services/caching"
|
|
"github.com/grafana/grafana/pkg/services/featuremgmt"
|
|
"github.com/grafana/grafana/pkg/services/oauthtoken"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/angulardetectorsprovider"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/angularinspector"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/angularpatternsstore"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/clientmiddleware"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/config"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/keyretriever"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/keyretriever/dynamic"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/keystore"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/licensing"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/plugincontext"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings"
|
|
pluginSettings "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginsettings/service"
|
|
"github.com/grafana/grafana/pkg/services/pluginsintegration/serviceregistration"
|
|
"github.com/grafana/grafana/pkg/setting"
|
|
)
|
|
|
|
// WireSet provides a wire.ProviderSet of plugin providers.
|
|
var WireSet = wire.NewSet(
|
|
config.ProvideConfig,
|
|
store.ProvideService,
|
|
wire.Bind(new(plugins.Store), new(*store.Service)),
|
|
wire.Bind(new(plugins.RendererManager), new(*store.Service)),
|
|
wire.Bind(new(plugins.SecretsPluginManager), new(*store.Service)),
|
|
wire.Bind(new(plugins.StaticRouteResolver), new(*store.Service)),
|
|
ProvideClientDecorator,
|
|
wire.Bind(new(plugins.Client), new(*client.Decorator)),
|
|
process.ProvideService,
|
|
wire.Bind(new(process.Service), new(*process.Manager)),
|
|
coreplugin.ProvideCoreRegistry,
|
|
pluginscdn.ProvideService,
|
|
assetpath.ProvideService,
|
|
|
|
angularpatternsstore.ProvideService,
|
|
angulardetectorsprovider.ProvideDynamic,
|
|
angularinspector.ProvideService,
|
|
wire.Bind(new(pAngularInspector.Inspector), new(*angularinspector.Service)),
|
|
|
|
loader.ProvideService,
|
|
wire.Bind(new(loader.Service), new(*loader.Loader)),
|
|
wire.Bind(new(plugins.ErrorResolver), new(*loader.Loader)),
|
|
manager.ProvideInstaller,
|
|
wire.Bind(new(plugins.Installer), new(*manager.PluginInstaller)),
|
|
registry.ProvideService,
|
|
wire.Bind(new(registry.Service), new(*registry.InMemory)),
|
|
repo.ProvideService,
|
|
wire.Bind(new(repo.Service), new(*repo.Manager)),
|
|
plugincontext.ProvideService,
|
|
licensing.ProvideLicensing,
|
|
wire.Bind(new(plugins.Licensing), new(*licensing.Service)),
|
|
wire.Bind(new(sources.Registry), new(*sources.Service)),
|
|
sources.ProvideService,
|
|
pluginSettings.ProvideService,
|
|
wire.Bind(new(pluginsettings.Service), new(*pluginSettings.Service)),
|
|
filestore.ProvideService,
|
|
wire.Bind(new(plugins.FileStore), new(*filestore.Service)),
|
|
wire.Bind(new(plugins.SignatureCalculator), new(*signature.Signature)),
|
|
signature.ProvideService,
|
|
wire.Bind(new(plugins.KeyStore), new(*keystore.Service)),
|
|
keystore.ProvideService,
|
|
wire.Bind(new(plugins.KeyRetriever), new(*keyretriever.Service)),
|
|
keyretriever.ProvideService,
|
|
dynamic.ProvideService,
|
|
serviceregistration.ProvideService,
|
|
wire.Bind(new(oauth.ExternalServiceRegistry), new(*serviceregistration.Service)),
|
|
)
|
|
|
|
// WireExtensionSet provides a wire.ProviderSet of plugin providers that can be
|
|
// extended.
|
|
var WireExtensionSet = wire.NewSet(
|
|
provider.ProvideService,
|
|
wire.Bind(new(plugins.BackendFactoryProvider), new(*provider.Service)),
|
|
signature.ProvideOSSAuthorizer,
|
|
wire.Bind(new(plugins.PluginLoaderAuthorizer), new(*signature.UnsignedPluginAuthorizer)),
|
|
wire.Bind(new(finder.Finder), new(*finder.Local)),
|
|
finder.ProvideLocalFinder,
|
|
)
|
|
|
|
func ProvideClientDecorator(
|
|
cfg *setting.Cfg, pCfg *pCfg.Cfg,
|
|
pluginRegistry registry.Service,
|
|
oAuthTokenService oauthtoken.OAuthTokenService,
|
|
tracer tracing.Tracer,
|
|
cachingService caching.CachingService,
|
|
features *featuremgmt.FeatureManager,
|
|
) (*client.Decorator, error) {
|
|
return NewClientDecorator(cfg, pCfg, pluginRegistry, oAuthTokenService, tracer, cachingService, features)
|
|
}
|
|
|
|
func NewClientDecorator(
|
|
cfg *setting.Cfg, pCfg *pCfg.Cfg,
|
|
pluginRegistry registry.Service, oAuthTokenService oauthtoken.OAuthTokenService,
|
|
tracer tracing.Tracer, cachingService caching.CachingService, features *featuremgmt.FeatureManager,
|
|
) (*client.Decorator, error) {
|
|
c := client.ProvideService(pluginRegistry, pCfg)
|
|
middlewares := CreateMiddlewares(cfg, oAuthTokenService, tracer, cachingService, features)
|
|
|
|
return client.NewDecorator(c, middlewares...)
|
|
}
|
|
|
|
func CreateMiddlewares(cfg *setting.Cfg, oAuthTokenService oauthtoken.OAuthTokenService, tracer tracing.Tracer, cachingService caching.CachingService, features *featuremgmt.FeatureManager) []plugins.ClientMiddleware {
|
|
skipCookiesNames := []string{cfg.LoginCookieName}
|
|
middlewares := []plugins.ClientMiddleware{
|
|
clientmiddleware.NewTracingMiddleware(tracer),
|
|
clientmiddleware.NewTracingHeaderMiddleware(),
|
|
clientmiddleware.NewClearAuthHeadersMiddleware(),
|
|
clientmiddleware.NewOAuthTokenMiddleware(oAuthTokenService),
|
|
clientmiddleware.NewCookiesMiddleware(skipCookiesNames),
|
|
clientmiddleware.NewResourceResponseMiddleware(),
|
|
}
|
|
|
|
// Placing the new service implementation behind a feature flag until it is known to be stable
|
|
if features.IsEnabled(featuremgmt.FlagUseCachingService) {
|
|
middlewares = append(middlewares, clientmiddleware.NewCachingMiddleware(cachingService))
|
|
}
|
|
|
|
if cfg.SendUserHeader {
|
|
middlewares = append(middlewares, clientmiddleware.NewUserHeaderMiddleware())
|
|
}
|
|
|
|
middlewares = append(middlewares, clientmiddleware.NewHTTPClientMiddleware())
|
|
|
|
return middlewares
|
|
}
|