Use github.com/smallstep/cli-utils and reorder imports

Author: hslatman

command/README.md

@@ -12,7 +12,7 @@ should exist within its own package if possible. For example, `version` and
 Any package used by a command but does not contain explicit business logic
 directly related to the command should exist in the top-level of this
 repository. For example, the `github.com/smallstep/cli/flags` and
-`go.step.sm/cli-utils/errs` package are used by many different commands and
+`github.com/smallstep/cli-utils/errs` package are used by many different commands and
 contain functionality for defining flags and creating/manipulating errors.
 
 ### Adding a Command
@@ -70,8 +70,8 @@ There are three packages which contain functionality to make writing commands ea
 
 - `github.com/smallstep/cli/flags`
 - `github.com/smallstep/cli/prompts`
-- `go.step.sm/cli-utils/errs`
-- `go.step.sm/cli-utils/usage`
+- `github.com/smallstep/cli-utils/errs`
+- `github.com/smallstep/cli-utils/usage`
 
 The usage package is used to extend the default documentation provided by
 `urfave/cli` by enabling us to document arguments, whether they are optional or

command/api/api.go

@@ -1,9 +1,11 @@
 package api
 
 import (
-	"github.com/smallstep/cli/command/api/token"
 	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/command"
+
+	"github.com/smallstep/cli-utils/command"
+
+	"github.com/smallstep/cli/command/api/token"
 )
 
 func init() {

command/api/token/create.go

@@ -12,8 +12,9 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/errs"
-	"go.step.sm/cli-utils/ui"
+
+	"github.com/smallstep/cli-utils/errs"
+	"github.com/smallstep/cli-utils/ui"
 )
 
 func createCommand() cli.Command {

command/base64/base64.go

@@ -8,9 +8,11 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/smallstep/cli/utils"
 	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/command"
+
+	"github.com/smallstep/cli-utils/command"
+
+	"github.com/smallstep/cli/utils"
 )
 
 func init() {

command/beta/beta.go

@@ -1,9 +1,11 @@
 package beta
 
 import (
-	"github.com/smallstep/cli/command/ca"
 	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/command"
+
+	"github.com/smallstep/cli-utils/command"
+
+	"github.com/smallstep/cli/command/ca"
 )
 
 // init creates and registers the ca command

command/ca/acme/eab/add.go

@@ -7,9 +7,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 
-	"go.step.sm/cli-utils/errs"
-
 	adminAPI "github.com/smallstep/certificates/authority/admin/api"
+	"github.com/smallstep/cli-utils/errs"
+
 	"github.com/smallstep/cli/flags"
 	"github.com/smallstep/cli/utils/cautils"
 )

command/ca/acme/eab/list.go

@@ -8,9 +8,10 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/errs"
 
 	"github.com/smallstep/certificates/ca"
+	"github.com/smallstep/cli-utils/errs"
+
 	"github.com/smallstep/cli/flags"
 	"github.com/smallstep/cli/utils/cautils"
 )

command/ca/acme/eab/remove.go

@@ -6,7 +6,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 
-	"go.step.sm/cli-utils/errs"
+	"github.com/smallstep/cli-utils/errs"
 
 	"github.com/smallstep/cli/flags"
 	"github.com/smallstep/cli/utils/cautils"

command/ca/admin/add.go

@@ -5,12 +5,14 @@ import (
 	"os"
 	"text/tabwriter"
 
+	"github.com/urfave/cli"
+
 	adminAPI "github.com/smallstep/certificates/authority/admin/api"
+	"github.com/smallstep/cli-utils/errs"
+	"go.step.sm/linkedca"
+
 	"github.com/smallstep/cli/flags"
 	"github.com/smallstep/cli/utils/cautils"
-	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/errs"
-	"go.step.sm/linkedca"
 )
 
 func addCommand() cli.Command {

command/ca/admin/admin.go

@@ -4,11 +4,11 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/smallstep/certificates/ca"
 	"github.com/urfave/cli"
 
-	"go.step.sm/cli-utils/errs"
-	"go.step.sm/cli-utils/ui"
+	"github.com/smallstep/certificates/ca"
+	"github.com/smallstep/cli-utils/errs"
+	"github.com/smallstep/cli-utils/ui"
 	"go.step.sm/linkedca"
 )