From e18259c2a5cb6ddc1d8a7939aeeace86c0d2c5a7 Mon Sep 17 00:00:00 2001
From: Sergei Zharinov <zharinov@users.noreply.github.com>
Date: Thu, 10 Dec 2020 11:50:04 +0400
Subject: [PATCH] refactor(http): Remove URL functions from platform-specific
wrappers (#7933)
---
lib/util/http/bitbucket-server.ts | 4 ++--
lib/util/http/bitbucket.ts | 1 -
lib/util/http/gitea.ts | 6 +++---
lib/util/http/gitlab.ts | 1 -
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/lib/util/http/bitbucket-server.ts b/lib/util/http/bitbucket-server.ts
index 8be6add6b1..c3017256d7 100644
--- a/lib/util/http/bitbucket-server.ts
+++ b/lib/util/http/bitbucket-server.ts
@@ -1,5 +1,5 @@
-import URL from 'url';
import { PLATFORM_TYPE_BITBUCKET_SERVER } from '../../constants/platforms';
+import { resolveBaseUrl } from '../url';
import { Http, HttpOptions, HttpResponse, InternalHttpOptions } from '.';
let baseUrl: string;
@@ -16,7 +16,7 @@ export class BitbucketServerHttp extends Http {
path: string,
options?: InternalHttpOptions
): Promise<HttpResponse<T> | null> {
- const url = URL.resolve(baseUrl, path);
+ const url = resolveBaseUrl(baseUrl, path);
const opts = {
baseUrl,
...options,
diff --git a/lib/util/http/bitbucket.ts b/lib/util/http/bitbucket.ts
index cb8266da96..f64653e84a 100644
--- a/lib/util/http/bitbucket.ts
+++ b/lib/util/http/bitbucket.ts
@@ -1,4 +1,3 @@
-import { URL } from 'url';
import { PLATFORM_TYPE_BITBUCKET } from '../../constants/platforms';
import { Http, HttpOptions, HttpResponse, InternalHttpOptions } from '.';
diff --git a/lib/util/http/gitea.ts b/lib/util/http/gitea.ts
index a549fd5ec9..ab1e062259 100644
--- a/lib/util/http/gitea.ts
+++ b/lib/util/http/gitea.ts
@@ -1,5 +1,5 @@
-import url from 'url';
import { PLATFORM_TYPE_GITEA } from '../../constants/platforms';
+import { resolveBaseUrl } from '../url';
import { Http, HttpOptions, HttpResponse, InternalHttpOptions } from '.';
let baseUrl;
@@ -24,8 +24,8 @@ function getPaginationContainer(body: any): any[] {
}
function resolveUrl(path: string, base: string): URL {
- const resolvedUrlString = url.resolve(base, path);
- return new url.URL(resolvedUrlString);
+ const resolvedUrlString = resolveBaseUrl(base, path);
+ return new URL(resolvedUrlString);
}
export class GiteaHttp extends Http<GiteaHttpOptions, GiteaHttpOptions> {
diff --git a/lib/util/http/gitlab.ts b/lib/util/http/gitlab.ts
index e42e0d5926..13bd302817 100644
--- a/lib/util/http/gitlab.ts
+++ b/lib/util/http/gitlab.ts
@@ -1,4 +1,3 @@
-import { URL } from 'url';
import parseLinkHeader from 'parse-link-header';
import { PLATFORM_TYPE_GITLAB } from '../../constants/platforms';
import { logger } from '../../logger';
--
GitLab