From afa6eac6b9a9a6839400022afa7a249aa8f5b01c Mon Sep 17 00:00:00 2001 From: Herman Slatman Date: Fri, 3 Jan 2025 18:06:48 +0100 Subject: [PATCH] Use `github.com/smallstep/linkedca` @ `v0.23.0` --- command/ca/acme/eab/eab.go | 2 +- command/ca/admin/add.go | 2 +- command/ca/admin/admin.go | 2 +- command/ca/admin/list.go | 2 +- command/ca/admin/update.go | 2 +- command/ca/policy/actions/policy.go | 2 +- command/ca/policy/actions/view.go | 2 +- command/ca/provisioner/add.go | 2 +- command/ca/provisioner/caConfigClient.go | 2 +- command/ca/provisioner/provisioner.go | 2 +- command/ca/provisioner/update.go | 2 +- command/ca/provisioner/webhook/add.go | 2 +- command/ca/provisioner/webhook/update.go | 2 +- command/ca/provisioner/webhook/webhook.go | 2 +- go.mod | 6 ++++-- go.sum | 8 ++++++-- 16 files changed, 24 insertions(+), 18 deletions(-) diff --git a/command/ca/acme/eab/eab.go b/command/ca/acme/eab/eab.go index dd52a2360..b989482b6 100644 --- a/command/ca/acme/eab/eab.go +++ b/command/ca/acme/eab/eab.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" "github.com/urfave/cli" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/certificates/authority/admin" "github.com/smallstep/certificates/ca" diff --git a/command/ca/admin/add.go b/command/ca/admin/add.go index cdcf2c9cb..5ccdee6ec 100644 --- a/command/ca/admin/add.go +++ b/command/ca/admin/add.go @@ -9,7 +9,7 @@ import ( adminAPI "github.com/smallstep/certificates/authority/admin/api" "github.com/smallstep/cli-utils/errs" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/cli/flags" "github.com/smallstep/cli/utils/cautils" diff --git a/command/ca/admin/admin.go b/command/ca/admin/admin.go index 61360ba2b..73944753e 100644 --- a/command/ca/admin/admin.go +++ b/command/ca/admin/admin.go @@ -9,7 +9,7 @@ import ( "github.com/smallstep/certificates/ca" "github.com/smallstep/cli-utils/errs" "github.com/smallstep/cli-utils/ui" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" ) // Command returns the jwk subcommand. diff --git a/command/ca/admin/list.go b/command/ca/admin/list.go index 3504b84bf..c3e33a299 100644 --- a/command/ca/admin/list.go +++ b/command/ca/admin/list.go @@ -8,7 +8,7 @@ import ( "github.com/urfave/cli" "github.com/smallstep/cli-utils/errs" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/cli/flags" "github.com/smallstep/cli/utils/cautils" diff --git a/command/ca/admin/update.go b/command/ca/admin/update.go index fde48f806..e01d8f2ee 100644 --- a/command/ca/admin/update.go +++ b/command/ca/admin/update.go @@ -9,7 +9,7 @@ import ( adminAPI "github.com/smallstep/certificates/authority/admin/api" "github.com/smallstep/cli-utils/errs" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/cli/flags" "github.com/smallstep/cli/utils/cautils" diff --git a/command/ca/policy/actions/policy.go b/command/ca/policy/actions/policy.go index c09ce44f9..a615d2886 100644 --- a/command/ca/policy/actions/policy.go +++ b/command/ca/policy/actions/policy.go @@ -12,7 +12,7 @@ import ( "github.com/smallstep/certificates/ca" "github.com/smallstep/cli-utils/errs" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/cli/command/ca/policy/policycontext" "github.com/smallstep/cli/internal/command" diff --git a/command/ca/policy/actions/view.go b/command/ca/policy/actions/view.go index 92499be6e..a3539d16d 100644 --- a/command/ca/policy/actions/view.go +++ b/command/ca/policy/actions/view.go @@ -9,7 +9,7 @@ import ( "github.com/smallstep/certificates/ca" "github.com/smallstep/cli-utils/errs" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/cli/command/ca/policy/policycontext" "github.com/smallstep/cli/flags" diff --git a/command/ca/provisioner/add.go b/command/ca/provisioner/add.go index 2951fcbd2..22662f99f 100644 --- a/command/ca/provisioner/add.go +++ b/command/ca/provisioner/add.go @@ -17,9 +17,9 @@ import ( "github.com/smallstep/cli-utils/errs" "github.com/smallstep/cli-utils/ui" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" "go.step.sm/crypto/pemutil" - "go.step.sm/linkedca" "github.com/smallstep/cli/flags" "github.com/smallstep/cli/internal/sliceutil" diff --git a/command/ca/provisioner/caConfigClient.go b/command/ca/provisioner/caConfigClient.go index 491a9ff72..5cd0dd6a8 100644 --- a/command/ca/provisioner/caConfigClient.go +++ b/command/ca/provisioner/caConfigClient.go @@ -10,7 +10,7 @@ import ( "github.com/smallstep/certificates/authority/provisioner" "github.com/smallstep/certificates/ca" "github.com/smallstep/cli-utils/ui" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" ) // nodb implements the certificates/Adminclient interface with noops. diff --git a/command/ca/provisioner/provisioner.go b/command/ca/provisioner/provisioner.go index 6f5c7cc3e..b41fe7c79 100644 --- a/command/ca/provisioner/provisioner.go +++ b/command/ca/provisioner/provisioner.go @@ -15,7 +15,7 @@ import ( "github.com/smallstep/certificates/ca" "github.com/smallstep/cli-utils/errs" "github.com/smallstep/cli-utils/ui" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/cli/command/ca/provisioner/webhook" "github.com/smallstep/cli/utils" diff --git a/command/ca/provisioner/update.go b/command/ca/provisioner/update.go index 1b041f2aa..9577ccbc3 100644 --- a/command/ca/provisioner/update.go +++ b/command/ca/provisioner/update.go @@ -17,9 +17,9 @@ import ( "github.com/smallstep/cli-utils/errs" "github.com/smallstep/cli-utils/ui" + "github.com/smallstep/linkedca" "go.step.sm/crypto/jose" "go.step.sm/crypto/pemutil" - "go.step.sm/linkedca" "github.com/smallstep/cli/flags" "github.com/smallstep/cli/internal/sliceutil" diff --git a/command/ca/provisioner/webhook/add.go b/command/ca/provisioner/webhook/add.go index 6a28bf76c..d6dda214e 100644 --- a/command/ca/provisioner/webhook/add.go +++ b/command/ca/provisioner/webhook/add.go @@ -6,7 +6,7 @@ import ( "github.com/urfave/cli" "github.com/smallstep/cli-utils/errs" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/cli/flags" "github.com/smallstep/cli/utils" diff --git a/command/ca/provisioner/webhook/update.go b/command/ca/provisioner/webhook/update.go index cdbcc30c7..abcbbdacf 100644 --- a/command/ca/provisioner/webhook/update.go +++ b/command/ca/provisioner/webhook/update.go @@ -8,7 +8,7 @@ import ( "github.com/smallstep/certificates/ca" "github.com/smallstep/cli-utils/errs" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/cli/flags" "github.com/smallstep/cli/utils" diff --git a/command/ca/provisioner/webhook/webhook.go b/command/ca/provisioner/webhook/webhook.go index d84752317..b4ac65a24 100644 --- a/command/ca/provisioner/webhook/webhook.go +++ b/command/ca/provisioner/webhook/webhook.go @@ -11,7 +11,7 @@ import ( "github.com/smallstep/certificates/ca" "github.com/smallstep/cli-utils/errs" "github.com/smallstep/cli-utils/ui" - "go.step.sm/linkedca" + "github.com/smallstep/linkedca" "github.com/smallstep/cli/utils/cautils" ) diff --git a/go.mod b/go.mod index b79c56c09..3baafe4b7 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,7 @@ require ( github.com/smallstep/certinfo v1.13.0 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/truststore v0.13.0 github.com/smallstep/zcrypto v0.0.0-20221001003018-1ab2364d2a91 github.com/smallstep/zlint v0.0.0-20220930192201-67fb4aa21910 @@ -27,7 +28,6 @@ require ( github.com/urfave/cli v1.22.16 go.mozilla.org/pkcs7 v0.9.0 go.step.sm/crypto v0.56.0 - go.step.sm/linkedca v0.22.2 golang.org/x/crypto v0.32.0 golang.org/x/sys v0.29.0 golang.org/x/term v0.28.0 @@ -129,6 +129,7 @@ require ( go.opentelemetry.io/otel v1.31.0 // indirect go.opentelemetry.io/otel/metric v1.31.0 // indirect go.opentelemetry.io/otel/trace v1.31.0 // indirect + go.step.sm/linkedca v0.22.2 // indirect golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 // indirect golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.24.0 // indirect @@ -139,7 +140,8 @@ require ( google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 // indirect - google.golang.org/grpc v1.69.0 // indirect + google.golang.org/grpc v1.69.2 // indirect + google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect howett.net/plist v1.0.0 // indirect k8s.io/klog/v2 v2.130.1 // indirect diff --git a/go.sum b/go.sum index 4e7b5a4af..089c04a07 100644 --- a/go.sum +++ b/go.sum @@ -301,6 +301,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 h1:klMnoL/Mrw9MJaAZdGUuEAKSskSoy14KIUpRwGOd4Vo= @@ -474,8 +476,10 @@ google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f h1: google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f/go.mod h1:Yo94eF2nj7igQt+TiJ49KxjIH8ndLYPZMIRSiRcEbg0= google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583 h1:IfdSdTcLFy4lqUQrQJLkLt1PB+AsqVz6lwkWPzWEz10= google.golang.org/genproto/googleapis/rpc v0.0.0-20241206012308-a4fef0638583/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= -google.golang.org/grpc v1.69.0 h1:quSiOM1GJPmPH5XtU+BCoVXcDVJJAzNcoyfC2cCjGkI= -google.golang.org/grpc v1.69.0/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= +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=