Merge pull request #152 from crazy-max/aws-sdk-proxy

handle proxy settings for aws-sdk
docker · Feb 17, 2022 · 6af3c11 · 6af3c11
2 parents 17f28ab + caca336
commit 6af3c11
Show file tree

Hide file tree

Showing 8 changed files with 58,064 additions and 3,350 deletions.
diff --git a/dist/bridge.js b/dist/bridge.js
diff --git a/dist/events.js b/dist/events.js
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/setup-node-sandbox.js b/dist/setup-node-sandbox.js
diff --git a/dist/setup-sandbox.js b/dist/setup-sandbox.js
diff --git a/package.json b/package.json
@@ -31,7 +31,8 @@
     "@actions/exec": "^1.1.0",
     "@actions/io": "^1.1.1",
     "@aws-sdk/client-ecr": "^3.45.0",
-    "@aws-sdk/client-ecr-public": "^3.45.0"
+    "@aws-sdk/client-ecr-public": "^3.45.0",
+    "proxy-agent": "^5.0.0"
   },
   "devDependencies": {
     "@types/jest": "^26.0.23",

diff --git a/src/aws.ts b/src/aws.ts
@@ -1,6 +1,8 @@
 import * as core from '@actions/core';
 import {ECR} from '@aws-sdk/client-ecr';
 import {ECRPUBLIC} from '@aws-sdk/client-ecr-public';
+import {NodeHttpHandler} from '@aws-sdk/node-http-handler';
+import ProxyAgent from 'proxy-agent';
 
 const ecrRegistryRegex = /^(([0-9]{12})\.dkr\.ecr\.(.+)\.amazonaws\.com(.cn)?)(\/([^:]+)(:.+)?)?$/;
 
@@ -54,6 +56,20 @@ export const getRegistriesData = async (registry: string, username?: string, pas
     authTokenRequest['registryIds'] = accountIDs;
   }
 
+  let httpProxyAgent: any = null;
+  const httpProxy = process.env.http_proxy || process.env.HTTP_PROXY || '';
+  if (httpProxy) {
+    core.debug(`Using http proxy ${httpProxy}`);
+    httpProxyAgent = new ProxyAgent(httpProxy);
+  }
+
+  let httpsProxyAgent: any = null;
+  const httpsProxy = process.env.https_proxy || process.env.HTTPS_PROXY || '';
+  if (httpsProxy) {
+    core.debug(`Using https proxy ${httpsProxy}`);
+    httpsProxyAgent = new ProxyAgent(httpsProxy);
+  }
+
   const credentials =
     username && password
       ? {
@@ -67,7 +83,11 @@ export const getRegistriesData = async (registry: string, username?: string, pas
     const ecrPublic = new ECRPUBLIC({
       customUserAgent: 'docker-login-action',
       credentials,
-      region: region
+      region: region,
+      requestHandler: new NodeHttpHandler({
+        httpAgent: httpProxyAgent,
+        httpsAgent: httpsProxyAgent
+      })
     });
     const authTokenResponse = await ecrPublic.getAuthorizationToken(authTokenRequest);
     if (!authTokenResponse.authorizationData || !authTokenResponse.authorizationData.authorizationToken) {
@@ -87,7 +107,11 @@ export const getRegistriesData = async (registry: string, username?: string, pas
     const ecr = new ECR({
       customUserAgent: 'docker-login-action',
       credentials,
-      region: region
+      region: region,
+      requestHandler: new NodeHttpHandler({
+        httpAgent: httpProxyAgent,
+        httpsAgent: httpsProxyAgent
+      })
     });
     const authTokenResponse = await ecr.getAuthorizationToken(authTokenRequest);
     if (!Array.isArray(authTokenResponse.authorizationData) || !authTokenResponse.authorizationData.length) {