diff --git a/pkg/build/cmd/buildbackend.go b/pkg/build/cmd/buildbackend.go index 39f0d707fe4..40c4f90388a 100644 --- a/pkg/build/cmd/buildbackend.go +++ b/pkg/build/cmd/buildbackend.go @@ -4,12 +4,13 @@ import ( "fmt" "log" + "github.com/urfave/cli/v2" + "github.com/grafana/grafana/pkg/build/compilers" "github.com/grafana/grafana/pkg/build/config" "github.com/grafana/grafana/pkg/build/errutil" "github.com/grafana/grafana/pkg/build/grafana" "github.com/grafana/grafana/pkg/build/syncutil" - "github.com/urfave/cli/v2" ) func BuildBackend(ctx *cli.Context) error { diff --git a/pkg/build/cmd/builddocker.go b/pkg/build/cmd/builddocker.go index ac1858a65ba..0dffd5dd2c8 100644 --- a/pkg/build/cmd/builddocker.go +++ b/pkg/build/cmd/builddocker.go @@ -3,10 +3,11 @@ package main import ( "log" + "github.com/urfave/cli/v2" + "github.com/grafana/grafana/pkg/build/config" "github.com/grafana/grafana/pkg/build/docker" "github.com/grafana/grafana/pkg/build/gcloud" - "github.com/urfave/cli/v2" ) func BuildDocker(c *cli.Context) error { diff --git a/pkg/build/cmd/buildfrontend.go b/pkg/build/cmd/buildfrontend.go index d7825f419cd..1f64ab0b0e8 100644 --- a/pkg/build/cmd/buildfrontend.go +++ b/pkg/build/cmd/buildfrontend.go @@ -3,11 +3,12 @@ package main import ( "log" + "github.com/urfave/cli/v2" + "github.com/grafana/grafana/pkg/build/config" "github.com/grafana/grafana/pkg/build/errutil" "github.com/grafana/grafana/pkg/build/frontend" "github.com/grafana/grafana/pkg/build/syncutil" - "github.com/urfave/cli/v2" ) func BuildFrontend(c *cli.Context) error { diff --git a/pkg/build/cmd/buildfrontendpackages.go b/pkg/build/cmd/buildfrontendpackages.go index 786ebccaff7..b3c07039818 100644 --- a/pkg/build/cmd/buildfrontendpackages.go +++ b/pkg/build/cmd/buildfrontendpackages.go @@ -4,10 +4,11 @@ import ( "log" "strings" + "github.com/urfave/cli/v2" + "github.com/grafana/grafana/pkg/build/errutil" "github.com/grafana/grafana/pkg/build/frontend" "github.com/grafana/grafana/pkg/build/syncutil" - "github.com/urfave/cli/v2" ) func BuildFrontendPackages(c *cli.Context) error { diff --git a/pkg/build/cmd/buildinternalplugins.go b/pkg/build/cmd/buildinternalplugins.go index fad80b818d5..15a1397158d 100644 --- a/pkg/build/cmd/buildinternalplugins.go +++ b/pkg/build/cmd/buildinternalplugins.go @@ -4,11 +4,12 @@ import ( "context" "log" + "github.com/urfave/cli/v2" + "github.com/grafana/grafana/pkg/build/config" "github.com/grafana/grafana/pkg/build/errutil" "github.com/grafana/grafana/pkg/build/plugins" "github.com/grafana/grafana/pkg/build/syncutil" - "github.com/urfave/cli/v2" ) func BuildInternalPlugins(c *cli.Context) error { diff --git a/pkg/build/cmd/e2etests.go b/pkg/build/cmd/e2etests.go index f377b08f874..ec27fc9b28f 100644 --- a/pkg/build/cmd/e2etests.go +++ b/pkg/build/cmd/e2etests.go @@ -6,8 +6,9 @@ import ( "os" "os/exec" - "github.com/grafana/grafana/pkg/build/e2eutil" "github.com/urfave/cli/v2" + + "github.com/grafana/grafana/pkg/build/e2eutil" ) func EndToEndTests(c *cli.Context) error { diff --git a/pkg/build/cmd/enterprisecheck.go b/pkg/build/cmd/enterprisecheck.go index f2c36b0fc2e..3fb13f6c893 100644 --- a/pkg/build/cmd/enterprisecheck.go +++ b/pkg/build/cmd/enterprisecheck.go @@ -6,9 +6,10 @@ import ( "os" "strconv" + "github.com/urfave/cli/v2" + "github.com/grafana/grafana/pkg/build/env" "github.com/grafana/grafana/pkg/build/git" - "github.com/urfave/cli/v2" ) // checkOpts are options used to create a new GitHub check for the enterprise downstream test. diff --git a/pkg/build/cmd/exportversion.go b/pkg/build/cmd/exportversion.go index a3a54309c73..c4c4744ebef 100644 --- a/pkg/build/cmd/exportversion.go +++ b/pkg/build/cmd/exportversion.go @@ -4,8 +4,9 @@ import ( "os" "path/filepath" - "github.com/grafana/grafana/pkg/build/config" "github.com/urfave/cli/v2" + + "github.com/grafana/grafana/pkg/build/config" ) func ExportVersion(c *cli.Context) error { diff --git a/pkg/build/cmd/fetchimages.go b/pkg/build/cmd/fetchimages.go index bd1ec6a5102..b131cc9a73d 100644 --- a/pkg/build/cmd/fetchimages.go +++ b/pkg/build/cmd/fetchimages.go @@ -6,10 +6,11 @@ import ( "os/exec" "strings" + "github.com/urfave/cli/v2" + "github.com/grafana/grafana/pkg/build/config" "github.com/grafana/grafana/pkg/build/docker" "github.com/grafana/grafana/pkg/build/gcloud" - "github.com/urfave/cli/v2" ) const ( diff --git a/pkg/build/cmd/grafanacom.go b/pkg/build/cmd/grafanacom.go index 43f5bc9eb0f..b2559c2d96b 100644 --- a/pkg/build/cmd/grafanacom.go +++ b/pkg/build/cmd/grafanacom.go @@ -9,7 +9,6 @@ import ( "net/http" "net/url" "os" - "path" "path/filepath" "strings" diff --git a/pkg/build/cmd/main.go b/pkg/build/cmd/main.go index 6725fb7e050..1ee1270a65d 100644 --- a/pkg/build/cmd/main.go +++ b/pkg/build/cmd/main.go @@ -5,8 +5,9 @@ import ( "os" "strings" - "github.com/grafana/grafana/pkg/build/docker" "github.com/urfave/cli/v2" + + "github.com/grafana/grafana/pkg/build/docker" ) func main() { diff --git a/pkg/build/cmd/npm.go b/pkg/build/cmd/npm.go index 07c2fe1365f..13994fb4e19 100644 --- a/pkg/build/cmd/npm.go +++ b/pkg/build/cmd/npm.go @@ -6,8 +6,9 @@ import ( "os/exec" "strings" - "github.com/grafana/grafana/pkg/build/npm" "github.com/urfave/cli/v2" + + "github.com/grafana/grafana/pkg/build/npm" ) func NpmRetrieveAction(c *cli.Context) error { diff --git a/pkg/build/cmd/package.go b/pkg/build/cmd/package.go index b91f1be0179..729856f6834 100644 --- a/pkg/build/cmd/package.go +++ b/pkg/build/cmd/package.go @@ -5,11 +5,12 @@ import ( "log" "strings" + "github.com/urfave/cli/v2" + "github.com/grafana/grafana/pkg/build/config" "github.com/grafana/grafana/pkg/build/gpg" "github.com/grafana/grafana/pkg/build/packaging" "github.com/grafana/grafana/pkg/build/syncutil" - "github.com/urfave/cli/v2" ) func Package(c *cli.Context) error { diff --git a/pkg/build/cmd/publishaws.go b/pkg/build/cmd/publishaws.go index e499c6b27fa..5fc98fbbc27 100644 --- a/pkg/build/cmd/publishaws.go +++ b/pkg/build/cmd/publishaws.go @@ -17,8 +17,9 @@ import ( "github.com/aws/aws-sdk-go/service/marketplacecatalog" "github.com/docker/docker/api/types" "github.com/docker/docker/client" - "github.com/grafana/grafana/pkg/build/config" "github.com/urfave/cli/v2" + + "github.com/grafana/grafana/pkg/build/config" ) const ( diff --git a/pkg/build/cmd/publishgithub.go b/pkg/build/cmd/publishgithub.go index 49366cecd27..c59b1471ae4 100644 --- a/pkg/build/cmd/publishgithub.go +++ b/pkg/build/cmd/publishgithub.go @@ -9,9 +9,10 @@ import ( "strings" "github.com/google/go-github/github" - "github.com/grafana/grafana/pkg/build/config" "github.com/urfave/cli/v2" "golang.org/x/oauth2" + + "github.com/grafana/grafana/pkg/build/config" ) type githubRepositoryService interface { diff --git a/pkg/build/cmd/publishimages_enterprise2.go b/pkg/build/cmd/publishimages_enterprise2.go index b76b2688d6f..94cd4b57c7d 100644 --- a/pkg/build/cmd/publishimages_enterprise2.go +++ b/pkg/build/cmd/publishimages_enterprise2.go @@ -6,10 +6,11 @@ import ( "os" "os/exec" + "github.com/urfave/cli/v2" + "github.com/grafana/grafana/pkg/build/config" "github.com/grafana/grafana/pkg/build/docker" "github.com/grafana/grafana/pkg/build/gcloud" - "github.com/urfave/cli/v2" ) func Enterprise2(c *cli.Context) error { diff --git a/pkg/build/cmd/storestorybook.go b/pkg/build/cmd/storestorybook.go index 65adfa1fbb7..13970e6a32e 100644 --- a/pkg/build/cmd/storestorybook.go +++ b/pkg/build/cmd/storestorybook.go @@ -4,9 +4,10 @@ import ( "log" "path/filepath" + "github.com/urfave/cli/v2" + "github.com/grafana/grafana/pkg/build/config" "github.com/grafana/grafana/pkg/build/gcloud/storage" - "github.com/urfave/cli/v2" ) // StoreStorybook implements the sub-command "store-storybook". diff --git a/pkg/build/cmd/uploadcdn.go b/pkg/build/cmd/uploadcdn.go index 8b8ddb0cd81..e18e1f65e16 100644 --- a/pkg/build/cmd/uploadcdn.go +++ b/pkg/build/cmd/uploadcdn.go @@ -6,9 +6,10 @@ import ( "os" "path/filepath" + "github.com/urfave/cli/v2" + "github.com/grafana/grafana/pkg/build/config" "github.com/grafana/grafana/pkg/build/gcloud/storage" - "github.com/urfave/cli/v2" ) // UploadCDN implements the sub-command "upload-cdn". diff --git a/pkg/build/cmd/uploadpackages.go b/pkg/build/cmd/uploadpackages.go index 3270948ae66..136ae56bc42 100644 --- a/pkg/build/cmd/uploadpackages.go +++ b/pkg/build/cmd/uploadpackages.go @@ -9,11 +9,12 @@ import ( "path/filepath" "strings" + "github.com/urfave/cli/v2" + "github.com/grafana/grafana/pkg/build/config" "github.com/grafana/grafana/pkg/build/droneutil" "github.com/grafana/grafana/pkg/build/gcloud" "github.com/grafana/grafana/pkg/build/packaging" - "github.com/urfave/cli/v2" ) const releaseFolder = "release" diff --git a/pkg/build/cmd/uploadpackages_test.go b/pkg/build/cmd/uploadpackages_test.go index cdb7bdab945..af44a66d994 100644 --- a/pkg/build/cmd/uploadpackages_test.go +++ b/pkg/build/cmd/uploadpackages_test.go @@ -5,9 +5,10 @@ import ( "fmt" "testing" - "github.com/grafana/grafana/pkg/build/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/grafana/grafana/pkg/build/config" ) func Test_getVersionFolder(t *testing.T) { diff --git a/pkg/build/cmd/verifydrone.go b/pkg/build/cmd/verifydrone.go index 19da6fb5a35..4794efa4500 100644 --- a/pkg/build/cmd/verifydrone.go +++ b/pkg/build/cmd/verifydrone.go @@ -10,9 +10,7 @@ import ( "github.com/drone/drone-cli/drone/lint" "github.com/drone/drone-cli/drone/starlark" - "github.com/google/go-cmp/cmp" - cliv1 "github.com/urfave/cli" "github.com/urfave/cli/v2" "gopkg.in/yaml.v3" diff --git a/pkg/build/config/genmetadata.go b/pkg/build/config/genmetadata.go index c201d77dd39..74ffde8f201 100644 --- a/pkg/build/config/genmetadata.go +++ b/pkg/build/config/genmetadata.go @@ -5,8 +5,9 @@ import ( "os" "strings" - "github.com/grafana/grafana/pkg/build/droneutil" "github.com/urfave/cli/v2" + + "github.com/grafana/grafana/pkg/build/droneutil" ) func GenerateMetadata(c *cli.Context) (Metadata, error) { diff --git a/pkg/build/droneutil/event_test.go b/pkg/build/droneutil/event_test.go index f0efcfa284e..b69ce50fc54 100644 --- a/pkg/build/droneutil/event_test.go +++ b/pkg/build/droneutil/event_test.go @@ -3,8 +3,9 @@ package droneutil_test import ( "testing" - "github.com/grafana/grafana/pkg/build/droneutil" "github.com/stretchr/testify/require" + + "github.com/grafana/grafana/pkg/build/droneutil" ) func TestGetDroneEvent(t *testing.T) { diff --git a/pkg/build/env/lookup_test.go b/pkg/build/env/lookup_test.go index cebfb4fac29..ccd44b11e8c 100644 --- a/pkg/build/env/lookup_test.go +++ b/pkg/build/env/lookup_test.go @@ -3,9 +3,9 @@ package env_test import ( "testing" - "github.com/grafana/grafana/pkg/build/env" - "github.com/stretchr/testify/require" + + "github.com/grafana/grafana/pkg/build/env" ) func TestLookup(t *testing.T) { diff --git a/pkg/build/frontend/config.go b/pkg/build/frontend/config.go index 3bb66238961..5aa6bcc4294 100644 --- a/pkg/build/frontend/config.go +++ b/pkg/build/frontend/config.go @@ -1,8 +1,9 @@ package frontend import ( - "github.com/grafana/grafana/pkg/build/config" "github.com/urfave/cli/v2" + + "github.com/grafana/grafana/pkg/build/config" ) const GrafanaDir = "." diff --git a/pkg/build/fsutil/copy_test.go b/pkg/build/fsutil/copy_test.go index 6c243ee69f7..95cb8e838ae 100644 --- a/pkg/build/fsutil/copy_test.go +++ b/pkg/build/fsutil/copy_test.go @@ -5,9 +5,10 @@ import ( "runtime" "testing" - "github.com/grafana/grafana/pkg/build/fsutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/grafana/grafana/pkg/build/fsutil" ) func TestCopyFile(t *testing.T) { diff --git a/pkg/build/fsutil/exists_test.go b/pkg/build/fsutil/exists_test.go index 1428654b9b8..f46297a0764 100644 --- a/pkg/build/fsutil/exists_test.go +++ b/pkg/build/fsutil/exists_test.go @@ -3,8 +3,9 @@ package fsutil_test import ( "testing" - "github.com/grafana/grafana/pkg/build/fsutil" "github.com/stretchr/testify/require" + + "github.com/grafana/grafana/pkg/build/fsutil" ) func TestExists_NonExistent(t *testing.T) { diff --git a/pkg/build/gcloud/storage/gsutil.go b/pkg/build/gcloud/storage/gsutil.go index 461fd58c98a..c29bb66bb52 100644 --- a/pkg/build/gcloud/storage/gsutil.go +++ b/pkg/build/gcloud/storage/gsutil.go @@ -16,10 +16,11 @@ import ( "time" "cloud.google.com/go/storage" - "github.com/grafana/grafana/pkg/build/fsutil" - "github.com/grafana/grafana/pkg/build/gcloud" "google.golang.org/api/iterator" "google.golang.org/api/option" + + "github.com/grafana/grafana/pkg/build/fsutil" + "github.com/grafana/grafana/pkg/build/gcloud" ) var ( diff --git a/pkg/build/git/git.go b/pkg/build/git/git.go index 7539a815de6..9fbcc346e92 100644 --- a/pkg/build/git/git.go +++ b/pkg/build/git/git.go @@ -8,8 +8,9 @@ import ( "regexp" "github.com/google/go-github/v45/github" - "github.com/grafana/grafana/pkg/build/stringutil" "golang.org/x/oauth2" + + "github.com/grafana/grafana/pkg/build/stringutil" ) const ( diff --git a/pkg/build/git/git_checks_test.go b/pkg/build/git/git_checks_test.go index ed3d34a8d28..c9bf0c98d0b 100644 --- a/pkg/build/git/git_checks_test.go +++ b/pkg/build/git/git_checks_test.go @@ -6,8 +6,9 @@ import ( "testing" "github.com/google/go-github/v45/github" - "github.com/grafana/grafana/pkg/build/git" "github.com/stretchr/testify/require" + + "github.com/grafana/grafana/pkg/build/git" ) type TestChecksService struct { diff --git a/pkg/build/git/git_issues_test.go b/pkg/build/git/git_issues_test.go index 4eaa3bb6169..dab9fddde77 100644 --- a/pkg/build/git/git_issues_test.go +++ b/pkg/build/git/git_issues_test.go @@ -6,8 +6,9 @@ import ( "testing" "github.com/google/go-github/v45/github" - "github.com/grafana/grafana/pkg/build/git" "github.com/stretchr/testify/require" + + "github.com/grafana/grafana/pkg/build/git" ) type TestLabelsService struct { diff --git a/pkg/build/git/git_test.go b/pkg/build/git/git_test.go index c0cbd4c8cd8..3b47ce08dd0 100644 --- a/pkg/build/git/git_test.go +++ b/pkg/build/git/git_test.go @@ -3,8 +3,9 @@ package git_test import ( "testing" - "github.com/grafana/grafana/pkg/build/git" "github.com/stretchr/testify/assert" + + "github.com/grafana/grafana/pkg/build/git" ) func TestPRCheckRegexp(t *testing.T) { diff --git a/pkg/build/metrics/publish.go b/pkg/build/metrics/publish.go index 934f8168802..4e686eb6dea 100644 --- a/pkg/build/metrics/publish.go +++ b/pkg/build/metrics/publish.go @@ -5,10 +5,9 @@ import ( "encoding/json" "fmt" "log" + "net/http" "strconv" "time" - - "net/http" ) type payload struct { diff --git a/pkg/build/packaging/grafana_test.go b/pkg/build/packaging/grafana_test.go index 8f143893085..7f45a632718 100644 --- a/pkg/build/packaging/grafana_test.go +++ b/pkg/build/packaging/grafana_test.go @@ -3,9 +3,10 @@ package packaging_test import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/grafana/grafana/pkg/build/config" "github.com/grafana/grafana/pkg/build/packaging" - "github.com/stretchr/testify/assert" ) func TestPackageRegexp(t *testing.T) { diff --git a/pkg/build/packaging/rpm_test.go b/pkg/build/packaging/rpm_test.go index 5a030a3093b..dfe9e0a18fa 100644 --- a/pkg/build/packaging/rpm_test.go +++ b/pkg/build/packaging/rpm_test.go @@ -5,8 +5,9 @@ import ( "path/filepath" "testing" - "github.com/grafana/grafana/pkg/build/config" "github.com/stretchr/testify/require" + + "github.com/grafana/grafana/pkg/build/config" ) const pubKey = `-----BEGIN PGP PUBLIC KEY BLOCK-----