From 4f4c23a80ed2db3eb0af4c01ea0c49c70d5cae42 Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Wed, 8 Jan 2025 11:22:24 +0000 Subject: [PATCH] [chore] remove `github.com/xanzy/go-gitlab` from direct depenencies After deprecation of `github.com/xanzy/go-gitlab` in favour of `gitlab.com/gitlab-org/api/client-go`, this PR drops the direct dependency from Teleport module. The dependency is still indirect because it's imported by `cosign`. Hopefully in future versions, the dependency will be updated and fully removed. Signed-off-by: Tiago Silva --- e | 2 +- e_imports.go | 1 - go.mod | 2 +- integrations/event-handler/go.mod | 1 - integrations/event-handler/go.sum | 2 -- integrations/terraform/go.mod | 1 - integrations/terraform/go.sum | 2 -- 7 files changed, 2 insertions(+), 9 deletions(-) diff --git a/e b/e index f00dbc995fee6..1bc4a6909732d 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit f00dbc995fee6e9159442c62300026e32759e86a +Subproject commit 1bc4a6909732d3b8b98b19fab56d9a39f228ec01 diff --git a/e_imports.go b/e_imports.go index 4e7d22b5563d5..245bb8bd253d8 100644 --- a/e_imports.go +++ b/e_imports.go @@ -113,7 +113,6 @@ import ( _ "github.com/stretchr/testify/mock" _ "github.com/stretchr/testify/require" _ "github.com/vulcand/predicate/builder" - _ "github.com/xanzy/go-gitlab" _ "gitlab.com/gitlab-org/api/client-go" _ "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" _ "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/filters" diff --git a/go.mod b/go.mod index 7ad47d17948f9..7e6e10cd7d882 100644 --- a/go.mod +++ b/go.mod @@ -185,7 +185,6 @@ require ( github.com/stretchr/testify v1.10.0 github.com/ucarion/urlpath v0.0.0-20200424170820-7ccc79b76bbb github.com/vulcand/predicate v1.2.0 // replaced - github.com/xanzy/go-gitlab v0.115.0 github.com/yusufpapurcu/wmi v1.2.4 gitlab.com/gitlab-org/api/client-go v0.119.0 go.etcd.io/etcd/api/v3 v3.5.17 @@ -514,6 +513,7 @@ require ( github.com/vbatts/tar-split v0.11.5 // indirect github.com/weppos/publicsuffix-go v0.30.3-0.20240510084413-5f1d03393b3d // indirect github.com/x448/float16 v0.8.4 // indirect + github.com/xanzy/go-gitlab v0.115.0 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect diff --git a/integrations/event-handler/go.mod b/integrations/event-handler/go.mod index ac08f428d877b..b7d0be9eb4684 100644 --- a/integrations/event-handler/go.mod +++ b/integrations/event-handler/go.mod @@ -261,7 +261,6 @@ require ( github.com/vulcand/predicate v1.2.0 // indirect github.com/weppos/publicsuffix-go v0.30.3-0.20240510084413-5f1d03393b3d // indirect github.com/x448/float16 v0.8.4 // indirect - github.com/xanzy/go-gitlab v0.115.0 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect diff --git a/integrations/event-handler/go.sum b/integrations/event-handler/go.sum index e8187beede135..e947423db8254 100644 --- a/integrations/event-handler/go.sum +++ b/integrations/event-handler/go.sum @@ -1557,8 +1557,6 @@ github.com/weppos/publicsuffix-go v0.30.3-0.20240510084413-5f1d03393b3d h1:q80YK github.com/weppos/publicsuffix-go v0.30.3-0.20240510084413-5f1d03393b3d/go.mod h1:vLdXKydr/OJssAXmjY0XBgLXUfivBMrNRIBljgtqCnw= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= -github.com/xanzy/go-gitlab v0.115.0 h1:6DmtItNcVe+At/liXSgfE/DZNZrGfalQmBRmOcJjOn8= -github.com/xanzy/go-gitlab v0.115.0/go.mod h1:5XCDtM7AM6WMKmfDdOiEpyRWUqui2iS9ILfvCZ2gJ5M= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= diff --git a/integrations/terraform/go.mod b/integrations/terraform/go.mod index 6af471fc05d67..81610ba23b74f 100644 --- a/integrations/terraform/go.mod +++ b/integrations/terraform/go.mod @@ -321,7 +321,6 @@ require ( github.com/vulcand/predicate v1.2.0 // indirect github.com/weppos/publicsuffix-go v0.30.3-0.20240510084413-5f1d03393b3d // indirect github.com/x448/float16 v0.8.4 // indirect - github.com/xanzy/go-gitlab v0.115.0 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect diff --git a/integrations/terraform/go.sum b/integrations/terraform/go.sum index 71ace0ea97a94..f996d8217a817 100644 --- a/integrations/terraform/go.sum +++ b/integrations/terraform/go.sum @@ -1866,8 +1866,6 @@ github.com/weppos/publicsuffix-go v0.30.3-0.20240510084413-5f1d03393b3d h1:q80YK github.com/weppos/publicsuffix-go v0.30.3-0.20240510084413-5f1d03393b3d/go.mod h1:vLdXKydr/OJssAXmjY0XBgLXUfivBMrNRIBljgtqCnw= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= -github.com/xanzy/go-gitlab v0.115.0 h1:6DmtItNcVe+At/liXSgfE/DZNZrGfalQmBRmOcJjOn8= -github.com/xanzy/go-gitlab v0.115.0/go.mod h1:5XCDtM7AM6WMKmfDdOiEpyRWUqui2iS9ILfvCZ2gJ5M= github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=