Skip to content

Commit e81dfbc

Browse files
ilijamtilijamt
committed
refactor: int to int64 for the new gitlab library
1 parent 166ca2a commit e81dfbc

19 files changed

+161
-109
lines changed

‎gitlab_client.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ type gitlabClient struct {
3434
logger hclog.Logger
3535
}
3636

37-
func (gc *gitlabClient) GetProjectIdByPath(ctx context.Context, path string) (projectId int, err error) {
37+
func (gc *gitlabClient) GetProjectIdByPath(ctx context.Context, path string) (projectId int64, err error) {
3838
defer func() {
3939
gc.logger.Debug("Get project id by path", "path", path, "projectId", projectId, "error", err)
4040
}()
@@ -48,7 +48,7 @@ func (gc *gitlabClient) GetProjectIdByPath(ctx context.Context, path string) (pr
4848
return projectId, err
4949
}
5050

51-
func (gc *gitlabClient) CreateGroupDeployToken(ctx context.Context, path string, groupId int, name string, expiresAt *time.Time, scopes []string) (et *modelToken.TokenGroupDeploy, err error) {
51+
func (gc *gitlabClient) CreateGroupDeployToken(ctx context.Context, path string, groupId int64, name string, expiresAt *time.Time, scopes []string) (et *modelToken.TokenGroupDeploy, err error) {
5252
var dt *g.DeployToken
5353
defer func() {
5454
gc.logger.Debug("Create group deploy token", "groupId", groupId, "name", name, "path", path, "expiresAt", expiresAt, "scopes", scopes, "error", err)
@@ -67,7 +67,7 @@ func (gc *gitlabClient) CreateGroupDeployToken(ctx context.Context, path string,
6767
TokenWithScopes: modelToken.TokenWithScopes{
6868
Token: modelToken.Token{
6969
TokenID: dt.ID,
70-
ParentID: strconv.Itoa(groupId),
70+
ParentID: strconv.FormatInt(groupId, 10),
7171
Path: path,
7272
Name: name,
7373
Token: dt.Token,
@@ -82,7 +82,7 @@ func (gc *gitlabClient) CreateGroupDeployToken(ctx context.Context, path string,
8282
return et, err
8383
}
8484

85-
func (gc *gitlabClient) CreateProjectDeployToken(ctx context.Context, path string, projectId int, name string, expiresAt *time.Time, scopes []string) (et *modelToken.TokenProjectDeploy, err error) {
85+
func (gc *gitlabClient) CreateProjectDeployToken(ctx context.Context, path string, projectId int64, name string, expiresAt *time.Time, scopes []string) (et *modelToken.TokenProjectDeploy, err error) {
8686
var dt *g.DeployToken
8787
defer func() {
8888
gc.logger.Debug("Create project deploy token", "projectId", projectId, "name", name, "path", path, "expiresAt", expiresAt, "scopes", scopes, "error", err)
@@ -100,7 +100,7 @@ func (gc *gitlabClient) CreateProjectDeployToken(ctx context.Context, path strin
100100
TokenWithScopes: modelToken.TokenWithScopes{
101101
Token: modelToken.Token{
102102
TokenID: dt.ID,
103-
ParentID: strconv.Itoa(projectId),
103+
ParentID: strconv.FormatInt(projectId, 10),
104104
Path: path,
105105
Name: name,
106106
Token: dt.Token,
@@ -115,7 +115,7 @@ func (gc *gitlabClient) CreateProjectDeployToken(ctx context.Context, path strin
115115
return et, err
116116
}
117117

118-
func (gc *gitlabClient) RevokeGroupDeployToken(ctx context.Context, groupId, deployTokenId int) (err error) {
118+
func (gc *gitlabClient) RevokeGroupDeployToken(ctx context.Context, groupId, deployTokenId int64) (err error) {
119119
defer func() {
120120
gc.logger.Debug("Revoke group deploy token", "groupId", groupId, "deployTokenId", deployTokenId, "error", err)
121121
}()
@@ -124,7 +124,7 @@ func (gc *gitlabClient) RevokeGroupDeployToken(ctx context.Context, groupId, dep
124124
return err
125125
}
126126

127-
func (gc *gitlabClient) RevokeProjectDeployToken(ctx context.Context, projectId, deployTokenId int) (err error) {
127+
func (gc *gitlabClient) RevokeProjectDeployToken(ctx context.Context, projectId, deployTokenId int64) (err error) {
128128
defer func() {
129129
gc.logger.Debug("Revoke project deploy token", "projectId", projectId, "deployTokenId", deployTokenId, "error", err)
130130
}()
@@ -142,7 +142,7 @@ func (gc *gitlabClient) Metadata(ctx context.Context) (metadata *g.Metadata, err
142142
return metadata, err
143143
}
144144

145-
func (gc *gitlabClient) CreatePipelineProjectTriggerAccessToken(ctx context.Context, path, name string, projectId int, description string, expiresAt *time.Time) (et *modelToken.TokenPipelineProjectTrigger, err error) {
145+
func (gc *gitlabClient) CreatePipelineProjectTriggerAccessToken(ctx context.Context, path, name string, projectId int64, description string, expiresAt *time.Time) (et *modelToken.TokenPipelineProjectTrigger, err error) {
146146
var pt *g.PipelineTrigger
147147
defer func() {
148148
gc.logger.Debug("Create a pipeline project trigger access token", "path", path, "name", name, "projectId", description, "description", "error", err)
@@ -156,7 +156,7 @@ func (gc *gitlabClient) CreatePipelineProjectTriggerAccessToken(ctx context.Cont
156156
et = &modelToken.TokenPipelineProjectTrigger{
157157
Token: modelToken.Token{
158158
TokenID: pt.ID,
159-
ParentID: strconv.Itoa(projectId),
159+
ParentID: strconv.FormatInt(projectId, 10),
160160
Path: path,
161161
Name: name,
162162
Token: pt.Token,
@@ -170,7 +170,7 @@ func (gc *gitlabClient) CreatePipelineProjectTriggerAccessToken(ctx context.Cont
170170
return et, err
171171
}
172172

173-
func (gc *gitlabClient) RevokePipelineProjectTriggerAccessToken(ctx context.Context, projectId int, tokenId int) (err error) {
173+
func (gc *gitlabClient) RevokePipelineProjectTriggerAccessToken(ctx context.Context, projectId int64, tokenId int64) (err error) {
174174
defer func() {
175175
gc.logger.Debug("Revoke pipeline project trigger access token", "projectId", projectId, "tokenId", tokenId, "error", err)
176176
}()
@@ -179,7 +179,7 @@ func (gc *gitlabClient) RevokePipelineProjectTriggerAccessToken(ctx context.Cont
179179
return err
180180
}
181181

182-
func (gc *gitlabClient) GetGroupIdByPath(ctx context.Context, path string) (groupId int, err error) {
182+
func (gc *gitlabClient) GetGroupIdByPath(ctx context.Context, path string) (groupId int64, err error) {
183183
defer func() {
184184
gc.logger.Debug("Get group id by path", "path", path, "groupId", groupId, "error", err)
185185
}()
@@ -204,7 +204,7 @@ func (gc *gitlabClient) GitlabClient(ctx context.Context) *g.Client {
204204
return gc.client
205205
}
206206

207-
func (gc *gitlabClient) CreateGroupServiceAccountAccessToken(ctx context.Context, path string, groupId string, userId int, name string, expiresAt time.Time, scopes []string) (et *modelToken.TokenGroupServiceAccount, err error) {
207+
func (gc *gitlabClient) CreateGroupServiceAccountAccessToken(ctx context.Context, path string, groupId string, userId int64, name string, expiresAt time.Time, scopes []string) (et *modelToken.TokenGroupServiceAccount, err error) {
208208
var at *g.PersonalAccessToken
209209
defer func() {
210210
gc.logger.Debug("Create group service access token", "pat", at, "et", et, "path", path, "groupId", groupId, "userId", userId, "name", name, "expiresAt", expiresAt, "scopes", scopes, "error", err)
@@ -235,7 +235,7 @@ func (gc *gitlabClient) CreateGroupServiceAccountAccessToken(ctx context.Context
235235
return et, err
236236
}
237237

238-
func (gc *gitlabClient) CreateUserServiceAccountAccessToken(ctx context.Context, username string, userId int, name string, expiresAt time.Time, scopes []string) (et *modelToken.TokenUserServiceAccount, err error) {
238+
func (gc *gitlabClient) CreateUserServiceAccountAccessToken(ctx context.Context, username string, userId int64, name string, expiresAt time.Time, scopes []string) (et *modelToken.TokenUserServiceAccount, err error) {
239239
defer func() {
240240
gc.logger.Debug("Create user service access token", "et", et, "username", username, "userId", userId, "name", name, "expiresAt", expiresAt, "scopes", scopes, "error", err)
241241
}()
@@ -386,7 +386,7 @@ func (gc *gitlabClient) RotateCurrentToken(ctx context.Context) (token *modelTok
386386
return token, currentEntryToken, err
387387
}
388388

389-
func (gc *gitlabClient) GetUserIdByUsername(ctx context.Context, username string) (userId int, err error) {
389+
func (gc *gitlabClient) GetUserIdByUsername(ctx context.Context, username string) (userId int64, err error) {
390390
defer func() {
391391
gc.logger.Debug("Get user id by username", "username", username, "userId", userId, "error", err)
392392
}()
@@ -406,7 +406,7 @@ func (gc *gitlabClient) GetUserIdByUsername(ctx context.Context, username string
406406
return userId, nil
407407
}
408408

409-
func (gc *gitlabClient) CreatePersonalAccessToken(ctx context.Context, username string, userId int, name string, expiresAt time.Time, scopes []string) (et *modelToken.TokenPersonal, err error) {
409+
func (gc *gitlabClient) CreatePersonalAccessToken(ctx context.Context, username string, userId int64, name string, expiresAt time.Time, scopes []string) (et *modelToken.TokenPersonal, err error) {
410410
var at *g.PersonalAccessToken
411411
defer func() {
412412
gc.logger.Debug("Create personal access token", "pat", at, "et", et, "username", username, "userId", userId, "name", name, "expiresAt", expiresAt, "scopes", scopes, "error", err)
@@ -501,7 +501,7 @@ func (gc *gitlabClient) CreateProjectAccessToken(ctx context.Context, projectId
501501
return et, err
502502
}
503503

504-
func (gc *gitlabClient) RevokePersonalAccessToken(ctx context.Context, tokenId int) (err error) {
504+
func (gc *gitlabClient) RevokePersonalAccessToken(ctx context.Context, tokenId int64) (err error) {
505505
defer func() {
506506
gc.logger.Debug("Revoke personal access token", "tokenId", tokenId, "error", err)
507507
}()
@@ -516,7 +516,7 @@ func (gc *gitlabClient) RevokePersonalAccessToken(ctx context.Context, tokenId i
516516
return nil
517517
}
518518

519-
func (gc *gitlabClient) RevokeProjectAccessToken(ctx context.Context, tokenId int, projectId string) (err error) {
519+
func (gc *gitlabClient) RevokeProjectAccessToken(ctx context.Context, tokenId int64, projectId string) (err error) {
520520
defer func() {
521521
gc.logger.Debug("Revoke project access token", "tokenId", tokenId, "error", err)
522522
}()
@@ -531,7 +531,7 @@ func (gc *gitlabClient) RevokeProjectAccessToken(ctx context.Context, tokenId in
531531
return nil
532532
}
533533

534-
func (gc *gitlabClient) RevokeGroupAccessToken(ctx context.Context, tokenId int, groupId string) (err error) {
534+
func (gc *gitlabClient) RevokeGroupAccessToken(ctx context.Context, tokenId int64, groupId string) (err error) {
535535
defer func() {
536536
gc.logger.Debug("Revoke group access token", "tokenId", tokenId, "error", err)
537537
}()

‎gitlab_client_iface.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ type Client interface {
1616
Metadata(ctx context.Context) (*g.Metadata, error)
1717
CurrentTokenInfo(ctx context.Context) (*token.TokenConfig, error)
1818
RotateCurrentToken(ctx context.Context) (newToken *token.TokenConfig, oldToken *token.TokenConfig, err error)
19-
CreatePersonalAccessToken(ctx context.Context, username string, userId int, name string, expiresAt time.Time, scopes []string) (*token.TokenPersonal, error)
19+
CreatePersonalAccessToken(ctx context.Context, username string, userId int64, name string, expiresAt time.Time, scopes []string) (*token.TokenPersonal, error)
2020
CreateGroupAccessToken(ctx context.Context, groupId string, name string, expiresAt time.Time, scopes []string, accessLevel t.AccessLevel) (*token.TokenGroup, error)
2121
CreateProjectAccessToken(ctx context.Context, projectId string, name string, expiresAt time.Time, scopes []string, accessLevel t.AccessLevel) (*token.TokenProject, error)
22-
RevokePersonalAccessToken(ctx context.Context, tokenId int) error
23-
RevokeProjectAccessToken(ctx context.Context, tokenId int, projectId string) error
24-
RevokeGroupAccessToken(ctx context.Context, tokenId int, groupId string) error
25-
GetUserIdByUsername(ctx context.Context, username string) (int, error)
26-
GetGroupIdByPath(ctx context.Context, path string) (int, error)
27-
GetProjectIdByPath(ctx context.Context, path string) (int, error)
28-
CreateGroupServiceAccountAccessToken(ctx context.Context, group string, groupId string, userId int, name string, expiresAt time.Time, scopes []string) (*token.TokenGroupServiceAccount, error)
29-
CreateUserServiceAccountAccessToken(ctx context.Context, username string, userId int, name string, expiresAt time.Time, scopes []string) (*token.TokenUserServiceAccount, error)
22+
RevokePersonalAccessToken(ctx context.Context, tokenId int64) error
23+
RevokeProjectAccessToken(ctx context.Context, tokenId int64, projectId string) error
24+
RevokeGroupAccessToken(ctx context.Context, tokenId int64, groupId string) error
25+
GetUserIdByUsername(ctx context.Context, username string) (int64, error)
26+
GetGroupIdByPath(ctx context.Context, path string) (int64, error)
27+
GetProjectIdByPath(ctx context.Context, path string) (int64, error)
28+
CreateGroupServiceAccountAccessToken(ctx context.Context, group string, groupId string, userId int64, name string, expiresAt time.Time, scopes []string) (*token.TokenGroupServiceAccount, error)
29+
CreateUserServiceAccountAccessToken(ctx context.Context, username string, userId int64, name string, expiresAt time.Time, scopes []string) (*token.TokenUserServiceAccount, error)
3030
RevokeUserServiceAccountAccessToken(ctx context.Context, token string) error
3131
RevokeGroupServiceAccountAccessToken(ctx context.Context, token string) error
32-
CreatePipelineProjectTriggerAccessToken(ctx context.Context, path, name string, projectId int, description string, expiresAt *time.Time) (*token.TokenPipelineProjectTrigger, error)
33-
RevokePipelineProjectTriggerAccessToken(ctx context.Context, projectId int, tokenId int) error
34-
CreateProjectDeployToken(ctx context.Context, path string, projectId int, name string, expiresAt *time.Time, scopes []string) (et *token.TokenProjectDeploy, err error)
35-
RevokeProjectDeployToken(ctx context.Context, projectId, deployTokenId int) (err error)
36-
CreateGroupDeployToken(ctx context.Context, path string, groupId int, name string, expiresAt *time.Time, scopes []string) (et *token.TokenGroupDeploy, err error)
37-
RevokeGroupDeployToken(ctx context.Context, groupId, deployTokenId int) (err error)
32+
CreatePipelineProjectTriggerAccessToken(ctx context.Context, path, name string, projectId int64, description string, expiresAt *time.Time) (*token.TokenPipelineProjectTrigger, error)
33+
RevokePipelineProjectTriggerAccessToken(ctx context.Context, projectId int64, tokenId int64) error
34+
CreateProjectDeployToken(ctx context.Context, path string, projectId int64, name string, expiresAt *time.Time, scopes []string) (et *token.TokenProjectDeploy, err error)
35+
RevokeProjectDeployToken(ctx context.Context, projectId, deployTokenId int64) (err error)
36+
CreateGroupDeployToken(ctx context.Context, path string, groupId int64, name string, expiresAt *time.Time, scopes []string) (et *token.TokenGroupDeploy, err error)
37+
RevokeGroupDeployToken(ctx context.Context, groupId, deployTokenId int64) (err error)
3838
}

0 commit comments

Comments
 (0)