diff --git a/packages/github/package-lock.json b/packages/github/package-lock.json index e7e3eaacc7..c3bcb49cf7 100644 --- a/packages/github/package-lock.json +++ b/packages/github/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@actions/http-client": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.2.tgz", - "integrity": "sha512-ngdGx7aXM7i9BFT+7e3RWWAEt3bX4tKrdI5w5hf0wYpHz66u5Nw6AFSFXG5wzQyUQbkgeNRnJZyK2zciGqXgrQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.3.tgz", + "integrity": "sha512-wFwh1U4adB/Zsk4cc9kVqaBOHoknhp/pJQk+aWTocbAZWpIl4Zx/At83WFRLXvxB+5HVTWOACM6qjULMZfQSfw==", "requires": { "tunnel": "0.0.6" } diff --git a/packages/github/package.json b/packages/github/package.json index 6dc176efa0..ee68a04fc5 100644 --- a/packages/github/package.json +++ b/packages/github/package.json @@ -37,7 +37,7 @@ "url": "https://github.com/actions/toolkit/issues" }, "dependencies": { - "@actions/http-client": "^1.0.2", + "@actions/http-client": "^1.0.3", "@octokit/graphql": "^4.3.1", "@octokit/rest": "^16.15.0" }, diff --git a/packages/github/src/github.ts b/packages/github/src/github.ts index e07790f181..a2ef233875 100644 --- a/packages/github/src/github.ts +++ b/packages/github/src/github.ts @@ -12,7 +12,7 @@ import { import Octokit from '@octokit/rest' import * as Context from './context' import * as http from 'http' -import {HttpClient} from '@actions/http-client' +import * as httpClient from '@actions/http-client' // We need this in order to extend Octokit Octokit.prototype = new Octokit() @@ -122,10 +122,10 @@ export class GitHub extends Octokit { options: Octokit.Options ): http.Agent | undefined { if (!options.request?.agent) { - const proxyUrl = process.env['https_proxy'] || process.env['HTTPS_PROXY'] - if (proxyUrl) { - const httpClient = new HttpClient() - return httpClient.getAgent('https://api.github.com') + const serverUrl = 'https://api.github.com' + if (httpClient.getProxyUrl(serverUrl)) { + const hc = new httpClient.HttpClient() + return hc.getAgent(serverUrl) } } diff --git a/packages/tool-cache/package-lock.json b/packages/tool-cache/package-lock.json index 129e3dfa0f..9eb9a83dd5 100644 --- a/packages/tool-cache/package-lock.json +++ b/packages/tool-cache/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@actions/http-client": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.2.tgz", - "integrity": "sha512-ngdGx7aXM7i9BFT+7e3RWWAEt3bX4tKrdI5w5hf0wYpHz66u5Nw6AFSFXG5wzQyUQbkgeNRnJZyK2zciGqXgrQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.3.tgz", + "integrity": "sha512-wFwh1U4adB/Zsk4cc9kVqaBOHoknhp/pJQk+aWTocbAZWpIl4Zx/At83WFRLXvxB+5HVTWOACM6qjULMZfQSfw==", "requires": { "tunnel": "0.0.6" } diff --git a/packages/tool-cache/package.json b/packages/tool-cache/package.json index a9d10451f4..41f73293ef 100644 --- a/packages/tool-cache/package.json +++ b/packages/tool-cache/package.json @@ -38,7 +38,7 @@ "dependencies": { "@actions/core": "^1.2.0", "@actions/exec": "^1.0.0", - "@actions/http-client": "^1.0.2", + "@actions/http-client": "^1.0.3", "@actions/io": "^1.0.1", "semver": "^6.1.0", "uuid": "^3.3.2"