From 6ddd490094921a587ad822c3d3d8e3b3ebbb6e49 Mon Sep 17 00:00:00 2001
From: Jan Schumann <js@schumann-it.com>
Date: Mon, 12 Feb 2024 11:34:16 +0100
Subject: [PATCH] feat: query escape function for notifications (#16343)

Signed-off-by: Jan Schumann <js@schumann-it.com>
Co-authored-by: pasha-codefresh <pavel@codefresh.io>
Signed-off-by: penglongli <pelenli@tencent.com>
---
 docs/operator-manual/notifications/functions.md | 10 ++++++++++
 util/notification/expression/repo/repo.go       |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/docs/operator-manual/notifications/functions.md b/docs/operator-manual/notifications/functions.md
index 3d614e4e53a55..c50d122024b76 100644
--- a/docs/operator-manual/notifications/functions.md
+++ b/docs/operator-manual/notifications/functions.md
@@ -48,6 +48,16 @@ Transforms given GIT URL into HTTPs format.
 
 Returns repository URL full name `(<owner>/<repoName>)`. Currently supports only Github, GitLab and Bitbucket.
 
+<hr>
+**`repo.QueryEscape(s string) string`**
+
+QueryEscape escapes the string, so it can be safely placed inside a URL
+
+Example:
+```
+/projects/{{ call .repo.QueryEscape (call .repo.FullNameByRepoURL .app.status.RepoURL) }}/merge_requests
+```
+
 <hr>
 **`repo.GetCommitMetadata(sha string) CommitMetadata`**
 
diff --git a/util/notification/expression/repo/repo.go b/util/notification/expression/repo/repo.go
index 060060cbccd68..110c278cb486b 100644
--- a/util/notification/expression/repo/repo.go
+++ b/util/notification/expression/repo/repo.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"net/url"
 	"regexp"
 	"strings"
 
@@ -90,6 +91,7 @@ func NewExprs(argocdService service.Service, app *unstructured.Unstructured) map
 	return map[string]interface{}{
 		"RepoURLToHTTPS":    repoURLToHTTPS,
 		"FullNameByRepoURL": FullNameByRepoURL,
+		"QueryEscape":       url.QueryEscape,
 		"GetCommitMetadata": func(commitSHA string) interface{} {
 			meta, err := getCommitMetadata(commitSHA, app, argocdService)
 			if err != nil {