Merge pull request #1281 from merico-dev/fix-gitlab-webhook-branch-error

fix: gitlab webhook branch error
devstream-io · Dec 1, 2022 · c0b2d06 · c0b2d06
2 parents aed9bf9 + b62b7c5
commit c0b2d06
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/internal/pkg/pluginengine/outputs.go b/internal/pkg/pluginengine/outputs.go
@@ -40,8 +40,6 @@ func HandleOutputsReferences(smgr statemanager.Manager, options configmanager.Ra
 			// recursive if the value is a map (which means Tool.Option is a nested map)
 			log.Debugf("Got nested map: %v", optionValue)
 			errorsList = append(errorsList, HandleOutputsReferences(smgr, optionValue)...)
-		default:
-			log.Warnf("option %+v process output can't get valid type", optionInterface)
 		}
 	}
 

diff --git a/pkg/util/jenkins/tpl/seedjob.tpl.groovy b/pkg/util/jenkins/tpl/seedjob.tpl.groovy
@@ -64,7 +64,7 @@ gitlabTrigger.setTriggerOnPush(true)
 gitlabTrigger.setTriggerOnMergeRequest(true)
 gitlabTrigger.setBranchFilterType(BranchFilterType.RegexBasedFilter)
 gitlabTrigger.setSourceBranchRegex(".*")
-gitlabTrigger.setTargetBranchRegex("master")
+gitlabTrigger.setTargetBranchRegex("[[ .Branch ]]")
 
 jobRef.addTrigger(gitlabTrigger)
 def gitlabConnection = new GitLabConnectionProperty("[[ .GitlabConnection ]]")

diff --git a/pkg/util/scm/gitlab/repo.go b/pkg/util/scm/gitlab/repo.go
@@ -89,22 +89,31 @@ func (c *Client) DescribeRepo() (*git.RepoInfo, error) {
 	return repoInfo, nil
 }
 
+// AddWebhook will update webhook when it exists
+// else create a webbhook
 func (c *Client) AddWebhook(webhookConfig *git.WebhookConfig) error {
 	projectHook, err := c.getWebhook(webhookConfig)
 	if err != nil {
 		return err
 	}
 	if projectHook != nil {
-		log.Debugf("gitlab AddWebhook already exist")
-		return nil
-	}
-	p := &gitlab.AddProjectHookOptions{
-		PushEvents:          gitlab.Bool(true),
-		Token:               gitlab.String(webhookConfig.SecretToken),
-		URL:                 gitlab.String(webhookConfig.Address),
-		MergeRequestsEvents: gitlab.Bool(true),
+		log.Debugf("gitlab AddWebhook already exist, update this webhook")
+		p := &gitlab.EditProjectHookOptions{
+			PushEvents:          gitlab.Bool(true),
+			Token:               gitlab.String(webhookConfig.SecretToken),
+			URL:                 gitlab.String(webhookConfig.Address),
+			MergeRequestsEvents: gitlab.Bool(true),
+		}
+		_, _, err = c.Projects.EditProjectHook(c.GetRepoPath(), projectHook.ID, p)
+	} else {
+		p := &gitlab.AddProjectHookOptions{
+			PushEvents:          gitlab.Bool(true),
+			Token:               gitlab.String(webhookConfig.SecretToken),
+			URL:                 gitlab.String(webhookConfig.Address),
+			MergeRequestsEvents: gitlab.Bool(true),
+		}
+		_, _, err = c.Projects.AddProjectHook(c.GetRepoPath(), p)
 	}
-	_, _, err = c.Projects.AddProjectHook(c.GetRepoPath(), p)
 	if err != nil {
 		return c.newModuleError(err)
 	}