chore: resolve proxy based on target url

Author: peternhale

package.json

@@ -13,6 +13,7 @@
     "@salesforce/core": "^2.15.2",
     "@salesforce/kit": "^1.3.3",
     "@salesforce/ts-types": "^1.4.3",
+    "agent-base": "^6.0.2",
     "aws-sdk": "^2.782.0",
     "chalk": "^4.1.0",
     "cli-ux": "^5.5.1",
@@ -23,6 +24,7 @@
     "glob": "^7.1.6",
     "got": "^11.8.0",
     "proxy-agent": "^4.0.1",
+    "proxy-from-env": "^1.1.0",
     "shelljs": "^0.8.4",
     "standard-version": "^9.0.0",
     "tslib": "^2"

src/codeSigning/packAndSign.ts

@@ -12,6 +12,7 @@ import { exec } from 'child_process';
 import { EOL } from 'os';
 import { basename, join as pathJoin } from 'path';
 import { sep as pathSep } from 'path';
+// import { URL } from 'url';
 import { Readable } from 'stream';
 import { copyFile, createReadStream } from 'fs';
 import { Agent } from 'https';
@@ -20,7 +21,9 @@ import { UX } from '@salesforce/command';
 import { fs, Logger } from '@salesforce/core';
 import { NamedError } from '@salesforce/kit';
 import * as ProxyAgent from 'proxy-agent';
+import { getProxyForUrl } from 'proxy-from-env';
 
+// import { AgentOptions } from 'agent-base';
 import {
   CodeSignInfo,
   CodeVerifierInfo,
@@ -177,7 +180,7 @@ export const api = {
       return resolve(
         (async (): Promise<boolean> => {
           try {
-            const agent = api.getAgentForUri();
+            const agent = api.getAgentForUri(publicKeyUrl);
             const response = await got.get(publicKeyUrl, { agent });
             if (response && response.statusCode === 200) {
               verifyInfo.publicKeyStream = Readable.from([response.body]);
@@ -459,8 +462,10 @@ export const api = {
     }
   },
 
-  getAgentForUri(): false | Agents {
-    const agent = ProxyAgent() as Agent;
+  getAgentForUri(url: string): false | Agents {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+    const proxyUrl: string = getProxyForUrl(url) as string;
+    const agent = ProxyAgent(proxyUrl) as Agent;
     return { https: agent, http: agent };
   },
 };

src/commands/circleci/envvar/update.ts

@@ -101,7 +101,7 @@ export default class CircelCIEnvvarUpdate extends SfdxCommand {
 
     try {
       const url = `${URL_BASE}/${slug}/envvar`;
-      const agent = api.getAgentForUri();
+      const agent = api.getAgentForUri(url);
       response = await got.get<string>(url, { headers: this.headers, agent });
     } catch (err) {
       const error = err as SfdxError;
@@ -152,10 +152,10 @@ export default class CircelCIEnvvarUpdate extends SfdxCommand {
       try {
         // First remove the old envvar
         const url = `${envvarUrl}/${name}`;
-        let agent = api.getAgentForUri();
+        let agent = api.getAgentForUri(url);
         await got.delete(url, { headers: this.headers, agent });
 
-        agent = api.getAgentForUri();
+        agent = api.getAgentForUri(`${envvarUrl}`);
         await got.post(`${envvarUrl}`, {
           headers: this.headers,
           json: { name, value },

src/repositories.ts

@@ -34,7 +34,7 @@ export type RepositoryInfo = {
  * Get a list of known tooling repositories that include Salesforce CLI plugins, libraries, and orbs.
  */
 export const retrieveKnownRepositories = async (): Promise<RepositoryInfo[]> => {
-  const agent = api.getAgentForUri();
+  const agent = api.getAgentForUri(KNOWN_REPOSITORIES_URL);
   const response = await got.get(KNOWN_REPOSITORIES_URL, { agent });
   const repositories = JSON.parse(response.body) as SourceRepositoryDefinition[];
 

yarn.lock

@@ -1026,7 +1026,7 @@ add-stream@^1.0.0:
   resolved "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
   integrity sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=
 
-agent-base@6, agent-base@^6.0.0:
+agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
@@ -5753,7 +5753,7 @@ proxy-agent@^4.0.1:
     proxy-from-env "^1.0.0"
     socks-proxy-agent "^5.0.0"
 
-proxy-from-env@^1.0.0:
+proxy-from-env@^1.0.0, proxy-from-env@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==