mirror of
https://github.com/grafana/grafana.git
synced 2025-07-31 07:22:17 +08:00
cca9d89733
* 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 * Fix merge conflict on updated angular patterns * 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 * Moved dynamic inspector into pluginsintegration * Move gcom angulardetectorsprovider into pluginsintegration * Log errUnknownPatternType at debug level * re-generate feature flags * fix error log
46 lines
1.5 KiB
Go
46 lines
1.5 KiB
Go
package angularinspector
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/grafana/grafana/pkg/plugins/config"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/loader/angular/angulardetector"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/loader/angular/angularinspector"
|
|
"github.com/grafana/grafana/pkg/services/featuremgmt"
|
|
pAngularDetector "github.com/grafana/grafana/pkg/services/pluginsintegration/angulardetector"
|
|
)
|
|
|
|
type Service struct {
|
|
angularinspector.Inspector
|
|
}
|
|
|
|
// newDynamicInspector returns the default dynamic Inspector, which is a PatternsListInspector that will:
|
|
// 1. Try to get the Angular detectors from GCOM
|
|
// 2. If it fails, it will use the static (hardcoded) detections provided by defaultDetectors.
|
|
func newDynamicInspector(cfg *config.Cfg) (angularinspector.Inspector, error) {
|
|
dynamicProvider, err := pAngularDetector.NewGCOMDetectorsProvider(cfg.GrafanaComURL)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("NewGCOMDetectorsProvider: %w", err)
|
|
}
|
|
return &angularinspector.PatternsListInspector{
|
|
DetectorsProvider: angulardetector.SequenceDetectorsProvider{
|
|
dynamicProvider,
|
|
angularinspector.NewDefaultStaticDetectorsProvider(),
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
func ProvideService(cfg *config.Cfg) (*Service, error) {
|
|
var underlying angularinspector.Inspector
|
|
var err error
|
|
if cfg.Features != nil && cfg.Features.IsEnabled(featuremgmt.FlagPluginsDynamicAngularDetectionPatterns) {
|
|
underlying, err = newDynamicInspector(cfg)
|
|
} else {
|
|
underlying, err = angularinspector.NewStaticInspector()
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &Service{underlying}, nil
|
|
}
|