Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate away from github.com/xanzy/go-gitlab to gitlab.com/gitlab-org/api/client-go #5180

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Migrate away from github.com/xanzy/go-gitlab to gitlab.com/gitlab-org/api/client-go #5180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ require (
github.com/stretchr/testify v1.10.0
github.com/styrainc/regal v0.29.2
github.com/thomaspoignant/go-feature-flag v1.39.1
github.com/xanzy/go-gitlab v0.115.0
github.com/yuin/goldmark v1.7.8
gitlab.com/gitlab-org/api/client-go v0.116.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.57.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0
go.opentelemetry.io/otel v1.32.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,8 +1081,6 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
github.com/vbatts/tar-split v0.11.6 h1:4SjTW5+PU11n6fZenf2IPoV8/tz3AaYHMWjf23envGs=
github.com/vbatts/tar-split v0.11.6/go.mod h1:dqKNtesIOr2j2Qv3W/cHjnvk9I8+G7oAkFDFN6TCBEI=
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.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
Expand Down Expand Up @@ -1123,6 +1121,8 @@ github.com/zitadel/oidc/v3 v3.33.1 h1:e3w9PDV0Mh50/ZiJWtzyT0E4uxJ6RXll+hqVDnqGbT
github.com/zitadel/oidc/v3 v3.33.1/go.mod h1:zkoZ1Oq6CweX3BaLrftLEGCs6YK6zDpjjVGZrP10AWU=
github.com/zitadel/schema v1.3.0 h1:kQ9W9tvIwZICCKWcMvCEweXET1OcOyGEuFbHs4o5kg0=
github.com/zitadel/schema v1.3.0/go.mod h1:NptN6mkBDFvERUCvZHlvWmmME+gmZ44xzwRXwhzsbtc=
gitlab.com/gitlab-org/api/client-go v0.116.0 h1:Dy534gtZPMrnm3fAcmQRMadrcoUyFO4FQ4rXlSAdHAw=
gitlab.com/gitlab-org/api/client-go v0.116.0/go.mod h1:B29OfnZklmaoiR7uHANh9jTyfWEgmXvZLVEnosw2Dx0=
go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0=
go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I=
go.mongodb.org/mongo-driver v1.17.1 h1:Wic5cJIwJgSpBhe3lx3+/RybR5PiYRMpVFgO7cOHyIM=
Expand Down
2 changes: 1 addition & 1 deletion internal/providers/gitlab/manager/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"github.com/google/uuid"
"github.com/rs/zerolog"
gitlablib "github.com/xanzy/go-gitlab"
gitlablib "gitlab.com/gitlab-org/api/client-go"

"github.com/mindersec/minder/internal/providers/gitlab/webhooksecret"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/providers/gitlab/manager/webhook_handlers_merge_requests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/ThreeDotsLabs/watermill/message"
"github.com/google/uuid"
"github.com/rs/zerolog"
gitlablib "github.com/xanzy/go-gitlab"
gitlablib "gitlab.com/gitlab-org/api/client-go"

entmsg "github.com/mindersec/minder/internal/entities/handlers/message"
"github.com/mindersec/minder/internal/entities/properties"
Expand Down
2 changes: 1 addition & 1 deletion internal/providers/gitlab/manager/webhook_handlers_releases.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/ThreeDotsLabs/watermill/message"
"github.com/google/uuid"
"github.com/rs/zerolog"
gitlablib "github.com/xanzy/go-gitlab"
gitlablib "gitlab.com/gitlab-org/api/client-go"

entmsg "github.com/mindersec/minder/internal/entities/handlers/message"
"github.com/mindersec/minder/internal/entities/properties"
Expand Down
2 changes: 1 addition & 1 deletion internal/providers/gitlab/manager/webhook_handlers_repos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/ThreeDotsLabs/watermill/message"
"github.com/google/uuid"
"github.com/rs/zerolog"
gitlablib "github.com/xanzy/go-gitlab"
gitlablib "gitlab.com/gitlab-org/api/client-go"

entmsg "github.com/mindersec/minder/internal/entities/handlers/message"
"github.com/mindersec/minder/internal/entities/properties"
Expand Down
2 changes: 1 addition & 1 deletion internal/providers/gitlab/properties_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/xanzy/go-gitlab"
gitlab "gitlab.com/gitlab-org/api/client-go"
"google.golang.org/protobuf/reflect/protoreflect"

"github.com/mindersec/minder/internal/entities/properties"
Expand Down
2 changes: 1 addition & 1 deletion internal/providers/gitlab/pull_request_properties.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"net/url"
"strconv"

"github.com/xanzy/go-gitlab"
gitlab "gitlab.com/gitlab-org/api/client-go"

"github.com/mindersec/minder/internal/entities/properties"
pbinternal "github.com/mindersec/minder/internal/proto"
Expand Down
2 changes: 1 addition & 1 deletion internal/providers/gitlab/registration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"github.com/google/uuid"
"github.com/rs/zerolog"
"github.com/xanzy/go-gitlab"
gitlab "gitlab.com/gitlab-org/api/client-go"

"github.com/mindersec/minder/internal/entities/properties"
"github.com/mindersec/minder/internal/providers/gitlab/webhooksecret"
Expand Down
2 changes: 1 addition & 1 deletion internal/providers/gitlab/registration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/google/uuid"
"github.com/rs/zerolog"
"github.com/stretchr/testify/assert"
"github.com/xanzy/go-gitlab"
gitlab "gitlab.com/gitlab-org/api/client-go"
"golang.org/x/oauth2"

"github.com/mindersec/minder/internal/entities/properties"
Expand Down
2 changes: 1 addition & 1 deletion internal/providers/gitlab/release_properties.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"github.com/cenkalti/backoff/v4"
"github.com/rs/zerolog"
gitlablib "github.com/xanzy/go-gitlab"
gitlablib "gitlab.com/gitlab-org/api/client-go"
"golang.org/x/mod/semver"

"github.com/mindersec/minder/internal/entities/properties"
Expand Down
2 changes: 1 addition & 1 deletion internal/providers/gitlab/repo_lister.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"net/url"

"github.com/rs/zerolog"
"github.com/xanzy/go-gitlab"
gitlab "gitlab.com/gitlab-org/api/client-go"

minderv1 "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/providers/gitlab/repository_properties.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"net/url"
"strconv"

"github.com/xanzy/go-gitlab"
gitlab "gitlab.com/gitlab-org/api/client-go"

"github.com/mindersec/minder/internal/entities/properties"
minderv1 "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
Expand Down
Loading