af1e2d68da
* POC: Plugins CDN reverse proxy * CDN proxy POC: changed env var names * Add authorization: false for /public path in frontend plugin loader * Moved CDN settings to Cfg, add some comments * Fix error 500 in asset fetch if plugin is not using CDN * Fix EnterpriseLicensePath declared twice * Fix linter complaining about whitespaces * Plugins CDN: Skip signature verification for CDN plugins * Plugins CDN: Skip manifest and signature check for cdn plugins * Plugins: use IsValid() and IsInternal() rather than equality checks * Plugins CDN: remove comment * Plugins CDN: Fix seeker can't seek when serving plugins from local fs * Plugins CDN: add back error codes in getLocalPluginAssets * Plugins CDN: call asset.Close() rather than asset.readSeekCloser.Close() * Plugins CDN: Fix panic in JsonApiErr when errorMessageCoder wraps a nil error * Plugins CDN: Add error handling to proxyCDNPluginAsset * Plugins CDN: replace errorMessageCoder with errutil * Plugins CDN POC: expose cdn plugin paths to frontend for system.js * Plugins CDN: Fix cdn plugins showing as unsigned in frontend * WIP: Add support for formatted URL * Fix missing cdnPluginsBaseURLs in GrafanaConfig * Plugins CDN: Remove reverse proxy mode and reverse proxy references * Plugins CDN: Simplify asset serving logic * Plugins CDN: sanitize redirect path * Plugins CDN: Removed unused pluginAsset type * Plugins CDN: Removed system.js changes * Plugins CDN: Return different system.js baseURL and module for cdn plugins * Plugins CDN: Ensure CDN is disabled for non-external plugins * lint * Plugins CDN: serve images and screenshots from CDN, refactoring * Lint * Plugins CDN: Fix URLs for system.js (baseUrl and module) * Plugins CDN: Add more tests for RelativeURLForSystemJS * Plugins CDN: Iterate only on apps when preloading * Plugins CDN: Refactoring * Plugins CDN: Add comments to url_constructor.go * Plugins CDN: Update defaultHGPluginsCDNBaseURL * Plugins CDN: undo extract meta from system js config * refactor(plugins): migrate systemjs css plugin to typescript * feat(plugins): introduce systemjs cdn loader plugin * feat(plugins): add systemjs load type * Plugins CDN: Removed RelativeURLForSystemJS * Plugins CDN: Log backend redirect hits along with plugin info * Plugins CDN: Add pluginsCDNBasePath to getFrontendSettingsMap * feat(plugins): introduce cdn loading for angular plugins * refactor(plugins): move systemjs cache buster into systemjsplugins directory * Plugins CDN: Rename pluginsCDNBasePath to pluginsCDNBaseURL * refactor(plugins): introduce pluginsCDNBaseURL to the frontend * Plugins CDN: Renamed "cdn base path" to "cdn url template" in backend * Plugins CDN: lint * merge with main * Instrumentation: Add prometheus counter for backend hits, log from Info to Warn * Config: Changed key from plugins_cdn.url to plugins.plugins_cdn_base_url * CDN: Add backend tests * Lint: goimports * Default CDN URL to empty string, * Do not use CDN in setImages and module if the url template is empty * CDN: Backend: Add test for frontend settings * CDN: Do not log missing module.js warn if plugin is being loaded from CDN * CDN: Add backend test for CDN plugin loader * Removed 'cdn' signature level, switch to 'valid' * Fix pfs.TestParseTreeTestdata for cdn plugin testdata dir * Fix TestLoader_Load * Fix gocyclo complexity of loadPlugins * Plugins CDN: Moved prometheus metric to api package, removed asset_path label * Fix missing in config * Changes after review * Add pluginscdn.Service * Fix tests * Refactoring * Moved all remaining CDN checks inside pluginscdn.Service * CDN url constructor: Renamed stringURLFor to stringPath * CDN: Moved asset URL functionality to assetpath service * CDN: Renamed HasCDN() to IsEnabled() * CDN: Replace assert with require * CDN: Changes after review * Assetpath: Handle url.Parse error * Fix plugin_resource_test * CDN: Change fallback redirect from 302 to 307 * goimports * Fix tests * Switch to contextmodel.ReqContext in plugins.go Co-authored-by: Will Browne <will.browne@grafana.com> Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
89 lines
2.9 KiB
Go
89 lines
2.9 KiB
Go
package assetpath
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/grafana/grafana/pkg/plugins"
|
|
"github.com/grafana/grafana/pkg/plugins/config"
|
|
"github.com/grafana/grafana/pkg/plugins/pluginscdn"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func extPath(pluginID string) string {
|
|
return "/grafana/data/plugins/" + pluginID
|
|
}
|
|
|
|
func TestService(t *testing.T) {
|
|
svc := ProvideService(pluginscdn.ProvideService(&config.Cfg{
|
|
PluginsCDNURLTemplate: "https://cdn.example.com/{id}/{version}/public/plugins/{id}/{assetPath}",
|
|
PluginSettings: map[string]map[string]string{
|
|
"one": {"cdn": "true"},
|
|
"two": {},
|
|
},
|
|
}))
|
|
|
|
const tableOldPath = "/grafana/public/app/plugins/panel/table-old"
|
|
jsonData := map[string]plugins.JSONData{
|
|
"table-old": {ID: "table-old", Info: plugins.Info{Version: "1.0.0"}},
|
|
|
|
"one": {ID: "one", Info: plugins.Info{Version: "1.0.0"}},
|
|
"two": {ID: "two", Info: plugins.Info{Version: "2.0.0"}},
|
|
}
|
|
|
|
t.Run("Base", func(t *testing.T) {
|
|
base, err := svc.Base(jsonData["one"], plugins.External, extPath("one"))
|
|
require.NoError(t, err)
|
|
require.Equal(t, "plugin-cdn/one/1.0.0/public/plugins/one", base)
|
|
|
|
base, err = svc.Base(jsonData["two"], plugins.External, extPath("two"))
|
|
require.NoError(t, err)
|
|
require.Equal(t, "public/plugins/two", base)
|
|
|
|
base, err = svc.Base(jsonData["table-old"], plugins.Core, tableOldPath)
|
|
require.NoError(t, err)
|
|
require.Equal(t, "public/app/plugins/table-old", base)
|
|
})
|
|
|
|
t.Run("Module", func(t *testing.T) {
|
|
module, err := svc.Module(jsonData["one"], plugins.External, extPath("one"))
|
|
require.NoError(t, err)
|
|
require.Equal(t, "plugin-cdn/one/1.0.0/public/plugins/one/module", module)
|
|
|
|
module, err = svc.Module(jsonData["two"], plugins.External, extPath("two"))
|
|
require.NoError(t, err)
|
|
require.Equal(t, "plugins/two/module", module)
|
|
|
|
module, err = svc.Module(jsonData["table-old"], plugins.Core, tableOldPath)
|
|
require.NoError(t, err)
|
|
require.Equal(t, "app/plugins/table-old/module", module)
|
|
})
|
|
|
|
t.Run("RelativeURL", func(t *testing.T) {
|
|
pluginsMap := map[string]*plugins.Plugin{
|
|
"one": {
|
|
JSONData: plugins.JSONData{ID: "one", Info: plugins.Info{Version: "1.0.0"}},
|
|
BaseURL: "plugin-cdn/one/1.0.0/public/pluginsMap/one",
|
|
},
|
|
"two": {
|
|
JSONData: plugins.JSONData{ID: "two", Info: plugins.Info{Version: "2.0.0"}},
|
|
BaseURL: "public/pluginsMap/two",
|
|
},
|
|
}
|
|
u, err := svc.RelativeURL(pluginsMap["one"], "", "default")
|
|
require.NoError(t, err)
|
|
require.Equal(t, "default", u)
|
|
|
|
u, err = svc.RelativeURL(pluginsMap["one"], "path/to/file.txt", "default")
|
|
require.NoError(t, err)
|
|
require.Equal(t, "https://cdn.example.com/one/1.0.0/public/plugins/one/path/to/file.txt", u)
|
|
|
|
u, err = svc.RelativeURL(pluginsMap["two"], "path/to/file.txt", "default")
|
|
require.NoError(t, err)
|
|
require.Equal(t, "public/pluginsMap/two/path/to/file.txt", u)
|
|
|
|
u, err = svc.RelativeURL(pluginsMap["two"], "default", "default")
|
|
require.NoError(t, err)
|
|
require.Equal(t, "default", u)
|
|
})
|
|
}
|