From 659cd44a0faabaf3495bc7d5fc4bcfacb7f762d8 Mon Sep 17 00:00:00 2001 From: rosstimothy <39066650+rosstimothy@users.noreply.github.com> Date: Mon, 28 Oct 2024 19:26:08 +0000 Subject: [PATCH] Update e (#48017) Includes gravitational/teleport.e#5257 and updates e_imports.go to reflect that cfssl is no longer a direct dependency. --- e | 2 +- e_imports.go | 4 ++-- go.mod | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e b/e index 7e4638fd65518..1a1d961b1a37e 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit 7e4638fd65518f292f0c6d33793237380d8fadf7 +Subproject commit 1a1d961b1a37efd977e71b0bd93a5590a5e8c29c diff --git a/e_imports.go b/e_imports.go index d2edd07def844..0934f476e1e07 100644 --- a/e_imports.go +++ b/e_imports.go @@ -61,7 +61,6 @@ import ( _ "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/cloudflare/cfssl/csr" _ "github.com/coreos/go-oidc/jose" _ "github.com/coreos/go-oidc/oauth2" _ "github.com/coreos/go-oidc/oidc" @@ -80,7 +79,6 @@ import ( _ "github.com/google/safetext/shsprintf" _ "github.com/google/uuid" _ "github.com/gravitational/license" - _ "github.com/gravitational/license/authority" _ "github.com/gravitational/license/constants" _ "github.com/gravitational/license/generate" _ "github.com/gravitational/roundtrip" @@ -186,6 +184,7 @@ import ( _ "github.com/gravitational/teleport/api/types/accessgraph" _ "github.com/gravitational/teleport/api/types/accesslist" _ "github.com/gravitational/teleport/api/types/accesslist/convert/v1" + _ "github.com/gravitational/teleport/api/types/common" _ "github.com/gravitational/teleport/api/types/discoveryconfig" _ "github.com/gravitational/teleport/api/types/events" _ "github.com/gravitational/teleport/api/types/externalauditstorage" @@ -193,6 +192,7 @@ import ( _ "github.com/gravitational/teleport/api/types/header" _ "github.com/gravitational/teleport/api/types/header/convert/legacy" _ "github.com/gravitational/teleport/api/types/header/convert/v1" + _ "github.com/gravitational/teleport/api/types/samlsp" _ "github.com/gravitational/teleport/api/types/secreports" _ "github.com/gravitational/teleport/api/types/secreports/convert/v1" _ "github.com/gravitational/teleport/api/types/trait" diff --git a/go.mod b/go.mod index e338706f376e5..0775645a53dd4 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,6 @@ require ( github.com/charmbracelet/bubbles v0.20.0 github.com/charmbracelet/bubbletea v1.1.0 github.com/charmbracelet/lipgloss v0.13.0 - github.com/cloudflare/cfssl v1.6.4 github.com/coreos/go-oidc v2.2.1+incompatible // replaced github.com/coreos/go-semver v0.3.1 github.com/creack/pty v1.1.23 @@ -287,6 +286,7 @@ require ( github.com/chai2010/gettext-go v1.0.2 // indirect github.com/charmbracelet/x/ansi v0.2.3 // indirect github.com/charmbracelet/x/term v0.2.0 // indirect + github.com/cloudflare/cfssl v1.6.4 // indirect github.com/cncf/xds/go v0.0.0-20240822171458-6449f94b4d59 // indirect github.com/containerd/containerd v1.7.18 // indirect github.com/containerd/errdefs v0.1.0 // indirect