Fix AppSet Webhook for gitlab merge requests

Signed-off-by: Syst3m1An0maly <[email protected]>
argoproj · Sep 4, 2023 · 7580dad · 7580dad
1 parent ef7f32e
commit 7580dad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/applicationset/webhook/webhook.go b/applicationset/webhook/webhook.go
@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"net/url"
 	"regexp"
-	"strconv"
 	"strings"
 
 	"k8s.io/apimachinery/pkg/types"
@@ -226,7 +225,7 @@ func getPRGeneratorInfo(payload interface{}) *prGeneratorInfo {
 		}
 
 		info.Gitlab = &prGeneratorGitlabInfo{
-			Project:     strconv.FormatInt(payload.ObjectAttributes.TargetProjectID, 10),
+			Project:     payload.Project.PathWithNamespace,
 			APIHostname: urlObj.Hostname(),
 		}
 	default:

diff --git a/applicationset/webhook/webhook_test.go b/applicationset/webhook/webhook_test.go
@@ -162,7 +162,7 @@ func TestWebhookHandler(t *testing.T) {
 				fakeAppWithGitGenerator("git-github", namespace, "https://github.com/org/repo"),
 				fakeAppWithGitGenerator("git-gitlab", namespace, "https://gitlab/group/name"),
 				fakeAppWithGithubPullRequestGenerator("pull-request-github", namespace, "Codertocat", "Hello-World"),
-				fakeAppWithGitlabPullRequestGenerator("pull-request-gitlab", namespace, "100500"),
+				fakeAppWithGitlabPullRequestGenerator("pull-request-gitlab", namespace, "group/name"),
 				fakeAppWithPluginGenerator("plugin", namespace),
 				fakeAppWithMatrixAndGitGenerator("matrix-git-github", namespace, "https://github.com/org/repo"),
 				fakeAppWithMatrixAndPullRequestGenerator("matrix-pull-request-github", namespace, "Codertocat", "Hello-World"),
@@ -297,7 +297,7 @@ func fakeAppWithGitGenerator(name, namespace, repo string) *v1alpha1.Application
 	}
 }
 
-func fakeAppWithGitlabPullRequestGenerator(name, namespace, projectId string) *v1alpha1.ApplicationSet {
+func fakeAppWithGitlabPullRequestGenerator(name, namespace, projectNameWithNamespace string) *v1alpha1.ApplicationSet {
 	return &v1alpha1.ApplicationSet{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
@@ -308,7 +308,7 @@ func fakeAppWithGitlabPullRequestGenerator(name, namespace, projectId string) *v
 				{
 					PullRequest: &v1alpha1.PullRequestGenerator{
 						GitLab: &v1alpha1.PullRequestGeneratorGitLab{
-							Project: projectId,
+							Project: projectNameWithNamespace,
 						},
 					},
 				},