From 81eca5cf3a143857dc1a4cfdbc3b965214be3c3f Mon Sep 17 00:00:00 2001 From: rosstimothy <39066650+rosstimothy@users.noreply.github.com> Date: Wed, 11 Dec 2024 16:14:14 -0500 Subject: [PATCH] Update e ref (#50095) Includes https://github.com/gravitational/teleport.e/pull/5673 which removes cfssl from the direct dependency tree. --- e | 2 +- e_imports.go | 2 -- go.mod | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/e b/e index 88154ba9dc15e..1ac4aa5fa5f02 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit 88154ba9dc15eaa4c8ff420c1ff97ef4932bb458 +Subproject commit 1ac4aa5fa5f02aa184d84c876e0b03b8c7b48119 diff --git a/e_imports.go b/e_imports.go index ce3611a711108..a27d54df4bfb5 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" @@ -79,7 +78,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/oxy/ratelimit" diff --git a/go.mod b/go.mod index 6dc43591a3dfb..bfb290a7731ed 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,6 @@ require ( github.com/charmbracelet/bubbles v0.18.0 github.com/charmbracelet/bubbletea v0.26.1 github.com/charmbracelet/lipgloss v0.10.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.21 @@ -285,6 +284,7 @@ require ( github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chai2010/gettext-go v1.0.2 // indirect + github.com/cloudflare/cfssl v1.6.4 // indirect github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50 // indirect github.com/containerd/containerd v1.7.12 // indirect github.com/containerd/log v0.1.0 // indirect