From a2634495e53f9c6f762d0941e0d24fa819c48bb6 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Mon, 10 Apr 2023 10:05:18 +0300 Subject: [PATCH] Grafana Cloud: Put cloud artifacts to `*/release` dir (#66168) Put cloud artifacts to */release dir --- pkg/build/cmd/uploadpackages.go | 4 ++-- pkg/build/cmd/uploadpackages_test.go | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/build/cmd/uploadpackages.go b/pkg/build/cmd/uploadpackages.go index 009ad8dd521..da0dd6a607a 100644 --- a/pkg/build/cmd/uploadpackages.go +++ b/pkg/build/cmd/uploadpackages.go @@ -141,11 +141,11 @@ func bucketForEnterprise2(releaseModeConfig *config.BuildConfig, event string) ( func getVersionFolder(cfg uploadConfig, event string) (string, error) { switch cfg.versionMode { - case config.TagMode: + case config.TagMode, config.CloudMode: return releaseFolder, nil case config.MainMode, config.DownstreamMode: return mainFolder, nil - case config.ReleaseBranchMode, config.CloudMode: + case config.ReleaseBranchMode: return releaseBranchFolder, nil default: // Corner case for custom enterprise2 mode diff --git a/pkg/build/cmd/uploadpackages_test.go b/pkg/build/cmd/uploadpackages_test.go index af44a66d994..9d3bc7b52e1 100644 --- a/pkg/build/cmd/uploadpackages_test.go +++ b/pkg/build/cmd/uploadpackages_test.go @@ -27,6 +27,7 @@ func Test_getVersionFolder(t *testing.T) { {"downstream mode", args{uploadConfig{versionMode: config.DownstreamMode}, "", mainFolder}, nil}, {"release branch mode", args{uploadConfig{versionMode: config.ReleaseBranchMode}, "", releaseBranchFolder}, nil}, {"enterprise pro mode", args{uploadConfig{versionMode: config.Enterprise2Mode}, config.Custom, releaseFolder}, nil}, + {"cloud mode", args{uploadConfig{versionMode: config.CloudMode}, "", releaseFolder}, nil}, {"unrecognised version mode", args{uploadConfig{versionMode: "foo"}, config.Custom, ""}, errors.New("")}, } for _, tt := range tests {