[server] Use public services endpoint for webhooks ENG-524 (gitpod-io…

…#18367) * [server] Use public services endpoint for webhooks & config * fix * fix
ZDSRKJ · Jul 28, 2023 · ecbb418 · ecbb418
1 parent 8c6d8e2
commit ecbb418
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 0 deletions.
diff --git a/components/gitpod-protocol/src/util/gitpod-host-url.ts b/components/gitpod-protocol/src/util/gitpod-host-url.ts
@@ -198,6 +198,14 @@ export class GitpodHostUrl {
         return this.with((url) => ({ host: "ide." + url.host }));
     }
 
+    asPublicServices(): GitpodHostUrl {
+        const hostSegments = this.url.host.split(".");
+        if (hostSegments[0] === "services") {
+            return this;
+        }
+        return this.with((url) => ({ host: "services." + url.host }));
+    }
+
     asIDEMetrics(): GitpodHostUrl {
         let newUrl: GitpodHostUrl = this;
         const hostSegments = this.url.host.split(".");

diff --git a/components/server/src/prebuilds/bitbucket-server-service.ts b/components/server/src/prebuilds/bitbucket-server-service.ts
@@ -124,6 +124,7 @@ export class BitbucketServerService extends RepositoryService {
 
     protected getHookUrl() {
         return this.config.hostUrl
+            .asPublicServices()
             .with({
                 pathname: BitbucketServerApp.path,
             })

diff --git a/components/server/src/prebuilds/bitbucket-service.ts b/components/server/src/prebuilds/bitbucket-service.ts
@@ -81,6 +81,7 @@ export class BitbucketService extends RepositoryService {
 
     protected getHookUrl() {
         return this.config.hostUrl
+            .asPublicServices()
             .with({
                 pathname: BitbucketApp.path,
             })

diff --git a/components/server/src/prebuilds/github-service.ts b/components/server/src/prebuilds/github-service.ts
@@ -101,6 +101,7 @@ export class GitHubService extends RepositoryService {
 
     protected getHookUrl() {
         return this.config.hostUrl
+            .asPublicServices()
             .with({
                 pathname: GitHubEnterpriseApp.path,
             })

diff --git a/components/server/src/prebuilds/gitlab-service.ts b/components/server/src/prebuilds/gitlab-service.ts
@@ -71,6 +71,7 @@ export class GitlabService extends RepositoryService {
 
     protected getHookUrl() {
         return this.config.hostUrl
+            .asPublicServices()
             .with({
                 pathname: GitLabApp.path,
             })