* 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
145 lines
4.9 KiB
Go
145 lines
4.9 KiB
Go
package angulardetector
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/grafana/grafana/pkg/plugins/manager/loader/angular/angulardetector"
|
|
)
|
|
|
|
var mockGCOMResponse = []byte(`[{
|
|
"name": "PanelCtrl",
|
|
"type": "contains",
|
|
"pattern": "PanelCtrl"
|
|
},
|
|
{
|
|
"name": "QueryCtrl",
|
|
"type": "regex",
|
|
"pattern": "[\"']QueryCtrl[\"']"
|
|
}]`)
|
|
|
|
func mockGCOMHTTPHandlerFunc(writer http.ResponseWriter, request *http.Request) {
|
|
if request.URL.Path != "/api/plugins/angular_patterns" {
|
|
writer.WriteHeader(http.StatusNotFound)
|
|
return
|
|
}
|
|
_, _ = writer.Write(mockGCOMResponse)
|
|
}
|
|
|
|
func checkMockGCOMResponse(t *testing.T, detectors []angulardetector.AngularDetector) {
|
|
require.Len(t, detectors, 2)
|
|
d, ok := detectors[0].(*angulardetector.ContainsBytesDetector)
|
|
require.True(t, ok)
|
|
require.Equal(t, []byte(`PanelCtrl`), d.Pattern)
|
|
rd, ok := detectors[1].(*angulardetector.RegexDetector)
|
|
require.True(t, ok)
|
|
require.Equal(t, `["']QueryCtrl["']`, rd.Regex.String())
|
|
}
|
|
|
|
type gcomScenario struct {
|
|
gcomHTTPHandlerFunc http.HandlerFunc
|
|
gcomHTTPCalls int
|
|
}
|
|
|
|
func (s *gcomScenario) newHTTPTestServer() *httptest.Server {
|
|
return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
s.gcomHTTPCalls++
|
|
s.gcomHTTPHandlerFunc(w, r)
|
|
}))
|
|
}
|
|
|
|
func newDefaultGCOMScenario() *gcomScenario {
|
|
return &gcomScenario{gcomHTTPHandlerFunc: mockGCOMHTTPHandlerFunc}
|
|
}
|
|
|
|
func TestGCOMDetectorsProvider(t *testing.T) {
|
|
t.Run("returns value returned from gcom api", func(t *testing.T) {
|
|
scenario := newDefaultGCOMScenario()
|
|
srv := scenario.newHTTPTestServer()
|
|
t.Cleanup(srv.Close)
|
|
gcomProvider, err := NewGCOMDetectorsProvider(srv.URL)
|
|
require.NoError(t, err)
|
|
detectors := gcomProvider.ProvideDetectors(context.Background())
|
|
require.Equal(t, 1, scenario.gcomHTTPCalls, "gcom api should be called")
|
|
checkMockGCOMResponse(t, detectors)
|
|
})
|
|
|
|
t.Run("error handling", func(t *testing.T) {
|
|
for _, tc := range []struct {
|
|
*gcomScenario
|
|
name string
|
|
}{
|
|
{name: "http error 500", gcomScenario: &gcomScenario{
|
|
gcomHTTPHandlerFunc: func(writer http.ResponseWriter, request *http.Request) {
|
|
writer.WriteHeader(http.StatusInternalServerError)
|
|
},
|
|
}},
|
|
{name: "invalid json", gcomScenario: &gcomScenario{
|
|
gcomHTTPHandlerFunc: func(writer http.ResponseWriter, request *http.Request) {
|
|
_, _ = writer.Write([]byte(`not json`))
|
|
},
|
|
}},
|
|
{name: "invalid regex", gcomScenario: &gcomScenario{
|
|
gcomHTTPHandlerFunc: func(writer http.ResponseWriter, request *http.Request) {
|
|
_, _ = writer.Write([]byte(`[{"name": "test", "type": "regex", "pattern": "((("}]`))
|
|
},
|
|
}},
|
|
} {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
srv := tc.newHTTPTestServer()
|
|
t.Cleanup(srv.Close)
|
|
gcomProvider, err := NewGCOMDetectorsProvider(srv.URL)
|
|
require.NoError(t, err)
|
|
detectors := gcomProvider.ProvideDetectors(context.Background())
|
|
require.Equal(t, 1, tc.gcomHTTPCalls, "gcom should be called")
|
|
require.Empty(t, detectors, "returned AngularDetectors should be empty")
|
|
})
|
|
}
|
|
})
|
|
|
|
t.Run("handles gcom timeout", func(t *testing.T) {
|
|
gcomScenario := &gcomScenario{
|
|
gcomHTTPHandlerFunc: func(writer http.ResponseWriter, request *http.Request) {
|
|
time.Sleep(time.Second * 1)
|
|
_, _ = writer.Write([]byte(`[{"name": "test", "type": "regex", "pattern": "((("}]`))
|
|
},
|
|
}
|
|
srv := gcomScenario.newHTTPTestServer()
|
|
t.Cleanup(srv.Close)
|
|
gcomProvider, err := NewGCOMDetectorsProvider(srv.URL)
|
|
require.NoError(t, err)
|
|
// Expired context
|
|
ctx, canc := context.WithTimeout(context.Background(), time.Second*-1)
|
|
defer canc()
|
|
detectors := gcomProvider.ProvideDetectors(ctx)
|
|
require.Zero(t, gcomScenario.gcomHTTPCalls, "gcom should be not called due to request timing out")
|
|
require.Empty(t, detectors, "returned AngularDetectors should be empty")
|
|
})
|
|
|
|
t.Run("unknown pattern types do not break decoding", func(t *testing.T) {
|
|
// Tests that we can introduce new pattern types in the future without breaking old Grafana versions.
|
|
|
|
scenario := gcomScenario{gcomHTTPHandlerFunc: func(writer http.ResponseWriter, request *http.Request) {
|
|
_, _ = writer.Write([]byte(`[
|
|
{"name": "PanelCtrl", "type": "contains", "pattern": "PanelCtrl"},
|
|
{"name": "Another", "type": "unknown", "pattern": "PanelCtrl"}
|
|
]`))
|
|
}}
|
|
srv := scenario.newHTTPTestServer()
|
|
t.Cleanup(srv.Close)
|
|
gcomProvider, err := NewGCOMDetectorsProvider(srv.URL)
|
|
require.NoError(t, err)
|
|
detectors := gcomProvider.ProvideDetectors(context.Background())
|
|
require.Equal(t, 1, scenario.gcomHTTPCalls, "gcom should be called")
|
|
require.Len(t, detectors, 1, "should have decoded only 1 AngularDetector")
|
|
d, ok := detectors[0].(*angulardetector.ContainsBytesDetector)
|
|
require.True(t, ok, "decoded pattern should be of the correct type")
|
|
require.Equal(t, []byte("PanelCtrl"), d.Pattern, "decoded value for known pattern should be correct")
|
|
})
|
|
}
|