⚠️ imports are organized consistently

acceptance/lifecycle_test.go

@@ -4,19 +4,18 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"os"
 	"regexp"
 	"strings"
 	"text/template"
 
-	. "github.com/cloudfoundry/bosh-cli/v7/acceptance"
+	boshlog "github.com/cloudfoundry/bosh-utils/logger"
+	boshsys "github.com/cloudfoundry/bosh-utils/system"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"os"
-
+	. "github.com/cloudfoundry/bosh-cli/v7/acceptance"
 	bitestutils "github.com/cloudfoundry/bosh-cli/v7/testutils"
-	boshlog "github.com/cloudfoundry/bosh-utils/logger"
-	boshsys "github.com/cloudfoundry/bosh-utils/system"
 )
 
 const (

blobstore/blobstore_test.go

@@ -8,11 +8,12 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	. "github.com/cloudfoundry/bosh-cli/v7/blobstore"
 	fakeboshdavcli "github.com/cloudfoundry/bosh-davcli/client/fakes"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"
 	fakeuuid "github.com/cloudfoundry/bosh-utils/uuid/fakes"
+
+	. "github.com/cloudfoundry/bosh-cli/v7/blobstore"
 )
 
 var _ = Describe("Blobstore", func() {

cloud/cpi_cmd_runner_test.go

@@ -6,11 +6,12 @@ import (
 	"io"
 	"os"
 
-	. "github.com/cloudfoundry/bosh-cli/v7/cloud"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
+	. "github.com/cloudfoundry/bosh-cli/v7/cloud"
 )
 
 var _ = Describe("CpiCmdRunner", func() {

cloud/errors_test.go

@@ -1,9 +1,10 @@
 package cloud_test
 
 import (
-	"github.com/cloudfoundry/bosh-cli/v7/cloud"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
+	"github.com/cloudfoundry/bosh-cli/v7/cloud"
 )
 
 var _ = Describe("Error", func() {

cloud/factory.go

@@ -1,10 +1,11 @@
 package cloud
 
 import (
-	biinstall "github.com/cloudfoundry/bosh-cli/v7/installation"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	boshsys "github.com/cloudfoundry/bosh-utils/system"
+
+	biinstall "github.com/cloudfoundry/bosh-cli/v7/installation"
 )
 
 type Factory interface {

cloud/fakes/fake_cloud.go

@@ -1,8 +1,9 @@
 package fakes
 
 import (
-	"github.com/cloudfoundry/bosh-cli/v7/cloud"
 	biproperty "github.com/cloudfoundry/bosh-utils/property"
+
+	"github.com/cloudfoundry/bosh-cli/v7/cloud"
 )
 
 type FakeCloud struct {

cmd/add_blob.go

@@ -3,11 +3,12 @@ package cmd
 import (
 	"os"
 
+	bosherr "github.com/cloudfoundry/bosh-utils/errors"
+	boshsys "github.com/cloudfoundry/bosh-utils/system"
+
 	. "github.com/cloudfoundry/bosh-cli/v7/cmd/opts"
 	boshreldir "github.com/cloudfoundry/bosh-cli/v7/releasedir"
 	boshui "github.com/cloudfoundry/bosh-cli/v7/ui"
-	bosherr "github.com/cloudfoundry/bosh-utils/errors"
-	boshsys "github.com/cloudfoundry/bosh-utils/system"
 )
 
 type AddBlobCmd struct {

cmd/add_blob_test.go

@@ -3,7 +3,6 @@ package cmd_test
 import (
 	"errors"
 
-	fakeui "github.com/cloudfoundry/bosh-cli/v7/ui/fakes"
 	fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -12,6 +11,7 @@ import (
 	. "github.com/cloudfoundry/bosh-cli/v7/cmd/opts"
 	boshreldir "github.com/cloudfoundry/bosh-cli/v7/releasedir"
 	fakereldir "github.com/cloudfoundry/bosh-cli/v7/releasedir/releasedirfakes"
+	fakeui "github.com/cloudfoundry/bosh-cli/v7/ui/fakes"
 )
 
 var _ = Describe("AddBlobCmd", func() {

cmd/attach_disk_test.go

@@ -3,12 +3,13 @@ package cmd_test
 import (
 	"errors"
 
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+
 	. "github.com/cloudfoundry/bosh-cli/v7/cmd"
 	. "github.com/cloudfoundry/bosh-cli/v7/cmd/opts"
 	boshdir "github.com/cloudfoundry/bosh-cli/v7/director"
 	fakedir "github.com/cloudfoundry/bosh-cli/v7/director/directorfakes"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("AttachDisk", func() {

cmd/certificate_info_table.go

@@ -1,10 +1,11 @@
 package cmd
 
 import (
+	"github.com/fatih/color"
+
 	boshdir "github.com/cloudfoundry/bosh-cli/v7/director"
 	boshui "github.com/cloudfoundry/bosh-cli/v7/ui"
 	boshtbl "github.com/cloudfoundry/bosh-cli/v7/ui/table"
-	"github.com/fatih/color"
 )
 
 type CertificateInfoTable struct {

cmd/clean_up_test.go

@@ -4,16 +4,15 @@ import (
 	"errors"
 	"time"
 
+	"github.com/cppforlife/go-semi-semantic/version"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	. "github.com/cloudfoundry/bosh-cli/v7/cmd"
 	. "github.com/cloudfoundry/bosh-cli/v7/cmd/opts"
-
 	boshdir "github.com/cloudfoundry/bosh-cli/v7/director"
 	fakedir "github.com/cloudfoundry/bosh-cli/v7/director/directorfakes"
 	fakeui "github.com/cloudfoundry/bosh-cli/v7/ui/fakes"
-	"github.com/cppforlife/go-semi-semantic/version"
 )
 
 var _ = Describe("CleanUpCmd", func() {

cmd/completion/complete_functions.go

@@ -3,9 +3,10 @@ package completion
 import (
 	"reflect"
 
-	"github.com/cloudfoundry/bosh-cli/v7/cmd/opts"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	"github.com/spf13/cobra"
+
+	"github.com/cloudfoundry/bosh-cli/v7/cmd/opts"
 )
 
 type CompleteFunctions struct {

cmd/completion/completion.go

@@ -5,11 +5,12 @@ import (
 	"reflect"
 	"strings"
 
+	boshlog "github.com/cloudfoundry/bosh-utils/logger"
+	"github.com/spf13/cobra"
+
 	boshcmd "github.com/cloudfoundry/bosh-cli/v7/cmd"
 	"github.com/cloudfoundry/bosh-cli/v7/cmd/opts"
 	boshui "github.com/cloudfoundry/bosh-cli/v7/ui"
-	boshlog "github.com/cloudfoundry/bosh-utils/logger"
-	"github.com/spf13/cobra"
 )
 
 const initCmdName = "help"

cmd/completion/completion_test.go

@@ -4,10 +4,11 @@ import (
 	"os"
 	"strings"
 
-	"github.com/cloudfoundry/bosh-cli/v7/cmd/completion"
 	"github.com/cloudfoundry/bosh-utils/logger"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
+	"github.com/cloudfoundry/bosh-cli/v7/cmd/completion"
 )
 
 var _ = Describe("Completion Integration Tests", func() {

cmd/completion/director_query.go

@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"strings"
 
+	boshlog "github.com/cloudfoundry/bosh-utils/logger"
+
 	boshcmd "github.com/cloudfoundry/bosh-cli/v7/cmd"
 	boshdir "github.com/cloudfoundry/bosh-cli/v7/director"
-	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 )
 
 // TODO: type QueryFunc func(prefix string) ([]string, error)

cmd/config.go

@@ -1,10 +1,11 @@
 package cmd
 
 import (
+	bosherr "github.com/cloudfoundry/bosh-utils/errors"
+
 	. "github.com/cloudfoundry/bosh-cli/v7/cmd/opts"
 	boshdir "github.com/cloudfoundry/bosh-cli/v7/director"
 	boshui "github.com/cloudfoundry/bosh-cli/v7/ui"
-	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 )
 
 type ConfigCmd struct {

cmd/config/fs_config.go

@@ -3,11 +3,11 @@ package config
 import (
 	"os"
 
-	"github.com/cloudfoundry/bosh-cli/v7/uaa"
-	"gopkg.in/yaml.v2"
-
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshsys "github.com/cloudfoundry/bosh-utils/system"
+	"gopkg.in/yaml.v2"
+
+	"github.com/cloudfoundry/bosh-cli/v7/uaa"
 )
 
 /*

cmd/config/fs_config_test.go

@@ -4,13 +4,12 @@ import (
 	"errors"
 	"os"
 
-	. "github.com/cloudfoundry/bosh-cli/v7/cmd/config"
+	fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
+	. "github.com/cloudfoundry/bosh-cli/v7/cmd/config"
 	"github.com/cloudfoundry/bosh-cli/v7/uaa"
-
-	fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"
 )
 
 var _ = Describe("NewFSConfigFromPath", func() {

cmd/config/suite_test.go

@@ -4,9 +4,10 @@ import (
 	"crypto/tls"
 	"testing"
 
-	"github.com/cloudfoundry/bosh-cli/v7/testutils"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
+	"github.com/cloudfoundry/bosh-cli/v7/testutils"
 )
 
 var (

cmd/create_env_test.go

@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"regexp"
 
+	mockhttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http/mocks"
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 	biproperty "github.com/cloudfoundry/bosh-utils/property"
@@ -17,7 +18,6 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 
-	mockhttpagent "github.com/cloudfoundry/bosh-agent/agentclient/http/mocks"
 	mockagentclient "github.com/cloudfoundry/bosh-cli/v7/agentclient/mocks"
 	mockblobstore "github.com/cloudfoundry/bosh-cli/v7/blobstore/mocks"
 	bicloud "github.com/cloudfoundry/bosh-cli/v7/cloud"

cmd/create_release_test.go

@@ -3,6 +3,7 @@ package cmd_test
 import (
 	"errors"
 
+	fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"
 	semver "github.com/cppforlife/go-semi-semantic/version"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -15,7 +16,6 @@ import (
 	fakereldir "github.com/cloudfoundry/bosh-cli/v7/releasedir/releasedirfakes"
 	fakeui "github.com/cloudfoundry/bosh-cli/v7/ui/fakes"
 	boshtbl "github.com/cloudfoundry/bosh-cli/v7/ui/table"
-	fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"
 )
 
 var _ = Describe("CreateReleaseCmd", func() {

cmd/curl.go

@@ -4,10 +4,11 @@ import (
 	"net/http"
 	"net/http/httputil"
 
+	bosherr "github.com/cloudfoundry/bosh-utils/errors"
+
 	. "github.com/cloudfoundry/bosh-cli/v7/cmd/opts"
 	boshdir "github.com/cloudfoundry/bosh-cli/v7/director"
 	boshui "github.com/cloudfoundry/bosh-cli/v7/ui"
-	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 )
 
 type CurlCmd struct {

cmd/delete_config.go

@@ -1,10 +1,11 @@
 package cmd
 
 import (
+	bosherr "github.com/cloudfoundry/bosh-utils/errors"
+
 	. "github.com/cloudfoundry/bosh-cli/v7/cmd/opts"
 	boshdir "github.com/cloudfoundry/bosh-cli/v7/director"
 	boshui "github.com/cloudfoundry/bosh-cli/v7/ui"
-	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 )
 
 type DeleteConfigCmd struct {

cmd/delete_env_test.go

@@ -1,17 +1,16 @@
 package cmd_test
 
 import (
-	bicmd "github.com/cloudfoundry/bosh-cli/v7/cmd"
-	. "github.com/cloudfoundry/bosh-cli/v7/cmd/opts"
+	bosherr "github.com/cloudfoundry/bosh-utils/errors"
+	fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"
 	"github.com/cppforlife/go-patch/patch"
+	"github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
+	bicmd "github.com/cloudfoundry/bosh-cli/v7/cmd"
 	mockcmd "github.com/cloudfoundry/bosh-cli/v7/cmd/mocks"
-	bosherr "github.com/cloudfoundry/bosh-utils/errors"
-	fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"
-	"github.com/golang/mock/gomock"
-
+	. "github.com/cloudfoundry/bosh-cli/v7/cmd/opts"
 	boshtpl "github.com/cloudfoundry/bosh-cli/v7/director/template"
 	fakebiui "github.com/cloudfoundry/bosh-cli/v7/ui/fakes"
 	fakeui "github.com/cloudfoundry/bosh-cli/v7/ui/fakes"

cmd/deployments_table.go

@@ -1,11 +1,12 @@
 package cmd
 
 import (
+	bosherr "github.com/cloudfoundry/bosh-utils/errors"
+	semver "github.com/cppforlife/go-semi-semantic/version"
+
 	boshdir "github.com/cloudfoundry/bosh-cli/v7/director"
 	boshui "github.com/cloudfoundry/bosh-cli/v7/ui"
 	boshtbl "github.com/cloudfoundry/bosh-cli/v7/ui/table"
-	bosherr "github.com/cloudfoundry/bosh-utils/errors"
-	semver "github.com/cppforlife/go-semi-semantic/version"
 )
 
 type DeploymentsTable struct {

cmd/downloader_test.go

@@ -11,13 +11,13 @@ import (
 
 	"code.cloudfoundry.org/clock"
 	"code.cloudfoundry.org/clock/fakeclock"
-	fakeui "github.com/cloudfoundry/bosh-cli/v7/ui/fakes"
 	fakesys "github.com/cloudfoundry/bosh-utils/system/fakes"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	. "github.com/cloudfoundry/bosh-cli/v7/cmd"
 	fakedir "github.com/cloudfoundry/bosh-cli/v7/director/directorfakes"
+	fakeui "github.com/cloudfoundry/bosh-cli/v7/ui/fakes"
 )
 
 var _ = Describe("UIDownloader", func() {