From fa8ba330a86b518981fd6177203dc45590b65d3e Mon Sep 17 00:00:00 2001
From: Himanshu Mishra <himanshu@orkohunter.net>
Date: Sun, 17 Jan 2021 10:43:39 +0100
Subject: [PATCH] integration: GitLab API should be added for default and
 should have a protocol

---
 .changeset/nervous-mails-repair.md             |  5 +++++
 packages/integration/src/gitlab/config.test.ts | 14 +++++++++++++-
 packages/integration/src/gitlab/config.ts      |  4 ++--
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/nervous-mails-repair.md

diff --git a/.changeset/nervous-mails-repair.md b/.changeset/nervous-mails-repair.md
new file mode 100644
index 0000000000..f72e2b5e66
--- /dev/null
+++ b/.changeset/nervous-mails-repair.md
@@ -0,0 +1,5 @@
+---
+'@backstage/integration': patch
+---
+
+Fix GitLab API base URL and add it by default to the gitlab.com host
diff --git a/packages/integration/src/gitlab/config.test.ts b/packages/integration/src/gitlab/config.test.ts
index e817465b83..31643d74a6 100644
--- a/packages/integration/src/gitlab/config.test.ts
+++ b/packages/integration/src/gitlab/config.test.ts
@@ -43,7 +43,18 @@ describe('readGitLabIntegrationConfig', () => {
     const output = readGitLabIntegrationConfig(buildConfig({}));
     expect(output).toEqual({
       host: 'gitlab.com',
-      apiBaseUrl: 'gitlab.com/api/v4',
+      apiBaseUrl: 'https://gitlab.com/api/v4',
+    });
+  });
+
+  it('injects the correct GitLab API base URL when missing', () => {
+    const output = readGitLabIntegrationConfig(
+      buildConfig({ host: 'gitlab.com' }),
+    );
+
+    expect(output).toEqual({
+      host: 'gitlab.com',
+      apiBaseUrl: 'https://gitlab.com/api/v4',
     });
   });
 
@@ -86,6 +97,7 @@ describe('readGitLabIntegrationConfigs', () => {
     expect(output).toEqual([
       {
         host: 'gitlab.com',
+        apiBaseUrl: 'https://gitlab.com/api/v4',
       },
     ]);
   });
diff --git a/packages/integration/src/gitlab/config.ts b/packages/integration/src/gitlab/config.ts
index 2d9f4b39ab..fd52a436b6 100644
--- a/packages/integration/src/gitlab/config.ts
+++ b/packages/integration/src/gitlab/config.ts
@@ -18,7 +18,7 @@ import { Config } from '@backstage/config';
 import { isValidHost } from '../helpers';
 
 const GITLAB_HOST = 'gitlab.com';
-const GITLAB_API_BASE_URL = 'gitlab.com/api/v4';
+const GITLAB_API_BASE_URL = 'https://gitlab.com/api/v4';
 
 /**
  * The configuration parameters for a single GitLab integration.
@@ -89,7 +89,7 @@ export function readGitLabIntegrationConfigs(
   // As a convenience we always make sure there's at least an unauthenticated
   // reader for public gitlab repos.
   if (!result.some(c => c.host === GITLAB_HOST)) {
-    result.push({ host: GITLAB_HOST });
+    result.push({ host: GITLAB_HOST, apiBaseUrl: GITLAB_API_BASE_URL });
   }
 
   return result;