Skip to content

Commit 070ebf3

Browse files
committed
@1.21.0 - @actions/http-client 1.0.8 -> 1.0.9
1 parent 78742f7 commit 070ebf3

File tree

3 files changed

+22
-27
lines changed

3 files changed

+22
-27
lines changed

dist/index.js

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,6 @@ exports.toCommandValue = toCommandValue;
11191119
"use strict";
11201120

11211121
Object.defineProperty(exports, "__esModule", ({ value: true }));
1122-
const url = __webpack_require__(835);
11231122
const http = __webpack_require__(605);
11241123
const https = __webpack_require__(211);
11251124
const pm = __webpack_require__(805);
@@ -1168,7 +1167,7 @@ var MediaTypes;
11681167
* @param serverUrl The server URL where the request will be sent. For example, https://api.github.com
11691168
*/
11701169
function getProxyUrl(serverUrl) {
1171-
let proxyUrl = pm.getProxyUrl(url.parse(serverUrl));
1170+
let proxyUrl = pm.getProxyUrl(new URL(serverUrl));
11721171
return proxyUrl ? proxyUrl.href : '';
11731172
}
11741173
exports.getProxyUrl = getProxyUrl;
@@ -1187,6 +1186,15 @@ const HttpResponseRetryCodes = [
11871186
const RetryableHttpVerbs = ['OPTIONS', 'GET', 'DELETE', 'HEAD'];
11881187
const ExponentialBackoffCeiling = 10;
11891188
const ExponentialBackoffTimeSlice = 5;
1189+
class HttpClientError extends Error {
1190+
constructor(message, statusCode) {
1191+
super(message);
1192+
this.name = 'HttpClientError';
1193+
this.statusCode = statusCode;
1194+
Object.setPrototypeOf(this, HttpClientError.prototype);
1195+
}
1196+
}
1197+
exports.HttpClientError = HttpClientError;
11901198
class HttpClientResponse {
11911199
constructor(message) {
11921200
this.message = message;
@@ -1205,7 +1213,7 @@ class HttpClientResponse {
12051213
}
12061214
exports.HttpClientResponse = HttpClientResponse;
12071215
function isHttps(requestUrl) {
1208-
let parsedUrl = url.parse(requestUrl);
1216+
let parsedUrl = new URL(requestUrl);
12091217
return parsedUrl.protocol === 'https:';
12101218
}
12111219
exports.isHttps = isHttps;
@@ -1310,7 +1318,7 @@ class HttpClient {
13101318
if (this._disposed) {
13111319
throw new Error('Client has already been disposed.');
13121320
}
1313-
let parsedUrl = url.parse(requestUrl);
1321+
let parsedUrl = new URL(requestUrl);
13141322
let info = this._prepareRequest(verb, parsedUrl, headers);
13151323
// Only perform retries on reads since writes may not be idempotent.
13161324
let maxTries = this._allowRetries && RetryableHttpVerbs.indexOf(verb) != -1
@@ -1349,7 +1357,7 @@ class HttpClient {
13491357
// if there's no location to redirect to, we won't
13501358
break;
13511359
}
1352-
let parsedRedirectUrl = url.parse(redirectUrl);
1360+
let parsedRedirectUrl = new URL(redirectUrl);
13531361
if (parsedUrl.protocol == 'https:' &&
13541362
parsedUrl.protocol != parsedRedirectUrl.protocol &&
13551363
!this._allowRedirectDowngrade) {
@@ -1465,7 +1473,7 @@ class HttpClient {
14651473
* @param serverUrl The server URL where the request will be sent. For example, https://api.github.com
14661474
*/
14671475
getAgent(serverUrl) {
1468-
let parsedUrl = url.parse(serverUrl);
1476+
let parsedUrl = new URL(serverUrl);
14691477
return this._getAgent(parsedUrl);
14701478
}
14711479
_prepareRequest(method, requestUrl, headers) {
@@ -1538,7 +1546,7 @@ class HttpClient {
15381546
maxSockets: maxSockets,
15391547
keepAlive: this._keepAlive,
15401548
proxy: {
1541-
proxyAuth: proxyUrl.auth,
1549+
proxyAuth: `${proxyUrl.username}:${proxyUrl.password}`,
15421550
host: proxyUrl.hostname,
15431551
port: proxyUrl.port
15441552
}
@@ -1633,12 +1641,8 @@ class HttpClient {
16331641
else {
16341642
msg = 'Failed request: (' + statusCode + ')';
16351643
}
1636-
let err = new Error(msg);
1637-
// attach statusCode and body obj (if available) to the error object
1638-
err['statusCode'] = statusCode;
1639-
if (response.result) {
1640-
err['result'] = response.result;
1641-
}
1644+
let err = new HttpClientError(msg, statusCode);
1645+
err.result = response.result;
16421646
reject(err);
16431647
}
16441648
else {
@@ -1653,12 +1657,11 @@ exports.HttpClient = HttpClient;
16531657
/***/ }),
16541658

16551659
/***/ 805:
1656-
/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
1660+
/***/ ((__unused_webpack_module, exports) => {
16571661

16581662
"use strict";
16591663

16601664
Object.defineProperty(exports, "__esModule", ({ value: true }));
1661-
const url = __webpack_require__(835);
16621665
function getProxyUrl(reqUrl) {
16631666
let usingSsl = reqUrl.protocol === 'https:';
16641667
let proxyUrl;
@@ -1673,7 +1676,7 @@ function getProxyUrl(reqUrl) {
16731676
proxyVar = process.env['http_proxy'] || process.env['HTTP_PROXY'];
16741677
}
16751678
if (proxyVar) {
1676-
proxyUrl = url.parse(proxyVar);
1679+
proxyUrl = new URL(proxyVar);
16771680
}
16781681
return proxyUrl;
16791682
}
@@ -2110,14 +2113,6 @@ module.exports = require("tls");
21102113

21112114
/***/ }),
21122115

2113-
/***/ 835:
2114-
/***/ ((module) => {
2115-
2116-
"use strict";
2117-
module.exports = require("url");
2118-
2119-
/***/ }),
2120-
21212116
/***/ 669:
21222117
/***/ ((module) => {
21232118

dist/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "setup-ruby-pkgs",
3-
"version": "1.19.0",
3+
"version": "1.21.0",
44
"description": "Install packages and update builds tools for Ruby",
55
"main": "index.js",
66
"scripts": {
@@ -24,6 +24,6 @@
2424
"license": "MIT",
2525
"dependencies": {
2626
"@actions/core": "^1.2.6",
27-
"@actions/http-client": "^1.0.8"
27+
"@actions/http-client": "^1.0.9"
2828
}
2929
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "setup-ruby-pkgs",
3-
"version": "1.19.0",
3+
"version": "1.21.0",
44
"description": "Install packages and update builds tools for Ruby",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)