feat: gitlab integration #428

never112 · 2024-10-30T08:09:11Z

- 版本检查
  无配置：>=10.8 版本 comments+discussion，<10.8版本使用comments，
  有配置：>=10.8 版本使用配置，<10.8版本使用comments.
  全局无配置，repo无配置，->无配置
  全局无配置，repo有配置，->repo配置
  全局有配置，repo有配置，->repo配置
- linter结果汇总 comment输出。
- 单条linter结果 discussion 输出。
- linter结果汇总表格形式
- 拉取代码使用 accesstoken 方式
  github/gitlab 统一使用 accesstokne的方式拉取代码需要重新设计？
- 解决linter检查错误
- gitlab 使用 accesstoken 拉取代码，不改动原有逻辑，在gitlab handler 中实现

report: comment:
Fail：Folding

Fail: Unfolding

pass：

report：discussion

comments-table

netlify · 2024-10-30T08:09:26Z

✅ Deploy Preview for reviewbot-x canceled.

Name	Link
🔨 Latest commit	`3ff170b`
🔍 Latest deploy log	https://app.netlify.com/sites/reviewbot-x/deploys/67396b989f643d0008e16e88

codecov · 2024-10-30T09:36:28Z

Codecov Report

Attention: Patch coverage is 1.28388% with 692 lines in your changes missing coverage. Please review.

Project coverage is 25.61%. Comparing base (9aab280) to head (3ff170b).
Report is 1 commits behind head on master.

Files with missing lines	Patch %	Lines
internal/linters/providergitlab.go	0.00%	436 Missing ⚠️
server.go	0.00%	209 Missing ⚠️
internal/linters/hunk.go	0.00%	25 Missing ⚠️
main.go	0.00%	19 Missing ⚠️
config/config.go	75.00%	2 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #428      +/-   ##
==========================================
- Coverage   30.13%   25.61%   -4.53%     
==========================================
  Files          30       31       +1     
  Lines        3796     4467     +671     
==========================================
  Hits         1144     1144              
- Misses       2515     3185     +670     
- Partials      137      138       +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

qiniu-x · 2024-11-17T03:59:36Z

[Git-flow] Hi @never112, There are some suggestions for your information:

Rebase suggestions

Following commits seems generated via git merge

Merge remote-tracking branch 'upstream/master' into zhou1025

Merge branch 'zhou1025' of github.com:never112/reviewbot into zhou1025

Merge branch 'zhou1025' of github.com:never112/reviewbot into zhou1025

Merge branch 'zhou1025' of github.com:never112/reviewbot into zhou1025
Following commits have duplicated messages

fix linter error

fix linter error

Merge branch 'zhou1025' of github.com:never112/reviewbot into zhou1025

Merge branch 'zhou1025' of github.com:never112/reviewbot into zhou1025

Merge branch 'zhou1025' of github.com:never112/reviewbot into zhou1025

fix main conflict

fix main conflict

fix main conflict

Which seems insignificant, recommend to use git rebase command to reorganize your PR.

For other git-flow instructions, recommend refer to these examples.

If you have any questions about this comment, feel free to raise an issue here:

https://github.com/qiniu/reviewbot

qiniu-x · 2024-11-17T04:06:55Z

internal/linters/providergitlab.go

