Skip to content

Commit eadc52d

Browse files
dependabot[bot]alexandear
dependabot[bot]
and
alexandear
authored
Bump gitlab.com/gitlab-org/api/client-go from 0.160.2 to 1.3.0 (#176)
Co-authored-by: Oleksandr Redko <oleksandr.red+github@gmail.com>
1 parent 6b69dc6 commit eadc52d

File tree

6 files changed

+34
-35
lines changed

6 files changed

+34
-35
lines changed

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.0
55
require (
66
github.com/go-git/go-git/v5 v5.16.4
77
github.com/stretchr/testify v1.11.1
8-
gitlab.com/gitlab-org/api/client-go v0.160.2
8+
gitlab.com/gitlab-org/api/client-go v1.3.0
99
)
1010

1111
require (
@@ -30,11 +30,11 @@ require (
3030
github.com/skeema/knownhosts v1.3.1 // indirect
3131
github.com/xanzy/ssh-agent v0.3.3 // indirect
3232
golang.org/x/crypto v0.37.0 // indirect
33-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
33+
golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 // indirect
3434
golang.org/x/net v0.39.0 // indirect
35-
golang.org/x/oauth2 v0.30.0 // indirect
36-
golang.org/x/sys v0.34.0 // indirect
37-
golang.org/x/time v0.12.0 // indirect
35+
golang.org/x/oauth2 v0.33.0 // indirect
36+
golang.org/x/sys v0.38.0 // indirect
37+
golang.org/x/time v0.14.0 // indirect
3838
gopkg.in/warnings.v0 v0.1.2 // indirect
3939
gopkg.in/yaml.v3 v3.0.1 // indirect
4040
)

‎go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,34 +82,34 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
8282
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
8383
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
8484
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
85-
gitlab.com/gitlab-org/api/client-go v0.160.2 h1:InFTeAoGZoQWFS+4xA2kjOp+FaxnuuUsNm6KuyftK3o=
86-
gitlab.com/gitlab-org/api/client-go v0.160.2/go.mod h1:YqKcnxyV9OPAL5U99mpwBVEgBPz1PK/3qwqq/3h6bao=
85+
gitlab.com/gitlab-org/api/client-go v1.3.0 h1:B2WoaKF6DJOA5wHkh8IKEJVBBIJpjWK8eXSt99MoFTY=
86+
gitlab.com/gitlab-org/api/client-go v1.3.0/go.mod h1:RQfw64j1FE+KMZUAKsi1ZOOvwbWxHn9SkyZg+IAvjk4=
8787
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
8888
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
8989
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
90-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
91-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
90+
golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 h1:SbTAbRFnd5kjQXbczszQ0hdk3ctwYf3qBNH9jIsGclE=
91+
golang.org/x/exp v0.0.0-20250813145105-42675adae3e6/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4=
9292
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
9393
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
9494
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
95-
golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
96-
golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
95+
golang.org/x/oauth2 v0.33.0 h1:4Q+qn+E5z8gPRJfmRy7C2gGG3T4jIprK6aSYgTXGRpo=
96+
golang.org/x/oauth2 v0.33.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
9797
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
9898
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
9999
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
100100
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
101101
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
102102
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
103-
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
104-
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
103+
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
104+
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
105105
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
106106
golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
107107
golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
108108
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
109-
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
110-
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
111-
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
112-
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
109+
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
110+
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
111+
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
112+
golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
113113
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
114114
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
115115
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎internal/app.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,9 @@ func (a *App) Run(ctx context.Context) error {
8484

8585
lastCommitDate := a.lastCommitDate(repo)
8686

87-
projectCommitCounter := make(map[int]int, maxProjects)
88-
89-
projectID := 0
90-
page := 1
87+
projectCommitCounter := make(map[int64]int, maxProjects)
88+
projectID := int64(0)
89+
page := int64(1)
9190

9291
for page > 0 {
9392
projects, nextPage, errFetch := a.gitlab.FetchProjectPage(ctx, page, currentUser, projectID)
@@ -168,7 +167,7 @@ func (a *App) lastCommitDate(repo *git.Repository) time.Time {
168167
}
169168

170169
func (a *App) doCommitsForProject(
171-
ctx context.Context, worktree *git.Worktree, currentUser *User, projectID int, lastCommitDate time.Time,
170+
ctx context.Context, worktree *git.Worktree, currentUser *User, projectID int64, lastCommitDate time.Time,
172171
) (int, error) {
173172
commits, err := a.gitlab.FetchCommits(ctx, currentUser, projectID, lastCommitDate)
174173
if err != nil {

‎internal/commit.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ type Commit struct {
1212
Message string
1313
}
1414

15-
func NewCommit(committedAt time.Time, projectID int, hash string) *Commit {
15+
func NewCommit(committedAt time.Time, projectID int64, hash string) *Commit {
1616
return &Commit{
1717
CommittedAt: committedAt,
1818
Message: fmt.Sprintf("Project: %d commit: %s", projectID, hash),
1919
}
2020
}
2121

22-
func ParseCommitMessage(message string) (projectID int, hash string, _ error) {
22+
func ParseCommitMessage(message string) (projectID int64, hash string, _ error) {
2323
const messagePartsCount = 4
2424

2525
messageParts := strings.Split(message, " ")
2626
if len(messageParts) < messagePartsCount {
2727
return 0, "", fmt.Errorf("wrong commit message: %s", message)
2828
}
2929

30-
id, err := strconv.Atoi(messageParts[1])
30+
id, err := strconv.ParseInt(messageParts[1], 10, 64)
3131
if err != nil {
3232
return 0, "", fmt.Errorf("failed to convert %s to project id: %w", messageParts[1], err)
3333
}

‎internal/commit_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func TestNewCommit(t *testing.T) {
1616
t.Fatal(err)
1717
}
1818

19-
projectID := 2323
19+
projectID := int64(2323)
2020
hash := "9bc457f81c86307f28662b40a164105f14df64e3"
2121

2222
commit := app.NewCommit(committedAt, projectID, hash)
@@ -33,7 +33,7 @@ func TestParseCommitMessage(t *testing.T) {
3333
projectID, hash, err := app.ParseCommitMessage(msg)
3434

3535
require.NoError(t, err)
36-
assert.Equal(t, 2323, projectID)
36+
assert.Equal(t, int64(2323), projectID)
3737
assert.Equal(t, "9bc457f81c86307f28662b40a164105f14df64e3", hash)
3838
})
3939

‎internal/gitlab.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ func (s *GitLab) CurrentUser(ctx context.Context) (*User, error) {
5757
}, nil
5858
}
5959

60-
func (s *GitLab) FetchProjectPage(ctx context.Context, page int, user *User, idAfter int,
61-
) (_ []int, nextPage int, _ error) {
60+
func (s *GitLab) FetchProjectPage(ctx context.Context, page int64, user *User, idAfter int64,
61+
) (_ []int64, nextPage int64, _ error) {
6262
const perPage = 100
6363

64-
projects := make([]int, 0, perPage)
64+
projects := make([]int64, 0, perPage)
6565

6666
opt := &gitlab.ListProjectsOptions{
6767
ListOptions: gitlab.ListOptions{
@@ -97,7 +97,7 @@ func (s *GitLab) FetchProjectPage(ctx context.Context, page int, user *User, idA
9797
return projects, resp.NextPage, nil
9898
}
9999

100-
func (s *GitLab) HasUserContributions(ctx context.Context, user *User, projectID int) bool {
100+
func (s *GitLab) HasUserContributions(ctx context.Context, user *User, projectID int64) bool {
101101
const perPage = 50
102102

103103
opt := &gitlab.ListContributorsOptions{
@@ -131,13 +131,13 @@ func (s *GitLab) HasUserContributions(ctx context.Context, user *User, projectID
131131
return false
132132
}
133133

134-
func (s *GitLab) FetchCommits(ctx context.Context, user *User, projectID int, since time.Time,
134+
func (s *GitLab) FetchCommits(ctx context.Context, user *User, projectID int64, since time.Time,
135135
) ([]*Commit, error) {
136136
commits := make([]*Commit, 0, maxCommits)
137137

138138
const commitsPerPage = 100
139139

140-
page := 1
140+
page := int64(1)
141141
for page > 0 {
142142
cms, nextPage, err := s.fetchCommitPage(ctx, user, page, commitsPerPage, since, projectID)
143143
if err != nil {
@@ -157,8 +157,8 @@ func (s *GitLab) FetchCommits(ctx context.Context, user *User, projectID int, si
157157
}
158158

159159
func (s *GitLab) fetchCommitPage(
160-
ctx context.Context, user *User, page, perPage int, since time.Time, projectID int,
161-
) (commits []*Commit, nextPage int, err error) {
160+
ctx context.Context, user *User, page, perPage int64, since time.Time, projectID int64,
161+
) (commits []*Commit, nextPage int64, err error) {
162162
commits = make([]*Commit, 0, perPage)
163163

164164
opt := &gitlab.ListCommitsOptions{

0 commit comments

Comments
 (0)