From ee518ba39d2d51195b796ab616f72edda587c94f Mon Sep 17 00:00:00 2001 From: Tiago Silva Date: Wed, 8 Jan 2025 09:56:22 +0000 Subject: [PATCH] [chore] replace gitlab client with `gitlab.com/gitlab-org/api/client-go` Gitlab moved the golang client under its organization and deprecated `github.com/xanzy/go-gitlab` in favour of `gitlab.com/gitlab-org/api/client-go`. The codebase is the same and it's a pure fork of the original client but it's now controlled by Gitlab. Signed-off-by: Tiago Silva --- e_imports.go | 1 + go.mod | 1 + go.sum | 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, 10 insertions(+) diff --git a/e_imports.go b/e_imports.go index 32eb84c7ff814..4e7d22b5563d5 100644 --- a/e_imports.go +++ b/e_imports.go @@ -114,6 +114,7 @@ import ( _ "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" _ "golang.org/x/crypto/bcrypt" diff --git a/go.mod b/go.mod index 37dbf691b118c..7ad47d17948f9 100644 --- a/go.mod +++ b/go.mod @@ -187,6 +187,7 @@ require ( 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 go.etcd.io/etcd/client/v3 v3.5.17 go.mongodb.org/mongo-driver v1.14.0 diff --git a/go.sum b/go.sum index eab1890d48d9a..8e7918257ef4e 100644 --- a/go.sum +++ b/go.sum @@ -2273,6 +2273,8 @@ github.com/zmap/zcrypto v0.0.0-20231219022726-a1f61fb1661c/go.mod h1:GSDpFDD4TAS github.com/zmap/zlint/v3 v3.0.0/go.mod h1:paGwFySdHIBEMJ61YjoqT4h7Ge+fdYG4sUQhnTb1lJ8= github.com/zmap/zlint/v3 v3.6.0 h1:vTEaDRtYN0d/1Ax60T+ypvbLQUHwHxbvYRnUMVr35ug= github.com/zmap/zlint/v3 v3.6.0/go.mod h1:NVgiIWssgzp0bNl8P4Gz94NHV2ep/4Jyj9V69uTmZyg= +gitlab.com/gitlab-org/api/client-go v0.119.0 h1:YBZyx9XUTtEDBBYtY36cZWz6JmT7om/8HPSk37IS95g= +gitlab.com/gitlab-org/api/client-go v0.119.0/go.mod h1:ygHmS3AU3TpvK+AC6DYO1QuAxLlv6yxYK+/Votr/WFQ= go.einride.tech/aip v0.68.0 h1:4seM66oLzTpz50u4K1zlJyOXQ3tCzcJN7I22tKkjipw= go.einride.tech/aip v0.68.0/go.mod h1:7y9FF8VtPWqpxuAxl0KQWqaULxW4zFIesD6zF5RIHHg= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= diff --git a/integrations/event-handler/go.mod b/integrations/event-handler/go.mod index 6e15b984279de..ac08f428d877b 100644 --- a/integrations/event-handler/go.mod +++ b/integrations/event-handler/go.mod @@ -270,6 +270,7 @@ require ( github.com/zeebo/errs v1.3.0 // indirect github.com/zmap/zcrypto v0.0.0-20231219022726-a1f61fb1661c // indirect github.com/zmap/zlint/v3 v3.6.0 // indirect + gitlab.com/gitlab-org/api/client-go v0.119.0 // indirect go.mongodb.org/mongo-driver v1.14.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect diff --git a/integrations/event-handler/go.sum b/integrations/event-handler/go.sum index 0a7a3154df3d9..e8187beede135 100644 --- a/integrations/event-handler/go.sum +++ b/integrations/event-handler/go.sum @@ -1606,6 +1606,8 @@ github.com/zmap/zcrypto v0.0.0-20231219022726-a1f61fb1661c/go.mod h1:GSDpFDD4TAS github.com/zmap/zlint/v3 v3.0.0/go.mod h1:paGwFySdHIBEMJ61YjoqT4h7Ge+fdYG4sUQhnTb1lJ8= github.com/zmap/zlint/v3 v3.6.0 h1:vTEaDRtYN0d/1Ax60T+ypvbLQUHwHxbvYRnUMVr35ug= github.com/zmap/zlint/v3 v3.6.0/go.mod h1:NVgiIWssgzp0bNl8P4Gz94NHV2ep/4Jyj9V69uTmZyg= +gitlab.com/gitlab-org/api/client-go v0.119.0 h1:YBZyx9XUTtEDBBYtY36cZWz6JmT7om/8HPSk37IS95g= +gitlab.com/gitlab-org/api/client-go v0.119.0/go.mod h1:ygHmS3AU3TpvK+AC6DYO1QuAxLlv6yxYK+/Votr/WFQ= go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80= go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= diff --git a/integrations/terraform/go.mod b/integrations/terraform/go.mod index 1130d2f21418f..6af471fc05d67 100644 --- a/integrations/terraform/go.mod +++ b/integrations/terraform/go.mod @@ -334,6 +334,7 @@ require ( github.com/zeebo/errs v1.3.0 // indirect github.com/zmap/zcrypto v0.0.0-20231219022726-a1f61fb1661c // indirect github.com/zmap/zlint/v3 v3.6.0 // indirect + gitlab.com/gitlab-org/api/client-go v0.119.0 // indirect go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect go.mongodb.org/mongo-driver v1.14.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect diff --git a/integrations/terraform/go.sum b/integrations/terraform/go.sum index bb7db860bee43..71ace0ea97a94 100644 --- a/integrations/terraform/go.sum +++ b/integrations/terraform/go.sum @@ -1932,6 +1932,8 @@ github.com/zmap/zcrypto v0.0.0-20231219022726-a1f61fb1661c/go.mod h1:GSDpFDD4TAS github.com/zmap/zlint/v3 v3.0.0/go.mod h1:paGwFySdHIBEMJ61YjoqT4h7Ge+fdYG4sUQhnTb1lJ8= github.com/zmap/zlint/v3 v3.6.0 h1:vTEaDRtYN0d/1Ax60T+ypvbLQUHwHxbvYRnUMVr35ug= github.com/zmap/zlint/v3 v3.6.0/go.mod h1:NVgiIWssgzp0bNl8P4Gz94NHV2ep/4Jyj9V69uTmZyg= +gitlab.com/gitlab-org/api/client-go v0.119.0 h1:YBZyx9XUTtEDBBYtY36cZWz6JmT7om/8HPSk37IS95g= +gitlab.com/gitlab-org/api/client-go v0.119.0/go.mod h1:ygHmS3AU3TpvK+AC6DYO1QuAxLlv6yxYK+/Votr/WFQ= go.abhg.dev/goldmark/frontmatter v0.2.0 h1:P8kPG0YkL12+aYk2yU3xHv4tcXzeVnN+gU0tJ5JnxRw= go.abhg.dev/goldmark/frontmatter v0.2.0/go.mod h1:XqrEkZuM57djk7zrlRUB02x8I5J0px76YjkOzhB4YlU= go.etcd.io/etcd/api/v3 v3.5.17 h1:cQB8eb8bxwuxOilBpMJAEo8fAONyrdXTHUNcMd8yT1w=