From cbf16bebc6fd112248e77be0e7511e6770f589b3 Mon Sep 17 00:00:00 2001 From: Carl Bergquist Date: Fri, 10 Sep 2021 16:48:13 +0200 Subject: [PATCH] CDN: always look for files in the root folder (#39092) Signed-off-by: bergquist --- pkg/setting/setting.go | 4 ---- pkg/setting/setting_test.go | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index c820fafaf84..95a2581f4b6 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -1491,10 +1491,6 @@ func (cfg *Cfg) GetContentDeliveryURL(prefix string) string { url := *cfg.CDNRootURL preReleaseFolder := "" - if strings.Contains(cfg.BuildVersion, "pre") || strings.Contains(cfg.BuildVersion, "alpha") { - preReleaseFolder = "pre-releases" - } - url.Path = path.Join(url.Path, prefix, preReleaseFolder, cfg.BuildVersion) return url.String() + "/" } diff --git a/pkg/setting/setting_test.go b/pkg/setting/setting_test.go index 486dd6ef47d..2336c780648 100644 --- a/pkg/setting/setting_test.go +++ b/pkg/setting/setting_test.go @@ -413,8 +413,8 @@ func TestGetCDNPathWithPreReleaseVersionAndSubPath(t *testing.T) { cfg.BuildVersion = "v7.5.0-11124pre" cfg.CDNRootURL, err = url.Parse("http://cdn.grafana.com/sub") require.NoError(t, err) - require.Equal(t, "http://cdn.grafana.com/sub/grafana-oss/pre-releases/v7.5.0-11124pre/", cfg.GetContentDeliveryURL("grafana-oss")) - require.Equal(t, "http://cdn.grafana.com/sub/grafana/pre-releases/v7.5.0-11124pre/", cfg.GetContentDeliveryURL("grafana")) + require.Equal(t, "http://cdn.grafana.com/sub/grafana-oss/v7.5.0-11124pre/", cfg.GetContentDeliveryURL("grafana-oss")) + require.Equal(t, "http://cdn.grafana.com/sub/grafana/v7.5.0-11124pre/", cfg.GetContentDeliveryURL("grafana")) } // Adding a case for this in case we switch to proper semver version strings @@ -424,6 +424,6 @@ func TestGetCDNPathWithAlphaVersion(t *testing.T) { cfg.BuildVersion = "v7.5.0-alpha.11124" cfg.CDNRootURL, err = url.Parse("http://cdn.grafana.com") require.NoError(t, err) - require.Equal(t, "http://cdn.grafana.com/grafana-oss/pre-releases/v7.5.0-alpha.11124/", cfg.GetContentDeliveryURL("grafana-oss")) - require.Equal(t, "http://cdn.grafana.com/grafana/pre-releases/v7.5.0-alpha.11124/", cfg.GetContentDeliveryURL("grafana")) + require.Equal(t, "http://cdn.grafana.com/grafana-oss/v7.5.0-alpha.11124/", cfg.GetContentDeliveryURL("grafana-oss")) + require.Equal(t, "http://cdn.grafana.com/grafana/v7.5.0-alpha.11124/", cfg.GetContentDeliveryURL("grafana")) }