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

smallstep · Sep 30, 2024 · de85fd0 · de85fd0
1 parent bec3072
commit de85fd0
Show file tree

Hide file tree

Showing 134 changed files with 659 additions and 441 deletions.
diff --git a/command/README.md b/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

diff --git a/command/api/api.go b/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() {

diff --git a/command/api/token/create.go b/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 {

diff --git a/command/base64/base64.go b/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() {

diff --git a/command/beta/beta.go b/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

diff --git a/command/ca/acme/eab/add.go b/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"
 )

diff --git a/command/ca/acme/eab/list.go b/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"
 )

diff --git a/command/ca/acme/eab/remove.go b/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"

diff --git a/command/ca/admin/add.go b/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 {

diff --git a/command/ca/admin/admin.go b/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"
 )
 

diff --git a/command/ca/admin/list.go b/command/ca/admin/list.go
@@ -5,11 +5,13 @@ import (
 	"os"
 	"text/tabwriter"
 
-	"github.com/smallstep/cli/flags"
-	"github.com/smallstep/cli/utils/cautils"
 	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/errs"
+
+	"github.com/smallstep/cli-utils/errs"
 	"go.step.sm/linkedca"
+
+	"github.com/smallstep/cli/flags"
+	"github.com/smallstep/cli/utils/cautils"
 )
 
 func listCommand() cli.Command {

diff --git a/command/ca/admin/remove.go b/command/ca/admin/remove.go
@@ -1,10 +1,12 @@
 package admin
 
 import (
+	"github.com/urfave/cli"
+
+	"github.com/smallstep/cli-utils/errs"
+
 	"github.com/smallstep/cli/flags"
 	"github.com/smallstep/cli/utils/cautils"
-	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/errs"
 )
 
 func removeCommand() cli.Command {

diff --git a/command/ca/admin/update.go b/command/ca/admin/update.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 updateCommand() cli.Command {

diff --git a/command/ca/bootstrap.go b/command/ca/bootstrap.go
@@ -3,11 +3,13 @@ package ca
 import (
 	"strings"
 
+	"github.com/urfave/cli"
+
+	"github.com/smallstep/cli-utils/command"
+	"github.com/smallstep/cli-utils/errs"
+
 	"github.com/smallstep/cli/flags"
 	"github.com/smallstep/cli/utils/cautils"
-	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/command"
-	"go.step.sm/cli-utils/errs"
 )
 
 func bootstrapCommand() cli.Command {

diff --git a/command/ca/ca.go b/command/ca/ca.go
@@ -1,12 +1,14 @@
 package ca
 
 import (
+	"github.com/urfave/cli"
+
+	"github.com/smallstep/cli-utils/command"
+
 	"github.com/smallstep/cli/command/ca/acme"
 	"github.com/smallstep/cli/command/ca/admin"
 	"github.com/smallstep/cli/command/ca/policy"
 	"github.com/smallstep/cli/command/ca/provisioner"
-	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/command"
 )
 
 // init creates and registers the ca command

diff --git a/command/ca/certificate.go b/command/ca/certificate.go
@@ -5,15 +5,17 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+	"github.com/urfave/cli"
+
+	"github.com/smallstep/cli-utils/command"
+	"github.com/smallstep/cli-utils/errs"
+	"github.com/smallstep/cli-utils/step"
+	"github.com/smallstep/cli-utils/ui"
+	"go.step.sm/crypto/pemutil"
+
 	"github.com/smallstep/cli/flags"
 	"github.com/smallstep/cli/token"
 	"github.com/smallstep/cli/utils/cautils"
-	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/command"
-	"go.step.sm/cli-utils/errs"
-	"go.step.sm/cli-utils/step"
-	"go.step.sm/cli-utils/ui"
-	"go.step.sm/crypto/pemutil"
 )
 
 func certificateCommand() cli.Command {

diff --git a/command/ca/federation.go b/command/ca/federation.go
@@ -6,16 +6,18 @@ import (
 	"os"
 
 	"github.com/pkg/errors"
+	"github.com/urfave/cli"
+
 	"github.com/smallstep/certificates/api"
 	"github.com/smallstep/certificates/ca"
 	"github.com/smallstep/certificates/pki"
+	"github.com/smallstep/cli-utils/command"
+	"github.com/smallstep/cli-utils/errs"
+	"github.com/smallstep/cli-utils/ui"
+	"go.step.sm/crypto/pemutil"
+
 	"github.com/smallstep/cli/flags"
 	"github.com/smallstep/cli/utils"
-	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/command"
-	"go.step.sm/cli-utils/errs"
-	"go.step.sm/cli-utils/ui"
-	"go.step.sm/crypto/pemutil"
 )
 
 type flowType int

diff --git a/command/ca/health.go b/command/ca/health.go
@@ -5,11 +5,13 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/urfave/cli"
+
 	"github.com/smallstep/certificates/ca"
 	"github.com/smallstep/certificates/pki"
+	"github.com/smallstep/cli-utils/errs"
+
 	"github.com/smallstep/cli/flags"
-	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/errs"
 )
 
 func healthCommand() cli.Command {

diff --git a/command/ca/init.go b/command/ca/init.go
@@ -14,21 +14,20 @@ import (
 
 	"github.com/manifoldco/promptui"
 	"github.com/pkg/errors"
-	"github.com/smallstep/certificates/cas/apiv1"
-	"github.com/smallstep/certificates/pki"
-	"github.com/smallstep/cli/flags"
-	"github.com/smallstep/cli/utils"
-	"github.com/smallstep/cli/utils/cautils"
 	"github.com/urfave/cli"
 
-	"go.step.sm/cli-utils/errs"
-	"go.step.sm/cli-utils/step"
-	"go.step.sm/cli-utils/ui"
+	"github.com/smallstep/certificates/cas/apiv1"
+	"github.com/smallstep/certificates/pki"
+	"github.com/smallstep/cli-utils/errs"
+	"github.com/smallstep/cli-utils/step"
+	"github.com/smallstep/cli-utils/ui"
 	"go.step.sm/crypto/kms"
+	_ "go.step.sm/crypto/kms/azurekms" // enable azurekms
 	"go.step.sm/crypto/pemutil"
 
-	// Enable azurekms
-	_ "go.step.sm/crypto/kms/azurekms"
+	"github.com/smallstep/cli/flags"
+	"github.com/smallstep/cli/utils"
+	"github.com/smallstep/cli/utils/cautils"
 )
 
 func initCommand() cli.Command {

diff --git a/command/ca/policy/actions/cn.go b/command/ca/policy/actions/cn.go
@@ -6,7 +6,8 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/errs"
+
+	"github.com/smallstep/cli-utils/errs"
 
 	"github.com/smallstep/cli/command/ca/policy/policycontext"
 	"github.com/smallstep/cli/flags"

diff --git a/command/ca/policy/actions/dns.go b/command/ca/policy/actions/dns.go
@@ -6,7 +6,8 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/errs"
+
+	"github.com/smallstep/cli-utils/errs"
 
 	"github.com/smallstep/cli/command/ca/policy/policycontext"
 	"github.com/smallstep/cli/flags"

diff --git a/command/ca/policy/actions/emails.go b/command/ca/policy/actions/emails.go
@@ -6,7 +6,8 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/errs"
+
+	"github.com/smallstep/cli-utils/errs"
 
 	"github.com/smallstep/cli/command/ca/policy/policycontext"
 	"github.com/smallstep/cli/flags"

diff --git a/command/ca/policy/actions/ips.go b/command/ca/policy/actions/ips.go
@@ -6,7 +6,8 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/errs"
+
+	"github.com/smallstep/cli-utils/errs"
 
 	"github.com/smallstep/cli/command/ca/policy/policycontext"
 	"github.com/smallstep/cli/flags"

diff --git a/command/ca/policy/actions/policy.go b/command/ca/policy/actions/policy.go
@@ -10,10 +10,10 @@ import (
 	"github.com/urfave/cli"
 	"google.golang.org/protobuf/encoding/protojson"
 
-	"go.step.sm/cli-utils/errs"
+	"github.com/smallstep/certificates/ca"
+	"github.com/smallstep/cli-utils/errs"
 	"go.step.sm/linkedca"
 
-	"github.com/smallstep/certificates/ca"
 	"github.com/smallstep/cli/command/ca/policy/policycontext"
 	"github.com/smallstep/cli/internal/command"
 )

diff --git a/command/ca/policy/actions/principals.go b/command/ca/policy/actions/principals.go
@@ -6,7 +6,8 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/errs"
+
+	"github.com/smallstep/cli-utils/errs"
 
 	"github.com/smallstep/cli/command/ca/policy/policycontext"
 	"github.com/smallstep/cli/flags"

diff --git a/command/ca/policy/actions/remove.go b/command/ca/policy/actions/remove.go
@@ -5,13 +5,15 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/urfave/cli"
+
 	"github.com/smallstep/certificates/ca"
+	"github.com/smallstep/cli-utils/errs"
+
 	"github.com/smallstep/cli/command/ca/policy/policycontext"
 	"github.com/smallstep/cli/flags"
 	"github.com/smallstep/cli/internal/command"
 	"github.com/smallstep/cli/utils/cautils"
-	"github.com/urfave/cli"
-	"go.step.sm/cli-utils/errs"
 )
 
 // RemoveCommand returns the policy remove subcommand.