From 57b1a3d5228872eba6589b0ae38ceccabd0f3344 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 19 Jul 2019 12:44:16 +0200 Subject: [PATCH] Fixed import order using goimports Probably just prevents future merge conflicts. --- cmd/analyze.go | 1 + filetree/efficiency.go | 3 ++- filetree/node.go | 3 ++- filetree/tree.go | 5 +++-- filetree/types.go | 3 ++- image/docker_layer.go | 3 ++- image/types.go | 3 ++- runtime/ci/evaluator.go | 7 ++++--- runtime/ci/evaluator_test.go | 5 +++-- runtime/ci/rules.go | 3 ++- runtime/export.go | 3 ++- runtime/export_test.go | 3 ++- runtime/run.go | 9 +++++---- ui/details_controller.go | 5 +++-- ui/filetree_controller.go | 5 +++-- ui/filetree_viewmodel.go | 5 +++-- ui/filetree_viewmodel_test.go | 9 +++++---- ui/layer_controller.go | 3 ++- ui/status_controller.go | 3 ++- ui/ui.go | 1 + utils/exit.go | 3 ++- 21 files changed, 53 insertions(+), 32 deletions(-) diff --git a/cmd/analyze.go b/cmd/analyze.go index fe1a839..eab81f2 100644 --- a/cmd/analyze.go +++ b/cmd/analyze.go @@ -2,6 +2,7 @@ package cmd import ( "fmt" + "github.com/spf13/cobra" "github.com/wagoodman/dive/runtime" "github.com/wagoodman/dive/utils" diff --git a/filetree/efficiency.go b/filetree/efficiency.go index 5d02241..e0b21cf 100644 --- a/filetree/efficiency.go +++ b/filetree/efficiency.go @@ -2,8 +2,9 @@ package filetree import ( "fmt" - "github.com/sirupsen/logrus" "sort" + + "github.com/sirupsen/logrus" ) // Len is required for sorting. diff --git a/filetree/node.go b/filetree/node.go index 7a2d2cf..48fa6e4 100644 --- a/filetree/node.go +++ b/filetree/node.go @@ -3,10 +3,11 @@ package filetree import ( "archive/tar" "fmt" - "github.com/sirupsen/logrus" "sort" "strings" + "github.com/sirupsen/logrus" + "github.com/dustin/go-humanize" "github.com/fatih/color" "github.com/phayes/permbits" diff --git a/filetree/tree.go b/filetree/tree.go index 46309ce..b225224 100644 --- a/filetree/tree.go +++ b/filetree/tree.go @@ -2,10 +2,11 @@ package filetree import ( "fmt" - "github.com/google/uuid" - "github.com/sirupsen/logrus" "sort" "strings" + + "github.com/google/uuid" + "github.com/sirupsen/logrus" ) const ( diff --git a/filetree/types.go b/filetree/types.go index d288c4e..e2f406b 100644 --- a/filetree/types.go +++ b/filetree/types.go @@ -1,8 +1,9 @@ package filetree import ( - "github.com/google/uuid" "os" + + "github.com/google/uuid" ) // FileTree represents a set of files, directories, and their relations. diff --git a/image/docker_layer.go b/image/docker_layer.go index d2cbaef..cf6b3b3 100644 --- a/image/docker_layer.go +++ b/image/docker_layer.go @@ -2,9 +2,10 @@ package image import ( "fmt" + "strings" + "github.com/dustin/go-humanize" "github.com/wagoodman/dive/filetree" - "strings" ) const ( diff --git a/image/types.go b/image/types.go index 2643521..eea4620 100644 --- a/image/types.go +++ b/image/types.go @@ -1,9 +1,10 @@ package image import ( + "io" + "github.com/docker/docker/client" "github.com/wagoodman/dive/filetree" - "io" ) type Parser interface { diff --git a/runtime/ci/evaluator.go b/runtime/ci/evaluator.go index ddc598b..53251a5 100644 --- a/runtime/ci/evaluator.go +++ b/runtime/ci/evaluator.go @@ -3,12 +3,13 @@ package ci import ( "bytes" "fmt" - "github.com/logrusorgru/aurora" - "github.com/spf13/viper" - "github.com/wagoodman/dive/image" "io/ioutil" "sort" "strings" + + "github.com/logrusorgru/aurora" + "github.com/spf13/viper" + "github.com/wagoodman/dive/image" ) func NewEvaluator() *Evaluator { diff --git a/runtime/ci/evaluator_test.go b/runtime/ci/evaluator_test.go index 4c3af86..0090523 100644 --- a/runtime/ci/evaluator_test.go +++ b/runtime/ci/evaluator_test.go @@ -1,10 +1,11 @@ package ci import ( - "github.com/spf13/viper" - "github.com/wagoodman/dive/image" "strings" "testing" + + "github.com/spf13/viper" + "github.com/wagoodman/dive/image" ) func Test_Evaluator(t *testing.T) { diff --git a/runtime/ci/rules.go b/runtime/ci/rules.go index d5bc7ee..4eeb5bf 100644 --- a/runtime/ci/rules.go +++ b/runtime/ci/rules.go @@ -2,10 +2,11 @@ package ci import ( "fmt" + "strconv" + "github.com/dustin/go-humanize" "github.com/logrusorgru/aurora" "github.com/wagoodman/dive/image" - "strconv" ) func newGenericCiRule(key string, evaluator func(*image.AnalysisResult, string) (RuleStatus, string)) *GenericCiRule { diff --git a/runtime/export.go b/runtime/export.go index 48f768a..d2cdb55 100644 --- a/runtime/export.go +++ b/runtime/export.go @@ -2,8 +2,9 @@ package runtime import ( "encoding/json" - "github.com/wagoodman/dive/image" "io/ioutil" + + "github.com/wagoodman/dive/image" ) func newExport(analysis *image.AnalysisResult) *export { diff --git a/runtime/export_test.go b/runtime/export_test.go index 45031b1..2859ae4 100644 --- a/runtime/export_test.go +++ b/runtime/export_test.go @@ -1,8 +1,9 @@ package runtime import ( - "github.com/wagoodman/dive/image" "testing" + + "github.com/wagoodman/dive/image" ) func Test_Export(t *testing.T) { diff --git a/runtime/run.go b/runtime/run.go index 79cb36b..8def88a 100644 --- a/runtime/run.go +++ b/runtime/run.go @@ -2,6 +2,11 @@ package runtime import ( "fmt" + "io/ioutil" + "log" + "os" + "strconv" + "github.com/dustin/go-humanize" "github.com/logrusorgru/aurora" "github.com/wagoodman/dive/filetree" @@ -9,10 +14,6 @@ import ( "github.com/wagoodman/dive/runtime/ci" "github.com/wagoodman/dive/ui" "github.com/wagoodman/dive/utils" - "io/ioutil" - "log" - "os" - "strconv" ) func title(s string) string { diff --git a/ui/details_controller.go b/ui/details_controller.go index 68dd5df..28621bd 100644 --- a/ui/details_controller.go +++ b/ui/details_controller.go @@ -2,12 +2,13 @@ package ui import ( "fmt" + "strconv" + "strings" + "github.com/dustin/go-humanize" "github.com/jroimartin/gocui" "github.com/lunixbochs/vtclean" "github.com/wagoodman/dive/filetree" - "strconv" - "strings" ) // DetailsController holds the UI objects and data models for populating the lower-left pane. Specifically the pane that diff --git a/ui/filetree_controller.go b/ui/filetree_controller.go index cc53cc7..f81a3a5 100644 --- a/ui/filetree_controller.go +++ b/ui/filetree_controller.go @@ -2,12 +2,13 @@ package ui import ( "fmt" + "regexp" + "strings" + "github.com/lunixbochs/vtclean" "github.com/sirupsen/logrus" "github.com/spf13/viper" "github.com/wagoodman/keybinding" - "regexp" - "strings" "github.com/jroimartin/gocui" "github.com/wagoodman/dive/filetree" diff --git a/ui/filetree_viewmodel.go b/ui/filetree_viewmodel.go index 7394070..585507c 100644 --- a/ui/filetree_viewmodel.go +++ b/ui/filetree_viewmodel.go @@ -3,11 +3,12 @@ package ui import ( "bytes" "fmt" + "regexp" + "strings" + "github.com/sirupsen/logrus" "github.com/spf13/viper" "github.com/wagoodman/dive/utils" - "regexp" - "strings" "github.com/lunixbochs/vtclean" "github.com/wagoodman/dive/filetree" diff --git a/ui/filetree_viewmodel_test.go b/ui/filetree_viewmodel_test.go index 6aaad8d..30c4ff6 100644 --- a/ui/filetree_viewmodel_test.go +++ b/ui/filetree_viewmodel_test.go @@ -2,15 +2,16 @@ package ui import ( "bytes" - "github.com/fatih/color" - "github.com/sergi/go-diff/diffmatchpatch" - "github.com/wagoodman/dive/filetree" - "github.com/wagoodman/dive/image" "io/ioutil" "os" "path/filepath" "regexp" "testing" + + "github.com/fatih/color" + "github.com/sergi/go-diff/diffmatchpatch" + "github.com/wagoodman/dive/filetree" + "github.com/wagoodman/dive/image" ) const allowTestDataCapture = false diff --git a/ui/layer_controller.go b/ui/layer_controller.go index 0210544..9289009 100644 --- a/ui/layer_controller.go +++ b/ui/layer_controller.go @@ -2,6 +2,8 @@ package ui import ( "fmt" + "strings" + "github.com/jroimartin/gocui" "github.com/lunixbochs/vtclean" "github.com/sirupsen/logrus" @@ -9,7 +11,6 @@ import ( "github.com/wagoodman/dive/image" "github.com/wagoodman/dive/utils" "github.com/wagoodman/keybinding" - "strings" ) // LayerController holds the UI objects and data models for populating the lower-left pane. Specifically the pane that diff --git a/ui/status_controller.go b/ui/status_controller.go index da4f660..c204e9e 100644 --- a/ui/status_controller.go +++ b/ui/status_controller.go @@ -3,8 +3,9 @@ package ui import ( "fmt" - "github.com/jroimartin/gocui" "strings" + + "github.com/jroimartin/gocui" ) // StatusController holds the UI objects and data models for populating the bottom-most pane. Specifically the panel diff --git a/ui/ui.go b/ui/ui.go index 9daea71..e71fb7c 100644 --- a/ui/ui.go +++ b/ui/ui.go @@ -3,6 +3,7 @@ package ui import ( "errors" "fmt" + "github.com/fatih/color" "github.com/jroimartin/gocui" "github.com/sirupsen/logrus" diff --git a/utils/exit.go b/utils/exit.go index 41b272e..512d37c 100644 --- a/utils/exit.go +++ b/utils/exit.go @@ -2,9 +2,10 @@ package utils import ( "fmt" + "os" + "github.com/jroimartin/gocui" "github.com/sirupsen/logrus" - "os" ) var ui *gocui.Gui