chore: Get webhook url of gitlab and github from gitserver resource (#…

…130) JIRA: EPMDEDP-13302 Related: #130 Change-Id: I48990ccc3b41191dd6c50204723a58bb2ac15c63
epam · Feb 29, 2024 · c9999ed · c9999ed
1 parent e7eed45
commit c9999ed
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/charts/pipelines-library/templates/resources/gitservers/gitserver.yaml b/charts/pipelines-library/templates/resources/gitservers/gitserver.yaml
@@ -14,6 +14,9 @@ spec:
   nameSshKeySecret: {{ default (printf "ci-%s" $server.gitProvider | quote) $server.nameSshKeySecret }}
   sshPort: {{ dig "sshPort" "22" $server }}
   skipWebhookSSLVerification: {{ $server.webhook.skipWebhookSSLVerification }}
+  {{- if not (eq "gerrit" $server.gitProvider) }}
+  webhookUrl: {{ printf "el-%s-%s.%s" $name $.Release.Namespace $.Values.global.dnsWildCard | quote }}
+  {{- end }}
 {{- end }}
 ---
 {{- end }}
diff --git a/charts/pipelines-library/tests/test_github_integration.py b/charts/pipelines-library/tests/test_github_integration.py
@@ -4,6 +4,7 @@
 def test_github_is_enabled():
     config = """
 global:
+  dnsWildCard: "example.com"
   gitProviders:
     - github
 gitServers:
@@ -56,6 +57,7 @@ def test_github_is_enabled():
     assert 443 == gitserver["httpsPort"]
     assert "ci-github" == gitserver["nameSshKeySecret"]
     assert 22 == gitserver["sshPort"]
+    assert "el-my-github-ns.example.com" == gitserver["webhookUrl"]
 
     guicklink = r["quicklink"]["my-github"]["spec"]
     assert "system" == guicklink["type"]

diff --git a/charts/pipelines-library/tests/test_gitlab_integration.py b/charts/pipelines-library/tests/test_gitlab_integration.py
@@ -4,6 +4,7 @@
 def test_gitlab_is_enabled():
     config = """
 global:
+  dnsWildCard: "example.com"
   gitProviders:
     - gitlab
 gitServers:
@@ -48,6 +49,7 @@ def test_gitlab_is_enabled():
     assert 443 == gitserver["httpsPort"]
     assert "ci-gitlab" == gitserver["nameSshKeySecret"]
     assert 22 == gitserver["sshPort"]
+    assert "el-my-gitlab-ns.example.com" == gitserver["webhookUrl"]
 
     guicklink = r["quicklink"]["my-gitlab"]["spec"]
     assert "system" == guicklink["type"]