From f4736325fa4737877baa9112a78aa7cb047ec5f0 Mon Sep 17 00:00:00 2001 From: Herman Slatman Date: Fri, 3 Jan 2025 18:24:19 +0100 Subject: [PATCH] Use `github.com/smallstep/linkedca` @ `v0.23.0` --- api/read/read_test.go | 2 +- authority/admin/api/acme.go | 2 +- authority/admin/api/acme_test.go | 2 +- authority/admin/api/admin.go | 2 +- authority/admin/api/admin_test.go | 2 +- authority/admin/api/middleware.go | 2 +- authority/admin/api/middleware_test.go | 2 +- authority/admin/api/policy.go | 2 +- authority/admin/api/policy_test.go | 2 +- authority/admin/api/provisioner.go | 2 +- authority/admin/api/provisioner_test.go | 2 +- authority/admin/api/webhook.go | 2 +- authority/admin/api/webhook_test.go | 2 +- authority/admin/db.go | 2 +- authority/admin/db/nosql/admin.go | 2 +- authority/admin/db/nosql/admin_test.go | 2 +- authority/admin/db/nosql/policy.go | 2 +- authority/admin/db/nosql/policy_test.go | 2 +- authority/admin/db/nosql/provisioner.go | 2 +- authority/admin/db/nosql/provisioner_test.go | 2 +- authority/administrator/collection.go | 2 +- authority/admins.go | 2 +- authority/authority.go | 2 +- authority/authorize.go | 2 +- authority/config/config.go | 2 +- authority/export.go | 2 +- authority/linkedca.go | 2 +- authority/policy.go | 2 +- authority/policy/policy.go | 2 +- authority/policy/policy_test.go | 2 +- authority/policy_test.go | 2 +- authority/provisioner/acme.go | 2 +- authority/provisioner/aws.go | 2 +- authority/provisioner/azure.go | 2 +- authority/provisioner/controller.go | 2 +- authority/provisioner/controller_test.go | 2 +- authority/provisioner/gcp.go | 2 +- authority/provisioner/jwk.go | 2 +- authority/provisioner/k8sSA.go | 2 +- authority/provisioner/nebula.go | 2 +- authority/provisioner/oidc.go | 2 +- authority/provisioner/scep.go | 2 +- authority/provisioner/scep_test.go | 2 +- authority/provisioner/webhook.go | 2 +- authority/provisioner/webhook_test.go | 2 +- authority/provisioner/x5c.go | 2 +- authority/provisioner/x5c_test.go | 2 +- authority/provisioners.go | 2 +- authority/provisioners_test.go | 2 +- ca/adminClient.go | 2 +- go.mod | 3 ++- go.sum | 6 ++++-- pki/helm.go | 2 +- pki/helm_test.go | 2 +- pki/pki.go | 2 +- scep/authority_test.go | 2 +- 56 files changed, 60 insertions(+), 57 deletions(-) diff --git a/api/read/read_test.go b/api/read/read_test.go index e557a9a29..fe29903fa 100644 --- a/api/read/read_test.go +++ b/api/read/read_test.go @@ -15,7 +15,7 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/certificates/errs" ) diff --git a/authority/admin/api/acme.go b/authority/admin/api/acme.go index 6fc708963..3b13c4456 100644 --- a/authority/admin/api/acme.go +++ b/authority/admin/api/acme.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "google.golang.org/protobuf/types/known/timestamppb" "github.com/smallstep/certificates/acme" diff --git a/authority/admin/api/acme_test.go b/authority/admin/api/acme_test.go index 4c0af799b..12ac52ec0 100644 --- a/authority/admin/api/acme_test.go +++ b/authority/admin/api/acme_test.go @@ -17,7 +17,7 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/timestamppb" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/assert" "github.com/smallstep/certificates/acme" diff --git a/authority/admin/api/admin.go b/authority/admin/api/admin.go index ce22de050..6eaed84ea 100644 --- a/authority/admin/api/admin.go +++ b/authority/admin/api/admin.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi/v5" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/certificates/api" "github.com/smallstep/certificates/api/read" diff --git a/authority/admin/api/admin_test.go b/authority/admin/api/admin_test.go index aae220561..44857a2eb 100644 --- a/authority/admin/api/admin_test.go +++ b/authority/admin/api/admin_test.go @@ -16,7 +16,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "google.golang.org/protobuf/types/known/timestamppb" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/assert" "github.com/smallstep/certificates/authority/admin" diff --git a/authority/admin/api/middleware.go b/authority/admin/api/middleware.go index 68006b7f9..e9b5f903f 100644 --- a/authority/admin/api/middleware.go +++ b/authority/admin/api/middleware.go @@ -5,7 +5,7 @@ import ( "github.com/go-chi/chi/v5" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/certificates/acme" "github.com/smallstep/certificates/api/render" diff --git a/authority/admin/api/middleware_test.go b/authority/admin/api/middleware_test.go index d166865f7..44d5a903b 100644 --- a/authority/admin/api/middleware_test.go +++ b/authority/admin/api/middleware_test.go @@ -16,7 +16,7 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "google.golang.org/protobuf/types/known/timestamppb" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/assert" "github.com/smallstep/certificates/acme" diff --git a/authority/admin/api/policy.go b/authority/admin/api/policy.go index d2d8183ff..bee067acd 100644 --- a/authority/admin/api/policy.go +++ b/authority/admin/api/policy.go @@ -5,7 +5,7 @@ import ( "errors" "net/http" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/certificates/acme" "github.com/smallstep/certificates/api/read" diff --git a/authority/admin/api/policy_test.go b/authority/admin/api/policy_test.go index 159fc0e16..b77e7f632 100644 --- a/authority/admin/api/policy_test.go +++ b/authority/admin/api/policy_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/protobuf/encoding/protojson" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/certificates/acme" "github.com/smallstep/certificates/authority" diff --git a/authority/admin/api/provisioner.go b/authority/admin/api/provisioner.go index b2a59cfa9..ad914810d 100644 --- a/authority/admin/api/provisioner.go +++ b/authority/admin/api/provisioner.go @@ -6,9 +6,9 @@ import ( "github.com/go-chi/chi/v5" + "github.com/smallstep/linkedca" "go.step.sm/crypto/sshutil" "go.step.sm/crypto/x509util" - "go.step.sm/linkedca" "github.com/smallstep/certificates/api" "github.com/smallstep/certificates/api/read" diff --git a/authority/admin/api/provisioner_test.go b/authority/admin/api/provisioner_test.go index 9860d824a..c154084eb 100644 --- a/authority/admin/api/provisioner_test.go +++ b/authority/admin/api/provisioner_test.go @@ -19,7 +19,7 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "github.com/smallstep/assert" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/certificates/authority/admin" "github.com/smallstep/certificates/authority/provisioner" diff --git a/authority/admin/api/webhook.go b/authority/admin/api/webhook.go index 88c7e313f..b003d7224 100644 --- a/authority/admin/api/webhook.go +++ b/authority/admin/api/webhook.go @@ -10,8 +10,8 @@ import ( "github.com/smallstep/certificates/api/read" "github.com/smallstep/certificates/api/render" "github.com/smallstep/certificates/authority/admin" + "github.com/smallstep/linkedca" "go.step.sm/crypto/randutil" - "go.step.sm/linkedca" ) // WebhookAdminResponder is the interface responsible for writing webhook admin diff --git a/authority/admin/api/webhook_test.go b/authority/admin/api/webhook_test.go index aa8d6f835..736718402 100644 --- a/authority/admin/api/webhook_test.go +++ b/authority/admin/api/webhook_test.go @@ -14,8 +14,8 @@ import ( "github.com/go-chi/chi/v5" "github.com/smallstep/certificates/authority" "github.com/smallstep/certificates/authority/admin" + "github.com/smallstep/linkedca" "github.com/stretchr/testify/assert" - "go.step.sm/linkedca" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/authority/admin/db.go b/authority/admin/db.go index b98944578..63940a8a3 100644 --- a/authority/admin/db.go +++ b/authority/admin/db.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/pkg/errors" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" ) const ( diff --git a/authority/admin/db/nosql/admin.go b/authority/admin/db/nosql/admin.go index e30cea3ad..6e7aab669 100644 --- a/authority/admin/db/nosql/admin.go +++ b/authority/admin/db/nosql/admin.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" "github.com/smallstep/certificates/authority/admin" + "github.com/smallstep/linkedca" "github.com/smallstep/nosql" - "go.step.sm/linkedca" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/authority/admin/db/nosql/admin_test.go b/authority/admin/db/nosql/admin_test.go index a50fe58b5..f8052b514 100644 --- a/authority/admin/db/nosql/admin_test.go +++ b/authority/admin/db/nosql/admin_test.go @@ -10,9 +10,9 @@ import ( "github.com/smallstep/assert" "github.com/smallstep/certificates/authority/admin" "github.com/smallstep/certificates/db" + "github.com/smallstep/linkedca" "github.com/smallstep/nosql" nosqldb "github.com/smallstep/nosql/database" - "go.step.sm/linkedca" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/authority/admin/db/nosql/policy.go b/authority/admin/db/nosql/policy.go index 0a5293836..e1e85560f 100644 --- a/authority/admin/db/nosql/policy.go +++ b/authority/admin/db/nosql/policy.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/certificates/authority/admin" "github.com/smallstep/nosql" diff --git a/authority/admin/db/nosql/policy_test.go b/authority/admin/db/nosql/policy_test.go index 84f02a1d1..833fbc874 100644 --- a/authority/admin/db/nosql/policy_test.go +++ b/authority/admin/db/nosql/policy_test.go @@ -10,9 +10,9 @@ import ( "github.com/smallstep/assert" "github.com/smallstep/certificates/authority/admin" "github.com/smallstep/certificates/db" + "github.com/smallstep/linkedca" "github.com/smallstep/nosql" nosqldb "github.com/smallstep/nosql/database" - "go.step.sm/linkedca" ) func TestDB_getDBAuthorityPolicyBytes(t *testing.T) { diff --git a/authority/admin/db/nosql/provisioner.go b/authority/admin/db/nosql/provisioner.go index 05b077f33..e3c26b18c 100644 --- a/authority/admin/db/nosql/provisioner.go +++ b/authority/admin/db/nosql/provisioner.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" "github.com/smallstep/certificates/authority/admin" + "github.com/smallstep/linkedca" "github.com/smallstep/nosql" - "go.step.sm/linkedca" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/authority/admin/db/nosql/provisioner_test.go b/authority/admin/db/nosql/provisioner_test.go index 73e0368de..d6ff10003 100644 --- a/authority/admin/db/nosql/provisioner_test.go +++ b/authority/admin/db/nosql/provisioner_test.go @@ -10,9 +10,9 @@ import ( "github.com/smallstep/assert" "github.com/smallstep/certificates/authority/admin" "github.com/smallstep/certificates/db" + "github.com/smallstep/linkedca" "github.com/smallstep/nosql" nosqldb "github.com/smallstep/nosql/database" - "go.step.sm/linkedca" ) func TestDB_getDBProvisionerBytes(t *testing.T) { diff --git a/authority/administrator/collection.go b/authority/administrator/collection.go index f40e74176..716877d15 100644 --- a/authority/administrator/collection.go +++ b/authority/administrator/collection.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/smallstep/certificates/authority/admin" "github.com/smallstep/certificates/authority/provisioner" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" ) // DefaultAdminLimit is the default limit for listing provisioners. diff --git a/authority/admins.go b/authority/admins.go index c8e1ac663..392e1306a 100644 --- a/authority/admins.go +++ b/authority/admins.go @@ -5,7 +5,7 @@ import ( "github.com/smallstep/certificates/authority/admin" "github.com/smallstep/certificates/authority/provisioner" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" ) // LoadAdminByID returns an *linkedca.Admin with the given ID. diff --git a/authority/authority.go b/authority/authority.go index 7b93a39ad..2f66aeb04 100644 --- a/authority/authority.go +++ b/authority/authority.go @@ -17,11 +17,11 @@ import ( "github.com/pkg/errors" "golang.org/x/crypto/ssh" + "github.com/smallstep/linkedca" "go.step.sm/crypto/kms" kmsapi "go.step.sm/crypto/kms/apiv1" "go.step.sm/crypto/kms/sshagentkms" "go.step.sm/crypto/pemutil" - "go.step.sm/linkedca" "github.com/smallstep/certificates/authority/admin" adminDBNosql "github.com/smallstep/certificates/authority/admin/db/nosql" diff --git a/authority/authorize.go b/authority/authorize.go index 0a693c648..7e85bfc2b 100644 --- a/authority/authorize.go +++ b/authority/authorize.go @@ -16,8 +16,8 @@ import ( "github.com/smallstep/certificates/authority/admin" "github.com/smallstep/certificates/authority/provisioner" "github.com/smallstep/certificates/errs" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" - "go.step.sm/linkedca" "golang.org/x/crypto/ssh" ) diff --git a/authority/config/config.go b/authority/config/config.go index ea7ce35da..9878b2f0f 100644 --- a/authority/config/config.go +++ b/authority/config/config.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" + "github.com/smallstep/linkedca" kms "go.step.sm/crypto/kms/apiv1" - "go.step.sm/linkedca" "github.com/smallstep/certificates/authority/policy" "github.com/smallstep/certificates/authority/provisioner" diff --git a/authority/export.go b/authority/export.go index 43479d5f2..0380a9382 100644 --- a/authority/export.go +++ b/authority/export.go @@ -11,7 +11,7 @@ import ( "google.golang.org/protobuf/types/known/structpb" "github.com/smallstep/cli-utils/step" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/certificates/authority/provisioner" ) diff --git a/authority/linkedca.go b/authority/linkedca.go index aa8de3a80..1dee6313e 100644 --- a/authority/linkedca.go +++ b/authority/linkedca.go @@ -19,11 +19,11 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" "go.step.sm/crypto/keyutil" "go.step.sm/crypto/tlsutil" "go.step.sm/crypto/x509util" - "go.step.sm/linkedca" "github.com/smallstep/certificates/authority/admin" "github.com/smallstep/certificates/authority/provisioner" diff --git a/authority/policy.go b/authority/policy.go index 986b45b85..281e185ed 100644 --- a/authority/policy.go +++ b/authority/policy.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/certificates/authority/admin" authPolicy "github.com/smallstep/certificates/authority/policy" diff --git a/authority/policy/policy.go b/authority/policy/policy.go index 1da45e83d..d644c7373 100644 --- a/authority/policy/policy.go +++ b/authority/policy/policy.go @@ -3,7 +3,7 @@ package policy import ( "fmt" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/certificates/policy" ) diff --git a/authority/policy/policy_test.go b/authority/policy/policy_test.go index 9210ad901..bc67db622 100644 --- a/authority/policy/policy_test.go +++ b/authority/policy/policy_test.go @@ -5,7 +5,7 @@ import ( "github.com/google/go-cmp/cmp" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" ) func TestPolicyToCertificates(t *testing.T) { diff --git a/authority/policy_test.go b/authority/policy_test.go index bf7a1233f..5a04e0596 100644 --- a/authority/policy_test.go +++ b/authority/policy_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-jose/go-jose/v3" "github.com/stretchr/testify/assert" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/certificates/authority/admin" "github.com/smallstep/certificates/authority/administrator" diff --git a/authority/provisioner/acme.go b/authority/provisioner/acme.go index 3b7fa654d..a892567ea 100644 --- a/authority/provisioner/acme.go +++ b/authority/provisioner/acme.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" "github.com/smallstep/certificates/acme/wire" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" ) // ACMEChallenge represents the supported acme challenges. diff --git a/authority/provisioner/aws.go b/authority/provisioner/aws.go index 9e1d9b7c6..9bbde2f7f 100644 --- a/authority/provisioner/aws.go +++ b/authority/provisioner/aws.go @@ -18,10 +18,10 @@ import ( "github.com/pkg/errors" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" "go.step.sm/crypto/sshutil" "go.step.sm/crypto/x509util" - "go.step.sm/linkedca" "github.com/smallstep/certificates/errs" "github.com/smallstep/certificates/webhook" diff --git a/authority/provisioner/azure.go b/authority/provisioner/azure.go index 0a86b6490..4b4a7b7b4 100644 --- a/authority/provisioner/azure.go +++ b/authority/provisioner/azure.go @@ -14,10 +14,10 @@ import ( "github.com/pkg/errors" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" "go.step.sm/crypto/sshutil" "go.step.sm/crypto/x509util" - "go.step.sm/linkedca" "github.com/smallstep/certificates/errs" "github.com/smallstep/certificates/webhook" diff --git a/authority/provisioner/controller.go b/authority/provisioner/controller.go index de9f54007..2d26fb375 100644 --- a/authority/provisioner/controller.go +++ b/authority/provisioner/controller.go @@ -11,7 +11,7 @@ import ( "github.com/smallstep/certificates/errs" "github.com/smallstep/certificates/internal/httptransport" "github.com/smallstep/certificates/webhook" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "golang.org/x/crypto/ssh" ) diff --git a/authority/provisioner/controller_test.go b/authority/provisioner/controller_test.go index 11da95b6c..549b8ca58 100644 --- a/authority/provisioner/controller_test.go +++ b/authority/provisioner/controller_test.go @@ -12,10 +12,10 @@ import ( "github.com/smallstep/certificates/authority/policy" "github.com/smallstep/certificates/internal/httptransport" "github.com/smallstep/certificates/webhook" + "github.com/smallstep/linkedca" "github.com/stretchr/testify/assert" "go.step.sm/crypto/pemutil" "go.step.sm/crypto/x509util" - "go.step.sm/linkedca" "golang.org/x/crypto/ssh" ) diff --git a/authority/provisioner/gcp.go b/authority/provisioner/gcp.go index c63a29cf7..d848976dd 100644 --- a/authority/provisioner/gcp.go +++ b/authority/provisioner/gcp.go @@ -15,10 +15,10 @@ import ( "github.com/pkg/errors" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" "go.step.sm/crypto/sshutil" "go.step.sm/crypto/x509util" - "go.step.sm/linkedca" "github.com/smallstep/certificates/errs" "github.com/smallstep/certificates/webhook" diff --git a/authority/provisioner/jwk.go b/authority/provisioner/jwk.go index 70a670611..1aaa001cd 100644 --- a/authority/provisioner/jwk.go +++ b/authority/provisioner/jwk.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" "go.step.sm/crypto/sshutil" "go.step.sm/crypto/x509util" - "go.step.sm/linkedca" "github.com/smallstep/certificates/errs" ) diff --git a/authority/provisioner/k8sSA.go b/authority/provisioner/k8sSA.go index 96267d1c3..fe60e95af 100644 --- a/authority/provisioner/k8sSA.go +++ b/authority/provisioner/k8sSA.go @@ -11,11 +11,11 @@ import ( "github.com/pkg/errors" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" "go.step.sm/crypto/pemutil" "go.step.sm/crypto/sshutil" "go.step.sm/crypto/x509util" - "go.step.sm/linkedca" "github.com/smallstep/certificates/errs" ) diff --git a/authority/provisioner/nebula.go b/authority/provisioner/nebula.go index 6a39a877f..356419d99 100644 --- a/authority/provisioner/nebula.go +++ b/authority/provisioner/nebula.go @@ -15,11 +15,11 @@ import ( "github.com/pkg/errors" nebula "github.com/slackhq/nebula/cert" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" "go.step.sm/crypto/sshutil" "go.step.sm/crypto/x25519" "go.step.sm/crypto/x509util" - "go.step.sm/linkedca" "golang.org/x/crypto/ssh" "github.com/smallstep/certificates/errs" diff --git a/authority/provisioner/oidc.go b/authority/provisioner/oidc.go index 25d29b500..16f9caf4e 100644 --- a/authority/provisioner/oidc.go +++ b/authority/provisioner/oidc.go @@ -13,10 +13,10 @@ import ( "github.com/pkg/errors" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" "go.step.sm/crypto/sshutil" "go.step.sm/crypto/x509util" - "go.step.sm/linkedca" "github.com/smallstep/certificates/errs" ) diff --git a/authority/provisioner/scep.go b/authority/provisioner/scep.go index bdbd2497f..b6e8b925e 100644 --- a/authority/provisioner/scep.go +++ b/authority/provisioner/scep.go @@ -13,10 +13,10 @@ import ( "github.com/pkg/errors" + "github.com/smallstep/linkedca" "go.step.sm/crypto/kms" kmsapi "go.step.sm/crypto/kms/apiv1" "go.step.sm/crypto/x509util" - "go.step.sm/linkedca" "github.com/smallstep/certificates/internal/httptransport" "github.com/smallstep/certificates/webhook" diff --git a/authority/provisioner/scep_test.go b/authority/provisioner/scep_test.go index c94a4b507..f520c931c 100644 --- a/authority/provisioner/scep_test.go +++ b/authority/provisioner/scep_test.go @@ -17,13 +17,13 @@ import ( "testing" "github.com/smallstep/certificates/webhook" + "github.com/smallstep/linkedca" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.step.sm/crypto/kms/softkms" "go.step.sm/crypto/minica" "go.step.sm/crypto/pemutil" "go.step.sm/crypto/x509util" - "go.step.sm/linkedca" ) func Test_challengeValidationController_Validate(t *testing.T) { diff --git a/authority/provisioner/webhook.go b/authority/provisioner/webhook.go index 962a17b9e..dba4a4c8e 100644 --- a/authority/provisioner/webhook.go +++ b/authority/provisioner/webhook.go @@ -16,7 +16,7 @@ import ( "github.com/pkg/errors" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/certificates/internal/httptransport" "github.com/smallstep/certificates/middleware/requestid" diff --git a/authority/provisioner/webhook_test.go b/authority/provisioner/webhook_test.go index 50136f418..5f720662a 100644 --- a/authority/provisioner/webhook_test.go +++ b/authority/provisioner/webhook_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/smallstep/linkedca" "go.step.sm/crypto/pemutil" "go.step.sm/crypto/x509util" - "go.step.sm/linkedca" "github.com/smallstep/certificates/internal/httptransport" "github.com/smallstep/certificates/middleware/requestid" diff --git a/authority/provisioner/x5c.go b/authority/provisioner/x5c.go index e1a152f0d..1166a7c90 100644 --- a/authority/provisioner/x5c.go +++ b/authority/provisioner/x5c.go @@ -9,10 +9,10 @@ import ( "github.com/pkg/errors" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" "go.step.sm/crypto/sshutil" "go.step.sm/crypto/x509util" - "go.step.sm/linkedca" "github.com/smallstep/certificates/errs" "github.com/smallstep/certificates/webhook" diff --git a/authority/provisioner/x5c_test.go b/authority/provisioner/x5c_test.go index 99d10b68c..f394bc05b 100644 --- a/authority/provisioner/x5c_test.go +++ b/authority/provisioner/x5c_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" "go.step.sm/crypto/pemutil" "go.step.sm/crypto/randutil" - "go.step.sm/linkedca" "github.com/smallstep/certificates/api/render" "github.com/stretchr/testify/assert" diff --git a/authority/provisioners.go b/authority/provisioners.go index 991c85099..53c087a45 100644 --- a/authority/provisioners.go +++ b/authority/provisioners.go @@ -13,8 +13,8 @@ import ( "github.com/smallstep/cli-utils/step" "github.com/smallstep/cli-utils/ui" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" - "go.step.sm/linkedca" "github.com/smallstep/certificates/authority/admin" "github.com/smallstep/certificates/authority/config" diff --git a/authority/provisioners_test.go b/authority/provisioners_test.go index 659df18ed..b53bbb4e8 100644 --- a/authority/provisioners_test.go +++ b/authority/provisioners_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/require" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" "go.step.sm/crypto/keyutil" - "go.step.sm/linkedca" "github.com/smallstep/assert" "github.com/smallstep/certificates/api/render" diff --git a/ca/adminClient.go b/ca/adminClient.go index 5fb6e9f68..464df92f1 100644 --- a/ca/adminClient.go +++ b/ca/adminClient.go @@ -17,9 +17,9 @@ import ( "github.com/smallstep/cli-utils/token" "github.com/smallstep/cli-utils/token/provision" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" "go.step.sm/crypto/randutil" - "go.step.sm/linkedca" adminAPI "github.com/smallstep/certificates/authority/admin/api" "github.com/smallstep/certificates/authority/provisioner" diff --git a/go.mod b/go.mod index fabb5b8d0..97bd9eb28 100644 --- a/go.mod +++ b/go.mod @@ -29,13 +29,13 @@ require ( github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262 github.com/smallstep/cli-utils v0.10.0 github.com/smallstep/go-attestation v0.4.4-0.20240109183208-413678f90935 + github.com/smallstep/linkedca v0.23.0 github.com/smallstep/nosql v0.7.0 github.com/smallstep/pkcs7 v0.1.1 github.com/smallstep/scep v0.0.0-20240926084937-8cf1ca453101 github.com/stretchr/testify v1.10.0 github.com/urfave/cli v1.22.16 go.step.sm/crypto v0.56.0 - go.step.sm/linkedca v0.22.2 go.uber.org/mock v0.5.0 golang.org/x/crypto v0.31.0 golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 @@ -166,5 +166,6 @@ require ( google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect + google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 7a3ec69dc..ccd42f153 100644 --- a/go.sum +++ b/go.sum @@ -358,6 +358,8 @@ github.com/smallstep/cli-utils v0.10.0 h1:CfXNvHtIN5pAzGvGP0NEUZoGFcj5epNEB6RSpS github.com/smallstep/cli-utils v0.10.0/go.mod h1:jIeNa5ctrVg89lU5TaQKYd6o1eFxi9mtZu1sXSxpEBg= github.com/smallstep/go-attestation v0.4.4-0.20240109183208-413678f90935 h1:kjYvkvS/Wdy0PVRDUAA0gGJIVSEZYhiAJtfwYgOYoGA= github.com/smallstep/go-attestation v0.4.4-0.20240109183208-413678f90935/go.mod h1:vNAduivU014fubg6ewygkAvQC0IQVXqdc8vaGl/0er4= +github.com/smallstep/linkedca v0.23.0 h1:5W/7EudlK1HcCIdZM68dJlZ7orqCCCyv6bm2l/0JmLU= +github.com/smallstep/linkedca v0.23.0/go.mod h1:7cyRM9soAYySg9ag65QwytcgGOM+4gOlkJ/YA58A9E8= github.com/smallstep/nosql v0.7.0 h1:YiWC9ZAHcrLCrayfaF+QJUv16I2bZ7KdLC3RpJcnAnE= github.com/smallstep/nosql v0.7.0/go.mod h1:H5VnKMCbeq9QA6SRY5iqPylfxLfYcLwvUff3onQ8+HU= github.com/smallstep/pkcs7 v0.0.0-20240911091500-b1cae6277023/go.mod h1:CM5KrX7rxWgwDdMj9yef/pJB2OPgy/56z4IEx2UIbpc= @@ -421,8 +423,6 @@ go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HY go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= go.step.sm/crypto v0.56.0 h1:KcFfV76cI9Xaw8bdSc9x55skyuSdcHcTdL37vvVZnvY= go.step.sm/crypto v0.56.0/go.mod h1:snWNloxY9s1W+HsFqcviq55nvzbqqX6LxVt0Vktv5mw= -go.step.sm/linkedca v0.22.2 h1:zmFIyDC77gFHo6FLQJ8OIXYpLYDIsgDWaYqtYs6A9/Q= -go.step.sm/linkedca v0.22.2/go.mod h1:ESY8r5VfhJA8ZVzI6hXIQcEX9LwaY3aoPnT+Hb9jpbw= go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -542,6 +542,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 h1:F29+wU6Ee6qgu9TddPgooOdaqsxTMunOoj8KA5yuS5A= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1/go.mod h1:5KF+wpkbTSbGcR9zteSqZV6fqFOWBl4Yde8En8MryZA= google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pki/helm.go b/pki/helm.go index 3de2c2ec0..dedc196de 100644 --- a/pki/helm.go +++ b/pki/helm.go @@ -10,7 +10,7 @@ import ( authconfig "github.com/smallstep/certificates/authority/config" "github.com/smallstep/certificates/authority/provisioner" "github.com/smallstep/certificates/templates" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" ) type helmVariables struct { diff --git a/pki/helm_test.go b/pki/helm_test.go index 3aa0d2242..fa43c6823 100644 --- a/pki/helm_test.go +++ b/pki/helm_test.go @@ -14,8 +14,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" - "go.step.sm/linkedca" "github.com/smallstep/certificates/cas/apiv1" ) diff --git a/pki/pki.go b/pki/pki.go index 83349a09d..b6401d1ea 100644 --- a/pki/pki.go +++ b/pki/pki.go @@ -23,12 +23,12 @@ import ( "github.com/smallstep/cli-utils/fileutil" "github.com/smallstep/cli-utils/step" "github.com/smallstep/cli-utils/ui" + "github.com/smallstep/linkedca" "github.com/smallstep/nosql" "go.step.sm/crypto/jose" "go.step.sm/crypto/kms" kmsapi "go.step.sm/crypto/kms/apiv1" "go.step.sm/crypto/pemutil" - "go.step.sm/linkedca" "github.com/smallstep/certificates/authority" "github.com/smallstep/certificates/authority/admin" diff --git a/scep/authority_test.go b/scep/authority_test.go index 326aa35cd..cf092f002 100644 --- a/scep/authority_test.go +++ b/scep/authority_test.go @@ -13,6 +13,7 @@ import ( "github.com/smallstep/certificates/authority/config" "github.com/smallstep/certificates/authority/provisioner" + "github.com/smallstep/linkedca" "github.com/smallstep/pkcs7" "github.com/smallstep/scep" "github.com/stretchr/testify/assert" @@ -21,7 +22,6 @@ import ( "go.step.sm/crypto/minica" "go.step.sm/crypto/randutil" "go.step.sm/crypto/x509util" - "go.step.sm/linkedca" ) func generateContent(t *testing.T, size int) []byte {