mirror of
https://github.com/grafana/grafana.git
synced 2025-02-20 11:48:34 -06: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 4e8c6dded7
.
* 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
55 lines
1.7 KiB
Go
55 lines
1.7 KiB
Go
package angulardetectorsprovider
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"regexp"
|
|
|
|
"github.com/grafana/grafana/pkg/plugins/manager/loader/angular/angulardetector"
|
|
)
|
|
|
|
// gcomAngularPatternsPath is the relative path to the GCOM API handler that returns angular detection patterns.
|
|
const gcomAngularPatternsPath = "/api/plugins/angular_patterns"
|
|
|
|
// GCOMPatternType is a pattern type returned by the GCOM API.
|
|
type GCOMPatternType string
|
|
|
|
const (
|
|
GCOMPatternTypeContains GCOMPatternType = "contains"
|
|
GCOMPatternTypeRegex GCOMPatternType = "regex"
|
|
)
|
|
|
|
// GCOMPattern is an Angular detection pattern returned by the GCOM API.
|
|
type GCOMPattern struct {
|
|
Name string
|
|
Pattern string
|
|
Type GCOMPatternType
|
|
}
|
|
|
|
var (
|
|
// errUnknownPatternType is returned when a pattern type is not known.
|
|
errUnknownPatternType = errors.New("unknown pattern type")
|
|
|
|
// errInvalidRegex is returned when a regex pattern has an invalid regex.
|
|
errInvalidRegex = errors.New("invalid regex")
|
|
)
|
|
|
|
// angularDetector converts a gcomPattern into a Detector, based on its Type.
|
|
// If a pattern type is unknown, it returns an error wrapping errUnknownPatternType.
|
|
func (p *GCOMPattern) angularDetector() (angulardetector.AngularDetector, error) {
|
|
switch p.Type {
|
|
case GCOMPatternTypeContains:
|
|
return &angulardetector.ContainsBytesDetector{Pattern: []byte(p.Pattern)}, nil
|
|
case GCOMPatternTypeRegex:
|
|
re, err := regexp.Compile(p.Pattern)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("%q regexp compile: %w: %s", p.Pattern, errInvalidRegex, err)
|
|
}
|
|
return &angulardetector.RegexDetector{Regex: re}, nil
|
|
}
|
|
return nil, fmt.Errorf("%q: %w", p.Type, errUnknownPatternType)
|
|
}
|
|
|
|
// GCOMPatterns is a slice of GCOMPattern
|
|
type GCOMPatterns []GCOMPattern
|