diff --git a/go.mod b/go.mod index cf69ad9..3598a15 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/spf13/cobra v1.10.2 github.com/spf13/pflag v1.0.10 github.com/yuin/goldmark/v2 v2.0.2 - gitlab.com/gitlab-org/api/client-go/v2 v2.64.0 + gitlab.com/gitlab-org/api/client-go/v3 v3.8.0 go.yaml.in/yaml/v4 v4.0.0-rc.6 ) diff --git a/go.sum b/go.sum index f09f491..a2a8602 100644 --- a/go.sum +++ b/go.sum @@ -141,8 +141,8 @@ github.com/yuin/goldmark-emoji v1.0.5 h1:EMVWyCGPlXJfUXBXpuMu+ii3TIaxbVBnEX9uaDC github.com/yuin/goldmark-emoji v1.0.5/go.mod h1:tTkZEbwu5wkPmgTcitqddVxY9osFZiavD+r4AzQrh1U= github.com/yuin/goldmark/v2 v2.0.2 h1:EktZ68oBzPJS9WuPAcDmABSMUaHdQSbRYvZrnAb5/Hg= github.com/yuin/goldmark/v2 v2.0.2/go.mod h1:G6M4/qOFtfn01/o14BU1UR2Lo5N3S9Qo7xCuz/sHjGQ= -gitlab.com/gitlab-org/api/client-go/v2 v2.64.0 h1:PrLDC9rS6je6scB0VgXAh6gmoB7fk50bgdweKT37Vdg= -gitlab.com/gitlab-org/api/client-go/v2 v2.64.0/go.mod h1:jLHVjfgFX/BsZnWXp6OsoXv1hKzBp2tSnNoxQTl3A08= +gitlab.com/gitlab-org/api/client-go/v3 v3.8.0 h1:kmUznO/NkVMZvPZDMBRvT+QB/H9PfhRlsaG3HR5QdhY= +gitlab.com/gitlab-org/api/client-go/v3 v3.8.0/go.mod h1:k7uYxRoIeuSqyWZSJfAPZlf0L32OH0lUBImAl4gWUFc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= diff --git a/internal/provider/diagnostics.go b/internal/provider/diagnostics.go index 98a51b4..3f2bceb 100644 --- a/internal/provider/diagnostics.go +++ b/internal/provider/diagnostics.go @@ -8,7 +8,7 @@ import ( "github.com/go-git/go-git/v6" "github.com/microsoft/azure-devops-go-api/azuredevops/v7" - gitlab "gitlab.com/gitlab-org/api/client-go/v2" + gitlab "gitlab.com/gitlab-org/api/client-go/v3" ) type MissingTokenError struct { diff --git a/internal/provider/diagnostics_test.go b/internal/provider/diagnostics_test.go index 28e061c..85a4d0c 100644 --- a/internal/provider/diagnostics_test.go +++ b/internal/provider/diagnostics_test.go @@ -11,7 +11,7 @@ import ( "github.com/monkescience/testastic" "github.com/monkescience/yeet/internal/forge" "github.com/monkescience/yeet/internal/provider" - gitlab "gitlab.com/gitlab-org/api/client-go/v2" + gitlab "gitlab.com/gitlab-org/api/client-go/v3" ) func TestMissingTokenErrorPreservesClassificationAndFacts(t *testing.T) { diff --git a/internal/provider/factory.go b/internal/provider/factory.go index c0b66e4..41e279d 100644 --- a/internal/provider/factory.go +++ b/internal/provider/factory.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/go-retryablehttp" "github.com/monkescience/yeet/internal/config" "github.com/monkescience/yeet/internal/forge" - gitlab "gitlab.com/gitlab-org/api/client-go/v2" + gitlab "gitlab.com/gitlab-org/api/client-go/v3" ) var ( diff --git a/internal/provider/gitlab.go b/internal/provider/gitlab.go index f5dc2a8..fa3dd67 100644 --- a/internal/provider/gitlab.go +++ b/internal/provider/gitlab.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/monkescience/yeet/internal/forge" - gitlab "gitlab.com/gitlab-org/api/client-go/v2" + gitlab "gitlab.com/gitlab-org/api/client-go/v3" ) const gitLabPageSize = 100 diff --git a/internal/provider/gitlab_auto_merge.go b/internal/provider/gitlab_auto_merge.go index b5bc8cf..0e23c0c 100644 --- a/internal/provider/gitlab_auto_merge.go +++ b/internal/provider/gitlab_auto_merge.go @@ -8,7 +8,7 @@ import ( "github.com/Masterminds/semver/v3" "github.com/monkescience/yeet/internal/forge" - gitlab "gitlab.com/gitlab-org/api/client-go/v2" + gitlab "gitlab.com/gitlab-org/api/client-go/v3" ) var gitLabAutoMergeMinimumVersion = semver.MustParse("17.11.0") diff --git a/internal/provider/gitlab_release_lookup.go b/internal/provider/gitlab_release_lookup.go index dbdd5e2..3107417 100644 --- a/internal/provider/gitlab_release_lookup.go +++ b/internal/provider/gitlab_release_lookup.go @@ -7,7 +7,7 @@ import ( "log/slog" "github.com/monkescience/yeet/internal/forge" - gitlab "gitlab.com/gitlab-org/api/client-go/v2" + gitlab "gitlab.com/gitlab-org/api/client-go/v3" ) func (g *GitLab) GetReleaseByTag(ctx context.Context, tag string) (*forge.Release, error) { diff --git a/internal/provider/gitlab_release_pr.go b/internal/provider/gitlab_release_pr.go index 1e55497..699e009 100644 --- a/internal/provider/gitlab_release_pr.go +++ b/internal/provider/gitlab_release_pr.go @@ -11,7 +11,7 @@ import ( "time" "github.com/monkescience/yeet/internal/forge" - gitlab "gitlab.com/gitlab-org/api/client-go/v2" + gitlab "gitlab.com/gitlab-org/api/client-go/v3" ) const gitlabMergeRequestOpenedState = "opened" diff --git a/internal/provider/gitlab_repo_content.go b/internal/provider/gitlab_repo_content.go index 9865a6c..26f3ccc 100644 --- a/internal/provider/gitlab_repo_content.go +++ b/internal/provider/gitlab_repo_content.go @@ -8,7 +8,7 @@ import ( "sort" "github.com/monkescience/yeet/internal/forge" - gitlab "gitlab.com/gitlab-org/api/client-go/v2" + gitlab "gitlab.com/gitlab-org/api/client-go/v3" ) func (g *GitLab) GetFile(ctx context.Context, branch, path string) (string, error) { diff --git a/internal/provider/gitlab_version_history.go b/internal/provider/gitlab_version_history.go index 0d5a261..892aab7 100644 --- a/internal/provider/gitlab_version_history.go +++ b/internal/provider/gitlab_version_history.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/monkescience/yeet/internal/forge" - gitlab "gitlab.com/gitlab-org/api/client-go/v2" + gitlab "gitlab.com/gitlab-org/api/client-go/v3" ) func (g *GitLab) ListTagRefs(ctx context.Context) ([]forge.TagRef, error) { diff --git a/internal/provider/provider_contract_gitlab_test.go b/internal/provider/provider_contract_gitlab_test.go index e1ca308..e0049dd 100644 --- a/internal/provider/provider_contract_gitlab_test.go +++ b/internal/provider/provider_contract_gitlab_test.go @@ -14,7 +14,7 @@ import ( "github.com/monkescience/testastic" "github.com/monkescience/yeet/internal/forge" "github.com/monkescience/yeet/internal/provider" - gitlabapi "gitlab.com/gitlab-org/api/client-go/v2" + gitlabapi "gitlab.com/gitlab-org/api/client-go/v3" ) const gitLabSourceTipSHA = "736f757263657469707368610000000000000000" diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go index d58fd9b..d9d07fe 100644 --- a/internal/provider/provider_test.go +++ b/internal/provider/provider_test.go @@ -11,7 +11,7 @@ import ( "github.com/monkescience/yeet/internal/commit" "github.com/monkescience/yeet/internal/forge" "github.com/monkescience/yeet/internal/provider" - gitlabapi "gitlab.com/gitlab-org/api/client-go/v2" + gitlabapi "gitlab.com/gitlab-org/api/client-go/v3" ) const ( diff --git a/internal/provider/request_diagnostics.go b/internal/provider/request_diagnostics.go index a015359..630b41e 100644 --- a/internal/provider/request_diagnostics.go +++ b/internal/provider/request_diagnostics.go @@ -6,7 +6,7 @@ import ( "github.com/google/go-github/v91/github" "github.com/microsoft/azure-devops-go-api/azuredevops/v7" - gitlab "gitlab.com/gitlab-org/api/client-go/v2" + gitlab "gitlab.com/gitlab-org/api/client-go/v3" ) type RequestDetails struct { diff --git a/internal/testsupport/fakeprovider/content_gitlab.go b/internal/testsupport/fakeprovider/content_gitlab.go index 5a74f3e..947a92d 100644 --- a/internal/testsupport/fakeprovider/content_gitlab.go +++ b/internal/testsupport/fakeprovider/content_gitlab.go @@ -11,7 +11,7 @@ import ( "github.com/monkescience/testastic" "github.com/monkescience/yeet/internal/forge" "github.com/monkescience/yeet/internal/provider" - gitlab "gitlab.com/gitlab-org/api/client-go/v2" + gitlab "gitlab.com/gitlab-org/api/client-go/v3" ) func NewGitLabContentProvider(t *testing.T, content *RepoContent) forge.Provider {