From ab2c8aff082dd4809fd45ca625260e26664b36dc Mon Sep 17 00:00:00 2001 From: Lars Karlitski Date: Tue, 31 Mar 2020 13:13:16 +0200 Subject: [PATCH] jobqueue: make import declarations consistent The usual style is three blocks: standard library, external dependencies, internal dependencies. Also run through `go fmt`, which sorts each of those blocks alphabetically. --- internal/jobqueue/api.go | 4 ++-- internal/jobqueue/api_test.go | 4 ++-- internal/jobqueue/job.go | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/internal/jobqueue/api.go b/internal/jobqueue/api.go index 4447628df..4196c0f0b 100644 --- a/internal/jobqueue/api.go +++ b/internal/jobqueue/api.go @@ -7,10 +7,10 @@ import ( "net/http" "strconv" - "github.com/osbuild/osbuild-composer/internal/store" - "github.com/google/uuid" "github.com/julienschmidt/httprouter" + + "github.com/osbuild/osbuild-composer/internal/store" ) type API struct { diff --git a/internal/jobqueue/api_test.go b/internal/jobqueue/api_test.go index ed097d01a..c1a28d413 100644 --- a/internal/jobqueue/api_test.go +++ b/internal/jobqueue/api_test.go @@ -4,13 +4,13 @@ import ( "net/http" "testing" + "github.com/google/uuid" + "github.com/osbuild/osbuild-composer/internal/blueprint" "github.com/osbuild/osbuild-composer/internal/distro/fedoratest" "github.com/osbuild/osbuild-composer/internal/jobqueue" "github.com/osbuild/osbuild-composer/internal/store" "github.com/osbuild/osbuild-composer/internal/test" - - "github.com/google/uuid" ) func TestBasic(t *testing.T) { diff --git a/internal/jobqueue/job.go b/internal/jobqueue/job.go index 69041a52d..a71899591 100644 --- a/internal/jobqueue/job.go +++ b/internal/jobqueue/job.go @@ -8,11 +8,10 @@ import ( "os/exec" "path" - "github.com/osbuild/osbuild-composer/internal/osbuild" - "github.com/google/uuid" "github.com/osbuild/osbuild-composer/internal/common" + "github.com/osbuild/osbuild-composer/internal/osbuild" "github.com/osbuild/osbuild-composer/internal/target" "github.com/osbuild/osbuild-composer/internal/upload/awsupload" )