Skip to content

Commit 8152b2f

Browse files
committed
fix gitlab private vcs
1 parent d451330 commit 8152b2f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ee/backend/controllers/gitlab.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ func handlePullRequestEvent(gitlabProvider utils.GitlabProvider, payload *gitlab
122122

123123
_, config, projectsGraph, err := utils.GetDiggerConfigForBranch(gitlabProvider, projectId, repoFullName, repoOwner, repoName, cloneURL, branch, prNumber, discussionId)
124124
if err != nil {
125-
utils.InitCommentReporter(glService, prNumber, fmt.Sprintf(":x: Could not load digger config, error: %v", err))
126125
log.Printf("getDiggerConfigForPR error: %v", err)
126+
utils.InitCommentReporter(glService, prNumber, fmt.Sprintf(":x: Could not load digger config, error: %v", err))
127127
return fmt.Errorf("error getting digger config")
128128
}
129129

@@ -338,8 +338,8 @@ func handleIssueCommentEvent(gitlabProvider utils.GitlabProvider, payload *gitla
338338

339339
diggerYmlStr, config, projectsGraph, err := utils.GetDiggerConfigForBranch(gitlabProvider, projectId, repoFullName, repoOwner, repoName, cloneURL, branch, issueNumber, discussionId)
340340
if err != nil {
341-
utils.InitCommentReporter(glService, issueNumber, fmt.Sprintf(":x: Could not load digger config, error: %v", err))
342341
log.Printf("getDiggerConfigForPR error: %v", err)
342+
utils.InitCommentReporter(glService, issueNumber, fmt.Sprintf(":x: Could not load digger config, error: %v", err))
343343
return fmt.Errorf("error getting digger config")
344344
}
345345

libs/ci/gitlab/gitlab.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func ParseGitLabContext() (*GitLabContext, error) {
7171
func NewGitLabService(token string, gitLabContext *GitLabContext, gitlabBaseUrl string) (*GitLabService, error) {
7272
var client *go_gitlab.Client
7373
var err error
74-
if gitlabBaseUrl == "" {
74+
if gitlabBaseUrl != "" {
7575
client, err = go_gitlab.NewClient(token, go_gitlab.WithBaseURL(gitlabBaseUrl))
7676
} else {
7777
client, err = go_gitlab.NewClient(token)

0 commit comments

Comments
 (0)