refactor(gitlab): Use new http wrapper for Gitlab platform (#6275)

renovatebot · May 29, 2020 · 9617248 · 9617248
1 parent 0fcd548
commit 9617248
Show file tree

Hide file tree

Showing 11 changed files with 684 additions and 223 deletions.
diff --git a/lib/config/presets/gitlab/index.ts b/lib/config/presets/gitlab/index.ts
@@ -1,9 +1,9 @@
 import { logger } from '../../../logger';
-import { api } from '../../../platform/gitlab/gl-got-wrapper';
+import { GitlabHttp } from '../../../util/http/gitlab';
 import { ensureTrailingSlash } from '../../../util/url';
 import { Preset, PresetConfig } from '../common';
 
-const { get: glGot } = api;
+const gitlabApi = new GitlabHttp();
 
 async function getDefaultBranchName(
   urlEncodedPkgName: string,
@@ -15,7 +15,7 @@ async function getDefaultBranchName(
     name: string;
   }[];
 
-  const res = await glGot<GlBranch>(branchesUrl);
+  const res = await gitlabApi.getJson<GlBranch>(branchesUrl);
   const branches = res.body;
   let defautlBranchName = 'master';
   for (const branch of branches) {
@@ -52,7 +52,7 @@ export async function getPresetFromEndpoint(
 
     const presetUrl = `${endpoint}projects/${urlEncodedPkgName}/repository/files/renovate.json?ref=${defautlBranchName}`;
     res = Buffer.from(
-      (await glGot(presetUrl)).body.content,
+      (await gitlabApi.getJson<{ content: string }>(presetUrl)).body.content,
       'base64'
     ).toString();
   } catch (err) {

diff --git a/lib/datasource/gitlab-tags/index.ts b/lib/datasource/gitlab-tags/index.ts
@@ -1,10 +1,10 @@
 import is from '@sindresorhus/is';
 import { logger } from '../../logger';
-import { api } from '../../platform/gitlab/gl-got-wrapper';
 import * as globalCache from '../../util/cache/global';
+import { GitlabHttp } from '../../util/http/gitlab';
 import { GetReleasesConfig, ReleaseResult } from '../common';
 
-const { get: glGot } = api;
+const gitlabApi = new GitlabHttp();
 
 export const id = 'gitlab-tags';
 
@@ -46,7 +46,7 @@ export async function getReleases({
     const url = `${depHost}/api/v4/projects/${urlEncodedRepo}/repository/tags?per_page=100`;
 
     gitlabTags = (
-      await glGot<GitlabTag[]>(url, {
+      await gitlabApi.getJson<GitlabTag[]>(url, {
         paginate: true,
       })
     ).body;

diff --git a/lib/platform/gitlab/gl-got-wrapper.ts b/lib/platform/gitlab/gl-got-wrapper.ts