Merge pull request #281 from aochsner/feature/update-aws-sdk-v3

aws-azure-login · Aug 9, 2023 · e9c955d · e9c955d
2 parents c327530 + 1d32bab
commit e9c955d
Show file tree

Hide file tree

Showing 3 changed files with 714 additions and 121 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,8 @@
     "test": "yarn eslint && yarn prettier:check"
   },
   "dependencies": {
-    "aws-sdk": "^2.1120.0",
+    "@aws-sdk/client-sts": "^3.328.0",
+    "@aws-sdk/node-http-handler": "^3.328.0",
     "bluebird": "^3.7.2",
     "cheerio": "^1.0.0-rc.10",
     "commander": "^9.2.0",

diff --git a/src/login.ts b/src/login.ts
@@ -2,7 +2,7 @@ import _ from "lodash";
 import Bluebird from "bluebird";
 import inquirer, { QuestionCollection, Question } from "inquirer";
 import zlib from "zlib";
-import AWS from "aws-sdk";
+import { STS, STSClientConfig } from "@aws-sdk/client-sts";
 import cheerio from "cheerio";
 import { v4 } from "uuid";
 import puppeteer, { HTTPRequest } from "puppeteer";
@@ -11,9 +11,10 @@ import _debug from "debug";
 import { CLIError } from "./CLIError";
 import { awsConfig, ProfileConfig } from "./awsConfig";
 import proxy from "proxy-agent";
-import https from "https";
 import { paths } from "./paths";
 import mkdirp from "mkdirp";
+import { Agent } from "https";
+import { NodeHttpHandler } from "@aws-sdk/node-http-handler";
 
 const debug = _debug("aws-azure-login");
 
@@ -1010,50 +1011,52 @@ export const login = {
     region: string | undefined
   ): Promise<void> {
     console.log(`Assuming role ${role.roleArn}`);
+    let stsOptions: STSClientConfig = {};
     if (process.env.https_proxy) {
-      AWS.config.update({
-        httpOptions: {
-          agent: proxy(process.env.https_proxy),
-        },
-      });
+      stsOptions = {
+        ...stsOptions,
+        requestHandler: new NodeHttpHandler({
+          httpsAgent: proxy(process.env.https_proxy),
+        }),
+      };
     }
 
     if (awsNoVerifySsl) {
-      AWS.config.update({
-        httpOptions: {
-          agent: new https.Agent({
+      stsOptions = {
+        ...stsOptions,
+        requestHandler: new NodeHttpHandler({
+          httpsAgent: new Agent({
             rejectUnauthorized: false,
           }),
-        },
-      });
+        }),
+      };
     }
 
     if (region) {
-      AWS.config.update({
+      stsOptions = {
+        ...stsOptions,
         region,
-      });
+      };
     }
 
-    const sts = new AWS.STS();
-    const res = await sts
-      .assumeRoleWithSAML({
-        PrincipalArn: role.principalArn,
-        RoleArn: role.roleArn,
-        SAMLAssertion: assertion,
-        DurationSeconds: Math.round(durationHours * 60 * 60),
-      })
-      .promise();
+    const sts = new STS(stsOptions);
+    const res = await sts.assumeRoleWithSAML({
+      PrincipalArn: role.principalArn,
+      RoleArn: role.roleArn,
+      SAMLAssertion: assertion,
+      DurationSeconds: Math.round(durationHours * 60 * 60),
+    });
 
     if (!res.Credentials) {
       debug("Unable to get security credentials from AWS");
       return;
     }
 
     await awsConfig.setProfileCredentialsAsync(profileName, {
-      aws_access_key_id: res.Credentials.AccessKeyId,
-      aws_secret_access_key: res.Credentials.SecretAccessKey,
-      aws_session_token: res.Credentials.SessionToken,
-      aws_expiration: res.Credentials.Expiration.toISOString(),
+      aws_access_key_id: res.Credentials.AccessKeyId ?? "",
+      aws_secret_access_key: res.Credentials.SecretAccessKey ?? "",
+      aws_session_token: res.Credentials.SessionToken ?? "",
+      aws_expiration: res.Credentials.Expiration?.toISOString() ?? "",
     });
   },
 };