* don't prepend app sub url to paths * simplify logo path * fix(plugins): dynamically prepend appSubUrl for System module resolving to work * fix(sandbox): support dynamic appSuburl prepend when loading plugin module.js * fix tests * update test name * fix tests * update fe + add some tests * refactor(plugins): move wrangleurl to utils, rename to resolveModulePath, update usage * chore: fix a typo * test(plugins): add missing name to utils test * reset test flag --------- Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
170 lines
5.3 KiB
Go
170 lines
5.3 KiB
Go
package assetpath
|
|
|
|
import (
|
|
"net/url"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/grafana/grafana/pkg/plugins"
|
|
"github.com/grafana/grafana/pkg/plugins/config"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/fakes"
|
|
"github.com/grafana/grafana/pkg/plugins/pluginscdn"
|
|
)
|
|
|
|
func extPath(pluginID string) *fakes.FakePluginFiles {
|
|
return fakes.NewFakePluginFiles(pluginID)
|
|
}
|
|
|
|
func TestService(t *testing.T) {
|
|
for _, tc := range []struct {
|
|
name string
|
|
cdnBaseURL string
|
|
}{
|
|
{
|
|
name: "Simple",
|
|
cdnBaseURL: "https://cdn.example.com",
|
|
},
|
|
{
|
|
name: "Not root",
|
|
cdnBaseURL: "https://cdn.example.com/plugins",
|
|
},
|
|
{
|
|
name: "End slashes",
|
|
cdnBaseURL: "https://cdn.example.com/plugins////",
|
|
},
|
|
} {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
cfg := &config.Cfg{
|
|
PluginsCDNURLTemplate: tc.cdnBaseURL,
|
|
PluginSettings: map[string]map[string]string{
|
|
"one": {"cdn": "true"},
|
|
"two": {},
|
|
},
|
|
}
|
|
svc := ProvideService(cfg, pluginscdn.ProvideService(cfg))
|
|
|
|
tableOldFS := fakes.NewFakePluginFiles("/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("CDN Base URL", func(t *testing.T) {
|
|
base, err := svc.cdn.BaseURL()
|
|
require.NoError(t, err)
|
|
require.Equal(t, tc.cdnBaseURL, base)
|
|
})
|
|
|
|
t.Run("Base", func(t *testing.T) {
|
|
base, err := svc.Base(NewPluginInfo(jsonData["one"], plugins.ClassExternal, extPath("one")))
|
|
require.NoError(t, err)
|
|
|
|
u, err := url.JoinPath(tc.cdnBaseURL, "/one/1.0.0/public/plugins/one")
|
|
require.NoError(t, err)
|
|
require.Equal(t, u, base)
|
|
|
|
base, err = svc.Base(NewPluginInfo(jsonData["two"], plugins.ClassExternal, extPath("two")))
|
|
require.NoError(t, err)
|
|
require.Equal(t, "public/plugins/two", base)
|
|
|
|
base, err = svc.Base(NewPluginInfo(jsonData["table-old"], plugins.ClassCore, tableOldFS))
|
|
require.NoError(t, err)
|
|
require.Equal(t, "public/app/plugins/table-old", base)
|
|
})
|
|
|
|
t.Run("Module", func(t *testing.T) {
|
|
module, err := svc.Module(NewPluginInfo(jsonData["one"], plugins.ClassExternal, extPath("one")))
|
|
require.NoError(t, err)
|
|
|
|
u, err := url.JoinPath(tc.cdnBaseURL, "/one/1.0.0/public/plugins/one/module.js")
|
|
require.NoError(t, err)
|
|
require.Equal(t, u, module)
|
|
|
|
module, err = svc.Module(NewPluginInfo(jsonData["two"], plugins.ClassExternal, extPath("two")))
|
|
require.NoError(t, err)
|
|
require.Equal(t, "public/plugins/two/module.js", module)
|
|
|
|
module, err = svc.Module(NewPluginInfo(jsonData["table-old"], plugins.ClassCore, tableOldFS))
|
|
require.NoError(t, err)
|
|
require.Equal(t, "core:plugin/table-old", 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"}},
|
|
},
|
|
"two": {
|
|
JSONData: plugins.JSONData{ID: "two", Info: plugins.Info{Version: "2.0.0"}},
|
|
},
|
|
}
|
|
|
|
u, err := svc.RelativeURL(NewPluginInfo(pluginsMap["one"].JSONData, plugins.ClassExternal, extPath("one")), "")
|
|
require.NoError(t, err)
|
|
// given an empty path, base URL will be returned
|
|
baseURL, err := svc.Base(NewPluginInfo(pluginsMap["one"].JSONData, plugins.ClassExternal, extPath("one")))
|
|
require.NoError(t, err)
|
|
require.Equal(t, baseURL, u)
|
|
|
|
u, err = svc.RelativeURL(NewPluginInfo(pluginsMap["one"].JSONData, plugins.ClassExternal, extPath("one")), "path/to/file.txt")
|
|
require.NoError(t, err)
|
|
require.Equal(t, strings.TrimRight(tc.cdnBaseURL, "/")+"/one/1.0.0/public/plugins/one/path/to/file.txt", u)
|
|
|
|
u, err = svc.RelativeURL(NewPluginInfo(pluginsMap["two"].JSONData, plugins.ClassExternal, extPath("two")), "path/to/file.txt")
|
|
require.NoError(t, err)
|
|
require.Equal(t, "public/plugins/two/path/to/file.txt", u)
|
|
|
|
u, err = svc.RelativeURL(NewPluginInfo(pluginsMap["two"].JSONData, plugins.ClassExternal, extPath("two")), "default")
|
|
require.NoError(t, err)
|
|
require.Equal(t, "public/plugins/two/default", u)
|
|
})
|
|
})
|
|
}
|
|
|
|
t.Run("App Sub URL has no effect on the path", func(t *testing.T) {
|
|
for _, tc := range []struct {
|
|
appSubURL string
|
|
}{
|
|
{
|
|
appSubURL: "grafana",
|
|
},
|
|
{
|
|
appSubURL: "/grafana",
|
|
},
|
|
{
|
|
appSubURL: "grafana/",
|
|
},
|
|
{
|
|
appSubURL: "/grafana/",
|
|
},
|
|
} {
|
|
cfg := &config.Cfg{GrafanaAppSubURL: tc.appSubURL}
|
|
svc := ProvideService(cfg, pluginscdn.ProvideService(cfg))
|
|
|
|
dir := "/plugins/test-datasource"
|
|
p := plugins.JSONData{ID: "test-datasource"}
|
|
fs := fakes.NewFakePluginFiles(dir)
|
|
|
|
base, err := svc.Base(NewPluginInfo(p, plugins.ClassExternal, fs))
|
|
require.NoError(t, err)
|
|
require.Equal(t, "public/plugins/test-datasource", base)
|
|
|
|
mod, err := svc.Module(NewPluginInfo(p, plugins.ClassExternal, fs))
|
|
require.NoError(t, err)
|
|
require.Equal(t, "public/plugins/test-datasource/module.js", mod)
|
|
|
|
base, err = svc.Base(NewPluginInfo(p, plugins.ClassCore, fs))
|
|
require.NoError(t, err)
|
|
require.Equal(t, "public/app/plugins/test-datasource", base)
|
|
|
|
mod, err = svc.Module(NewPluginInfo(p, plugins.ClassCore, fs))
|
|
require.NoError(t, err)
|
|
require.Equal(t, "core:plugin/test-datasource", mod)
|
|
}
|
|
})
|
|
}
|