mirror of
https://github.com/grafana/grafana.git
synced 2024-12-02 05:29:42 -06:00
33a32df47b
* spelling in error message
* imguploader: fix template for webdav url
Since a few years ago, when loading the config file, the template gets replaced in the expanding
env var phase (see ##25075) and introduced a bug in the webdav public_url config option. This commit
changes the template syntax to be {{file}}. This doesn't get expanded and removed when the config file
is loaded.
* devenv: add a block for a WebDAV server
* Adding alerting as codeowners for webdav
---------
Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
45 lines
2.1 KiB
Go
45 lines
2.1 KiB
Go
package imguploader
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestUploadToWebdav(t *testing.T) {
|
|
// Can be tested with this docker container: https://hub.docker.com/r/morrisjobke/webdav/
|
|
t.Run("[Integration test] for external_image_store.webdav", func(t *testing.T) {
|
|
t.Skip("Skip test [Integration test] for external_image_store.webdav")
|
|
webdavUploader, _ := NewWebdavImageUploader("http://localhost:8888/webdav/", "test", "test", "")
|
|
path, err := webdavUploader.Upload(context.Background(), "../../../public/img/logo_transparent_400x.png")
|
|
|
|
require.NoError(t, err)
|
|
require.True(t, strings.HasPrefix(path, "http://localhost:8888/webdav/"))
|
|
})
|
|
|
|
t.Run("[Integration test] for external_image_store.webdav with public url", func(t *testing.T) {
|
|
t.Skip("Skip test [Integration test] for external_image_store.webdav with public url")
|
|
webdavUploader, _ := NewWebdavImageUploader("http://localhost:8888/webdav/", "test", "test", "http://publicurl:8888/webdav")
|
|
path, err := webdavUploader.Upload(context.Background(), "../../../public/img/logo_transparent_400x.png")
|
|
|
|
require.NoError(t, err)
|
|
require.True(t, strings.HasPrefix(path, "http://publicurl:8888/webdav/"))
|
|
|
|
require.True(t, strings.HasPrefix(path, "http://publicurl:8888/webdav/"))
|
|
})
|
|
}
|
|
|
|
func TestPublicURL(t *testing.T) {
|
|
t.Run("Given a public URL with parameters, and no template", func(t *testing.T) {
|
|
webdavUploader, _ := NewWebdavImageUploader("http://localhost:8888/webdav/", "test", "test", "http://cloudycloud.me/s/DOIFDOMV/download?files=")
|
|
assert.Equal(t, "http://cloudycloud.me/s/DOIFDOMV/download/fileyfile.png?files=", webdavUploader.PublicURL("fileyfile.png"))
|
|
})
|
|
t.Run("Given a public URL with parameters, and a template", func(t *testing.T) {
|
|
webdavUploader, _ := NewWebdavImageUploader("http://localhost:8888/webdav/", "test", "test", "http://cloudycloud.me/s/DOIFDOMV/download?files={{file}}")
|
|
assert.Equal(t, "http://cloudycloud.me/s/DOIFDOMV/download?files=fileyfile.png", webdavUploader.PublicURL("fileyfile.png"))
|
|
})
|
|
}
|