+	return fmt.Sprintf("[**%s**]", linterName)
+}
+
+func (g *GitlabProvider) Report(ctx context.Context, a Agent, lintResults map[string][]LinterOutput) error {


[golangci-lint] _{reported by reviewbot🐮}
cognitive complexity 33 of func (*GitlabProvider).Report is high (> 30) (gocognit)

qiniu-x · 2024-11-17T04:06:56Z

internal/linters/providergitlab.go

+	num := a.Provider.GetCodeReviewInfo().Number
+	orgRepo := fmt.Sprintf("%s/%s", org, repo)
+	reportformat := ReportFormMatCheck(g.GitLabClient, a.LinterConfig.ReportType)
+	switch reportformat {


[golangci-lint] _{reported by reviewbot🐮}
missing cases in switch of type config.ReportType: config.GithubCheckRuns, config.GithubPRReview, config.GithubMixType (exhaustive)

qiniu-x · 2024-11-17T04:06:57Z

internal/linters/providergitlab.go

+
+func ListMergeRequestsFiles(ctx context.Context, gc *gitlab.Client, owner string, repo string, pid int, number int) ([]*gitlab.MergeRequestDiff, *gitlab.Response, error) {
+	// For version compatibility,because verion below 10.8 not support ListMergeRequestDiffs
+	files, response, err := gc.MergeRequests.GetMergeRequestChanges(pid, number, nil)


[golangci-lint] _{reported by reviewbot🐮}
SA1019: gc.MergeRequests.GetMergeRequestChanges is deprecated: This endpoint has been replaced by MergeRequestsService.ListMergeRequestDiffs() (staticcheck)

qiniu-x · 2024-11-17T04:06:59Z

server.go

+	return s.gitlabHandle(ctx, event)
+}
+
+func (s *Server) gitlabHandle(ctx context.Context, event *gitlab.MergeEvent) error {


[golangci-lint] _{reported by reviewbot🐮}
cognitive complexity 35 of func (*Server).gitlabHandle is high (> 30) (gocognit)

qiniu-x · 2024-11-17T04:07:00Z

server.go

+		log.Fatalf("Failed to create client: %v", err)
+	}
+	return git
+}

 func (s *Server) handle(ctx context.Context, event *github.PullRequestEvent) error {


[golangci-lint] _{reported by reviewbot🐮}
cognitive complexity 31 of func (*Server).handle is high (> 30) (gocognit)

qiniu-x · 2024-11-17T04:07:01Z

server.go

+	} else {
+		log.Infof("no .gitmodules file in repo %s", repo)
+	}
+	for name, fn := range linters.TotalPullRequestHandlers() {


[golangci-lint] _{reported by reviewbot🐮}
empty-lines: extra empty line at the start of a block (revive)

qiniu-x · 2024-11-17T04:07:02Z

server.go

@@ -220,6 +231,10 @@ func (s *Server) pullImageWithRetry(ctx context.Context, image string, dockerRun
 }

 func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {


[golangci-lint] _{reported by reviewbot🐮}
Non-inherited new context, use function like context.WithXXX or r.Context instead (contextcheck)

qiniu-x · 2024-11-17T04:07:03Z

server.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"io/ioutil"


[golangci-lint] _{reported by reviewbot🐮}
SA1019: "io/ioutil" has been deprecated since Go 1.19: As of Go 1.16, the same functionality is now provided by package [io] or package [os], and those implementations should be preferred in new code. See the specific function documentation for details. (staticcheck)

qiniu-x · 2024-11-17T04:07:04Z

server.go

+		eventGUID = eventGUID[len(eventGUID)-12:]
+	}
+	ctx := context.WithValue(context.Background(), lintersutil.EventGUIDKey, eventGUID)
+	log := lintersutil.FromContext(ctx)


[golangci-lint] _{reported by reviewbot🐮}
Non-inherited new context, use function like context.WithXXX or r.Context instead (contextcheck)

CarlJi · 2024-11-17T08:13:11Z

main.go

 func (o options) Validate() error {
-	if o.accessToken == "" && o.appID == 0 {
-		return errors.New("either access-token or github app information should be provided")
+	if o.gitHubAccessToken == "" && o.appID == 0 {


reviewbot 应当允许只使用 gitlab ，这里就不合适了

CarlJi · 2024-11-17T08:14:40Z

server.go

@@ -220,6 +231,10 @@ func (s *Server) pullImageWithRetry(ctx context.Context, image string, dockerRun
 }

 func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	if r.Header.Get("X-Gitlab-Event") != "" {


github 也需要包装下

server.go

CarlJi · 2024-11-17T08:17:40Z

internal/linters/hunk.go

@@ -63,6 +69,38 @@ func NewFileHunkChecker(commitFiles []*github.CommitFile) (*FileHunkChecker, err
 		Hunks: hunks,
 	}, nil
 }
+func NewGitLabCommitFileHunkChecker(commitFiles []*gitlab.MergeRequestDiff) (*FileHunkChecker, error) {


这个文件应该剥离对github 和 gitlab的耦合

CarlJi · 2024-11-17T08:18:26Z

config/config.example.yaml

@@ -6,7 +6,8 @@
 # 3. Conducting specific gray testing for a particular feature.

 globalDefaultConfig: # global default settings, will be overridden by qbox org and repo specific settings if they exist
-  githubReportType: "github_check_run" # github_pr_review, github_check_run, github_mix
+  githubReportType: "github_check_run" # github_pr_review, github_check_run
+  gitlabReportType: "gitlab_mr_comment_discussion" # gitlab_mr_comment, gitlab_mr_discussion,gitlab_mr_comment_discussion


代码里应该要有最佳实践，通常这里不需要配置

never112 and others added 3 commits October 25, 2024 12:02

add gitlab-accesstoken config

a712e69

process gitlab event

ab35271

gitlab report

73a15ca

never112 force-pushed the zhou1025 branch from 43add03 to 4c0e507 Compare October 30, 2024 08:11

gitlab integration

2006e1f

never112 force-pushed the zhou1025 branch 4 times, most recently from f51dbab to 6fedd79 Compare October 30, 2024 09:34

never112 force-pushed the zhou1025 branch 3 times, most recently from 49ecb83 to 4ae269d Compare October 30, 2024 10:27

fix main conflict

7456aef

never112 force-pushed the zhou1025 branch 2 times, most recently from dc22817 to 194c8c3 Compare October 30, 2024 10:58

--amend

416b4ec

never112 force-pushed the zhou1025 branch 12 times, most recently from d313f1c to ebfda9b Compare November 6, 2024 09:02

never112 force-pushed the zhou1025 branch 9 times, most recently from 26a954c to 70ee7fe Compare November 13, 2024 06:10

fix main conflict

52ec7e8

never112 force-pushed the zhou1025 branch from 70ee7fe to 52ec7e8 Compare November 13, 2024 06:34

fix conflic

3ff170b

never112 force-pushed the zhou1025 branch from e71dea0 to 3ff170b Compare November 17, 2024 04:05

qiniu-x bot reviewed Nov 17, 2024

View reviewed changes

CarlJi reviewed Nov 17, 2024

View reviewed changes

server.go Show resolved Hide resolved

CarlJi reviewed Nov 17, 2024

View reviewed changes

CarlJi merged commit 6766b6c into qiniu:master Nov 17, 2024
7 of 8 checks passed

CarlJi mentioned this pull request Nov 17, 2024

gitlab support #278

Closed

		@@ -220,6 +231,10 @@ func (s *Server) pullImageWithRetry(ctx context.Context, image string, dockerRun
		}

		func (s Server) ServeHTTP(w http.ResponseWriter, r http.Request) {

feat: gitlab integration #428

feat: gitlab integration #428

Uh oh!

Conversation

never112 commented Oct 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

netlify bot commented Oct 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for reviewbot-x canceled.

Uh oh!

codecov bot commented Oct 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

qiniu-x bot commented Nov 17, 2024

Rebase suggestions

Uh oh!

qiniu-x bot Nov 17, 2024

Choose a reason for hiding this comment

Uh oh!

qiniu-x bot Nov 17, 2024

Choose a reason for hiding this comment

Uh oh!

qiniu-x bot Nov 17, 2024

Choose a reason for hiding this comment

Uh oh!

qiniu-x bot Nov 17, 2024

Choose a reason for hiding this comment

Uh oh!

qiniu-x bot Nov 17, 2024

Choose a reason for hiding this comment

Uh oh!

qiniu-x bot Nov 17, 2024

Choose a reason for hiding this comment

Uh oh!

qiniu-x bot Nov 17, 2024

Choose a reason for hiding this comment

Uh oh!

qiniu-x bot Nov 17, 2024

Choose a reason for hiding this comment

Uh oh!

qiniu-x bot Nov 17, 2024

Choose a reason for hiding this comment

Uh oh!

CarlJi Nov 17, 2024

Choose a reason for hiding this comment

Uh oh!

CarlJi Nov 17, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

CarlJi Nov 17, 2024

Choose a reason for hiding this comment

Uh oh!

CarlJi Nov 17, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

never112 commented Oct 30, 2024 •

edited

Loading

netlify bot commented Oct 30, 2024 •

edited

Loading

codecov bot commented Oct 30, 2024 •

edited

Loading