From: Simon Josefsson <simon@josefsson.org>
Subject: [PATCH] Fix step/cli-utils
Forwarded: not-needed
Last-Update: 2025-10-16

perl -pi -e 's,"github.com/smallstep/cli-utils,"go.step.sm/cli-utils,' $(find . -type f)

diff --git a/authority/export.go b/authority/export.go
index 0380a93..9f1376b 100644
--- a/authority/export.go
+++ b/authority/export.go
@@ -10,7 +10,7 @@ import (
 	"github.com/pkg/errors"
 	"google.golang.org/protobuf/types/known/structpb"
 
-	"github.com/smallstep/cli-utils/step"
+	"go.step.sm/cli-utils/step"
 	"github.com/smallstep/linkedca"
 
 	"github.com/smallstep/certificates/authority/provisioner"
diff --git a/authority/provisioner/options.go b/authority/provisioner/options.go
index f68e9da..ec77808 100644
--- a/authority/provisioner/options.go
+++ b/authority/provisioner/options.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/smallstep/cli-utils/step"
+	"go.step.sm/cli-utils/step"
 	"go.step.sm/crypto/jose"
 	"go.step.sm/crypto/x509util"
 
diff --git a/authority/provisioner/ssh_options.go b/authority/provisioner/ssh_options.go
index def2ec7..88db043 100644
--- a/authority/provisioner/ssh_options.go
+++ b/authority/provisioner/ssh_options.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/smallstep/cli-utils/step"
+	"go.step.sm/cli-utils/step"
 	"go.step.sm/crypto/sshutil"
 
 	"github.com/smallstep/certificates/authority/policy"
diff --git a/authority/provisioners.go b/authority/provisioners.go
index d010485..c9aedf3 100644
--- a/authority/provisioners.go
+++ b/authority/provisioners.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/smallstep/cli-utils/step"
-	"github.com/smallstep/cli-utils/ui"
+	"go.step.sm/cli-utils/step"
+	"go.step.sm/cli-utils/ui"
 	"github.com/smallstep/linkedca"
 	"go.step.sm/crypto/jose"
 
diff --git a/ca/adminClient.go b/ca/adminClient.go
index 2ec4356..5187a78 100644
--- a/ca/adminClient.go
+++ b/ca/adminClient.go
@@ -15,8 +15,8 @@ import (
 	"github.com/pkg/errors"
 	"google.golang.org/protobuf/encoding/protojson"
 
-	"github.com/smallstep/cli-utils/token"
-	"github.com/smallstep/cli-utils/token/provision"
+	"go.step.sm/cli-utils/token"
+	"go.step.sm/cli-utils/token/provision"
 	"github.com/smallstep/linkedca"
 	"go.step.sm/crypto/jose"
 	"go.step.sm/crypto/randutil"
diff --git a/ca/ca.go b/ca/ca.go
index 9991d64..b3da0ad 100644
--- a/ca/ca.go
+++ b/ca/ca.go
@@ -20,7 +20,7 @@ import (
 	"github.com/go-chi/chi/v5/middleware"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/smallstep/cli-utils/step"
+	"go.step.sm/cli-utils/step"
 	"github.com/smallstep/nosql"
 	"go.step.sm/crypto/x509util"
 
diff --git a/ca/client.go b/ca/client.go
index 7d0fd51..46fff2b 100644
--- a/ca/client.go
+++ b/ca/client.go
@@ -29,7 +29,7 @@ import (
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
 
-	"github.com/smallstep/cli-utils/step"
+	"go.step.sm/cli-utils/step"
 	"go.step.sm/crypto/jose"
 	"go.step.sm/crypto/keyutil"
 	"go.step.sm/crypto/pemutil"
diff --git a/ca/identity/identity.go b/ca/identity/identity.go
index 9b25b62..bf12454 100644
--- a/ca/identity/identity.go
+++ b/ca/identity/identity.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/smallstep/cli-utils/step"
+	"go.step.sm/cli-utils/step"
 	"go.step.sm/crypto/pemutil"
 
 	"github.com/smallstep/certificates/api"
diff --git a/ca/provisioner.go b/ca/provisioner.go
index 5d730b0..3c55ae5 100644
--- a/ca/provisioner.go
+++ b/ca/provisioner.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/smallstep/cli-utils/token"
-	"github.com/smallstep/cli-utils/token/provision"
+	"go.step.sm/cli-utils/token"
+	"go.step.sm/cli-utils/token/provision"
 	"go.step.sm/crypto/jose"
 	"go.step.sm/crypto/randutil"
 
diff --git a/cas/stepcas/jwk_issuer.go b/cas/stepcas/jwk_issuer.go
index 2af4fce..7a794e5 100644
--- a/cas/stepcas/jwk_issuer.go
+++ b/cas/stepcas/jwk_issuer.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/smallstep/cli-utils/ui"
+	"go.step.sm/cli-utils/ui"
 	"go.step.sm/crypto/jose"
 	"go.step.sm/crypto/randutil"
 
diff --git a/cmd/step-ca/main.go b/cmd/step-ca/main.go
index 46661e6..22f2af4 100644
--- a/cmd/step-ca/main.go
+++ b/cmd/step-ca/main.go
@@ -20,11 +20,11 @@ import (
 
 	"github.com/smallstep/certificates/authority"
 	"github.com/smallstep/certificates/commands"
-	"github.com/smallstep/cli-utils/command"
-	"github.com/smallstep/cli-utils/command/version"
-	"github.com/smallstep/cli-utils/step"
-	"github.com/smallstep/cli-utils/ui"
-	"github.com/smallstep/cli-utils/usage"
+	"go.step.sm/cli-utils/command"
+	"go.step.sm/cli-utils/command/version"
+	"go.step.sm/cli-utils/step"
+	"go.step.sm/cli-utils/ui"
+	"go.step.sm/cli-utils/usage"
 	"go.step.sm/crypto/pemutil"
 
 	// Enabled kms interfaces.
diff --git a/commands/app.go b/commands/app.go
index 022f43d..9507c96 100644
--- a/commands/app.go
+++ b/commands/app.go
@@ -15,8 +15,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 
-	"github.com/smallstep/cli-utils/errs"
-	"github.com/smallstep/cli-utils/step"
+	"go.step.sm/cli-utils/errs"
+	"go.step.sm/cli-utils/step"
 
 	"github.com/smallstep/certificates/acme"
 	"github.com/smallstep/certificates/authority/config"
diff --git a/commands/export.go b/commands/export.go
index b09c290..2aa96f6 100644
--- a/commands/export.go
+++ b/commands/export.go
@@ -11,8 +11,8 @@ import (
 	"github.com/urfave/cli"
 	"google.golang.org/protobuf/encoding/protojson"
 
-	"github.com/smallstep/cli-utils/command"
-	"github.com/smallstep/cli-utils/errs"
+	"go.step.sm/cli-utils/command"
+	"go.step.sm/cli-utils/errs"
 
 	"github.com/smallstep/certificates/authority"
 	"github.com/smallstep/certificates/authority/config"
diff --git a/commands/onboard.go b/commands/onboard.go
index b3e95ac..724313d 100644
--- a/commands/onboard.go
+++ b/commands/onboard.go
@@ -11,10 +11,10 @@ import (
 	"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/fileutil"
-	"github.com/smallstep/cli-utils/ui"
+	"go.step.sm/cli-utils/command"
+	"go.step.sm/cli-utils/errs"
+	"go.step.sm/cli-utils/fileutil"
+	"go.step.sm/cli-utils/ui"
 	"go.step.sm/crypto/randutil"
 
 	"github.com/smallstep/certificates/authority/config"
diff --git a/pki/pki.go b/pki/pki.go
index 2c3a158..acbf4c1 100644
--- a/pki/pki.go
+++ b/pki/pki.go
@@ -19,10 +19,10 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/crypto/ssh"
 
-	"github.com/smallstep/cli-utils/errs"
-	"github.com/smallstep/cli-utils/fileutil"
-	"github.com/smallstep/cli-utils/step"
-	"github.com/smallstep/cli-utils/ui"
+	"go.step.sm/cli-utils/errs"
+	"go.step.sm/cli-utils/fileutil"
+	"go.step.sm/cli-utils/step"
+	"go.step.sm/cli-utils/ui"
 	"github.com/smallstep/linkedca"
 	"github.com/smallstep/nosql"
 	"go.step.sm/crypto/jose"
diff --git a/pki/pki_test.go b/pki/pki_test.go
index f707a86..e6bafe7 100644
--- a/pki/pki_test.go
+++ b/pki/pki_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/smallstep/cli-utils/step"
+	"go.step.sm/cli-utils/step"
 	"github.com/smallstep/nosql"
 
 	"github.com/smallstep/certificates/authority/admin"
diff --git a/pki/templates.go b/pki/templates.go
index bae6db1..2dce6fa 100644
--- a/pki/templates.go
+++ b/pki/templates.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/smallstep/cli-utils/errs"
-	"github.com/smallstep/cli-utils/fileutil"
-	"github.com/smallstep/cli-utils/step"
+	"go.step.sm/cli-utils/errs"
+	"go.step.sm/cli-utils/fileutil"
+	"go.step.sm/cli-utils/step"
 
 	"github.com/smallstep/certificates/templates"
 )
diff --git a/templates/templates.go b/templates/templates.go
index a8cd1df..1b41289 100644
--- a/templates/templates.go
+++ b/templates/templates.go
@@ -11,8 +11,8 @@ import (
 	"github.com/Masterminds/sprig/v3"
 	"github.com/pkg/errors"
 
-	"github.com/smallstep/cli-utils/fileutil"
-	"github.com/smallstep/cli-utils/step"
+	"go.step.sm/cli-utils/fileutil"
+	"go.step.sm/cli-utils/step"
 )
 
 // TemplateType defines how a template will be written in disk.
