mirror of
https://github.com/gravitational/teleport.git
synced 2026-10-11 22:49:54 +00:00
Update cloudflare/cfssl in order to fix enterprise builds (#36439)
* Update cloudflare/cfssl in order to fix enterprise builds
We now depend on cloudflare/cfssl transitively via
gravitational/license. The cfssl repo itself has a dependency on
zmap/zlint, which is outdated and doesn't build on newer versions
of Go:
# github.com/zmap/zlint/util
../../../go/pkg/mod/github.com/zmap/[email protected]/util/encodings.go:38:24: cannot use atv.Type (variable of type "github.com/zmap/zcrypto/encoding/asn1".ObjectIdentifier) as "encoding/asn1".ObjectIdentifier value in argument to IsNameAttribute
../../../go/pkg/mod/github.com/zmap/[email protected]/util/oid.go:136:16: cannot use v.Type (variable of type "github.com/zmap/zcrypto/encoding/asn1".ObjectIdentifier) as "encoding/asn1".ObjectIdentifier value in argument to oid.Equal
The fix is to upgrade cfssl to a version that uses a newer version of
zlint. Cloud team resolved a similar issue in the past:
https://github.com/gravitational/cloud/pull/3805#discussion_r1143909550
* fix2
* deps update
This also includes e_imports from gravitational/teleport.e#3114
* gci
* new tag for e_imports, tpmsimulator
---------
Co-authored-by: Edoardo Spadolini <[email protected]>
This commit is contained in:
Zac Bergquist
co-authored by
Edoardo Spadolini
Edoardo Spadolini
parent
81725f262f
commit
0caca686e7
+42
-4
@@ -27,8 +27,8 @@ package teleport
|
||||
|
||||
// Remember to check that e is up to date and that there is not a go.work file
|
||||
// before running the following command to generate the import list. The list of
|
||||
// tags that might be needed in e (currently only "piv") can be extracted with a
|
||||
// (cd e && git grep //go:build).
|
||||
// tags that might be needed in e (currently "piv" and "tpmsimulator") can be
|
||||
// extracted with a (cd e && git grep //go:build).
|
||||
|
||||
// TODO(espadolini): turn this into a lint (needs access to teleport.e in CI and
|
||||
// ideally a resolution to https://github.com/golang/go/issues/42504 )
|
||||
@@ -38,7 +38,7 @@ go list -f '
|
||||
{{- range .Imports}}{{println .}}{{end -}}
|
||||
{{- range .TestImports}}{{println .}}{{end -}}
|
||||
{{- range .XTestImports}}{{println .}}{{end -}}
|
||||
' -tags piv ./e/... |
|
||||
' -tags piv,tpmsimulator ./e/... |
|
||||
sort -u |
|
||||
xargs go list -find -f '{{if (and
|
||||
(not .Standard)
|
||||
@@ -48,11 +48,21 @@ xargs go list -find -f '{{if (and
|
||||
|
||||
import (
|
||||
_ "github.com/alecthomas/kingpin/v2"
|
||||
_ "github.com/aws/aws-sdk-go-v2/aws"
|
||||
_ "github.com/aws/aws-sdk-go-v2/config"
|
||||
_ "github.com/aws/aws-sdk-go-v2/credentials/stscreds"
|
||||
_ "github.com/aws/aws-sdk-go-v2/service/athena"
|
||||
_ "github.com/aws/aws-sdk-go-v2/service/athena/types"
|
||||
_ "github.com/aws/aws-sdk-go-v2/service/glue"
|
||||
_ "github.com/aws/aws-sdk-go-v2/service/s3"
|
||||
_ "github.com/aws/aws-sdk-go-v2/service/sts"
|
||||
_ "github.com/aws/aws-sdk-go-v2/service/sts/types"
|
||||
_ "github.com/beevik/etree"
|
||||
_ "github.com/bufbuild/connect-go"
|
||||
_ "github.com/coreos/go-oidc/jose"
|
||||
_ "github.com/coreos/go-oidc/oauth2"
|
||||
_ "github.com/coreos/go-oidc/oidc"
|
||||
_ "github.com/coreos/go-semver/semver"
|
||||
_ "github.com/crewjam/saml"
|
||||
_ "github.com/crewjam/saml/samlsp"
|
||||
_ "github.com/go-piv/piv-go/piv"
|
||||
@@ -65,24 +75,29 @@ import (
|
||||
_ "github.com/google/uuid"
|
||||
_ "github.com/gravitational/form"
|
||||
_ "github.com/gravitational/license"
|
||||
_ "github.com/gravitational/license/generate"
|
||||
_ "github.com/gravitational/oxy/ratelimit"
|
||||
_ "github.com/gravitational/roundtrip"
|
||||
_ "github.com/gravitational/trace"
|
||||
_ "github.com/gravitational/trace/trail"
|
||||
_ "github.com/jonboulle/clockwork"
|
||||
_ "github.com/julienschmidt/httprouter"
|
||||
_ "github.com/mailgun/holster/v3/clock"
|
||||
_ "github.com/mitchellh/mapstructure"
|
||||
_ "github.com/okta/okta-sdk-golang/v2/okta"
|
||||
_ "github.com/okta/okta-sdk-golang/v2/okta/query"
|
||||
_ "github.com/pquerna/otp/totp"
|
||||
_ "github.com/prometheus/client_golang/prometheus"
|
||||
_ "github.com/russellhaering/gosaml2"
|
||||
_ "github.com/russellhaering/gosaml2/types"
|
||||
_ "github.com/russellhaering/goxmldsig"
|
||||
_ "github.com/sijms/go-ora/v2"
|
||||
_ "github.com/sirupsen/logrus"
|
||||
_ "github.com/stretchr/testify/assert"
|
||||
_ "github.com/stretchr/testify/mock"
|
||||
_ "github.com/stretchr/testify/require"
|
||||
_ "github.com/vulcand/predicate"
|
||||
_ "golang.org/x/crypto/bcrypt"
|
||||
_ "golang.org/x/crypto/ssh/agent"
|
||||
_ "golang.org/x/exp/maps"
|
||||
_ "golang.org/x/mod/semver"
|
||||
_ "golang.org/x/net/html"
|
||||
@@ -96,8 +111,11 @@ import (
|
||||
_ "google.golang.org/genproto/googleapis/rpc/status"
|
||||
_ "google.golang.org/grpc"
|
||||
_ "google.golang.org/grpc/codes"
|
||||
_ "google.golang.org/grpc/connectivity"
|
||||
_ "google.golang.org/grpc/credentials"
|
||||
_ "google.golang.org/grpc/credentials/insecure"
|
||||
_ "google.golang.org/grpc/health"
|
||||
_ "google.golang.org/grpc/metadata"
|
||||
_ "google.golang.org/grpc/status"
|
||||
_ "google.golang.org/grpc/test/bufconn"
|
||||
_ "google.golang.org/protobuf/proto"
|
||||
@@ -108,6 +126,7 @@ import (
|
||||
_ "gopkg.in/check.v1"
|
||||
_ "k8s.io/apimachinery/pkg/util/yaml"
|
||||
|
||||
_ "github.com/gravitational/teleport/api/accessrequest"
|
||||
_ "github.com/gravitational/teleport/api/breaker"
|
||||
_ "github.com/gravitational/teleport/api/client"
|
||||
_ "github.com/gravitational/teleport/api/client/proto"
|
||||
@@ -115,14 +134,33 @@ import (
|
||||
_ "github.com/gravitational/teleport/api/constants"
|
||||
_ "github.com/gravitational/teleport/api/defaults"
|
||||
_ "github.com/gravitational/teleport/api/gen/proto/go/attestation/v1"
|
||||
_ "github.com/gravitational/teleport/api/gen/proto/go/teleport/accesslist/v1"
|
||||
_ "github.com/gravitational/teleport/api/gen/proto/go/teleport/devicetrust/v1"
|
||||
_ "github.com/gravitational/teleport/api/gen/proto/go/teleport/externalauditstorage/v1"
|
||||
_ "github.com/gravitational/teleport/api/gen/proto/go/teleport/header/v1"
|
||||
_ "github.com/gravitational/teleport/api/gen/proto/go/teleport/loginrule/v1"
|
||||
_ "github.com/gravitational/teleport/api/gen/proto/go/teleport/plugins/v1"
|
||||
_ "github.com/gravitational/teleport/api/gen/proto/go/teleport/resourceusage/v1"
|
||||
_ "github.com/gravitational/teleport/api/gen/proto/go/teleport/samlidp/v1"
|
||||
_ "github.com/gravitational/teleport/api/gen/proto/go/teleport/secreports/v1"
|
||||
_ "github.com/gravitational/teleport/api/gen/proto/go/usageevents/v1"
|
||||
_ "github.com/gravitational/teleport/api/mfa"
|
||||
_ "github.com/gravitational/teleport/api/types"
|
||||
_ "github.com/gravitational/teleport/api/types/accesslist"
|
||||
_ "github.com/gravitational/teleport/api/types/accesslist/convert/v1"
|
||||
_ "github.com/gravitational/teleport/api/types/events"
|
||||
_ "github.com/gravitational/teleport/api/types/externalauditstorage"
|
||||
_ "github.com/gravitational/teleport/api/types/externalauditstorage/convert/v1"
|
||||
_ "github.com/gravitational/teleport/api/types/header"
|
||||
_ "github.com/gravitational/teleport/api/types/secreports"
|
||||
_ "github.com/gravitational/teleport/api/types/secreports/convert/v1"
|
||||
_ "github.com/gravitational/teleport/api/types/trait"
|
||||
_ "github.com/gravitational/teleport/api/types/userloginstate"
|
||||
_ "github.com/gravitational/teleport/api/types/wrappers"
|
||||
_ "github.com/gravitational/teleport/api/utils"
|
||||
_ "github.com/gravitational/teleport/api/utils/aws"
|
||||
_ "github.com/gravitational/teleport/api/utils/grpc/interceptors"
|
||||
_ "github.com/gravitational/teleport/api/utils/keys"
|
||||
_ "github.com/gravitational/teleport/api/utils/retryutils"
|
||||
_ "github.com/gravitational/teleport/api/utils/tlsutils"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user