fix: Add https prefix into webhookUrl (#130)

JIRA: EPMDEDP-13302 Related: #130 Change-Id: Icd4c51877e08a4f3ff18a7bdad59e057a0997510
epam · Feb 29, 2024 · 70c2b7d · 70c2b7d
1 parent c9999ed
commit 70c2b7d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/charts/pipelines-library/templates/resources/gitservers/gitserver.yaml b/charts/pipelines-library/templates/resources/gitservers/gitserver.yaml
@@ -15,7 +15,7 @@ spec:
   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 }}
+  webhookUrl: {{ printf "https://el-%s-%s.%s" $name $.Release.Namespace $.Values.global.dnsWildCard | quote }}
   {{- end }}
 {{- end }}
 ---

diff --git a/charts/pipelines-library/tests/test_github_integration.py b/charts/pipelines-library/tests/test_github_integration.py
@@ -57,7 +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"]
+    assert "https://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
@@ -49,7 +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"]
+    assert "https://el-my-gitlab-ns.example.com" == gitserver["webhookUrl"]
 
     guicklink = r["quicklink"]["my-gitlab"]["spec"]
     assert "system" == guicklink["type"]