Merge pull request #500 from aws-solutions/release/v2.1.4

update to v2.1.4

Author: svozza

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project are documented in this file.
 Based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.1.4] - 2024-1-18
+
+### Fixed
+
+- Discovery Process Assumes Root Account Is Management Account [496](https://github.com/aws-solutions/workload-discovery-on-aws/issues/496)
+- Security [vulnerability](https://github.com/advisories/GHSA-jchw-25xp-jwwc) in `follow-redirects`.
+- Security [vulnerability](https://github.com/advisories/GHSA-92r3-m2mg-pj97) in `vite`.
+
 ## [2.1.3] - 2023-12-18
 
 ### Fixed

README.md

@@ -1,4 +1,4 @@
-# Workload Discovery on AWS (v2.1.3)
+# Workload Discovery on AWS (v2.1.4)
 
 Workload Discovery on AWS is a tool that quickly visualizes AWS Cloud workloads as architecture diagrams. 
 You can use the solution to build, customize, and share detailed workload visualizations based on live data from AWS. 

source/backend/discovery/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wd-discovery",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "This contains the code that forms the discovery process for AWS Perspective.",
   "main": "index.js",
   "scripts": {
@@ -20,24 +20,24 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/client-api-gateway": "3.359.0",
-    "@aws-sdk/client-cognito-identity-provider": "3.359.0",
-    "@aws-sdk/client-config-service": "3.359.0",
-    "@aws-sdk/client-dynamodb-streams": "3.359.0",
-    "@aws-sdk/client-ec2": "3.359.0",
-    "@aws-sdk/client-ecs": "3.359.0",
-    "@aws-sdk/client-eks": "3.359.0",
-    "@aws-sdk/client-elastic-load-balancing": "3.359.0",
-    "@aws-sdk/client-elastic-load-balancing-v2": "3.359.0",
-    "@aws-sdk/client-iam": "3.359.0",
-    "@aws-sdk/client-lambda": "3.359.0",
-    "@aws-sdk/client-opensearch": "3.359.0",
-    "@aws-sdk/client-organizations": "3.359.0",
-    "@aws-sdk/client-sns": "3.359.0",
-    "@aws-sdk/client-sts": "3.359.0",
-    "@aws-sdk/credential-providers": "3.359.0",
-    "@aws-sdk/util-arn-parser": "3.310.0",
-    "@smithy/util-retry": "2.0.6",
+    "@aws-sdk/client-api-gateway": "3.485.0",
+    "@aws-sdk/client-cognito-identity-provider": "3.485.0",
+    "@aws-sdk/client-config-service": "3.486.0",
+    "@aws-sdk/client-dynamodb-streams": "3.485.0",
+    "@aws-sdk/client-ec2": "3.488.0",
+    "@aws-sdk/client-ecs": "3.489.0",
+    "@aws-sdk/client-eks": "3.485.0",
+    "@aws-sdk/client-elastic-load-balancing": "3.485.0",
+    "@aws-sdk/client-elastic-load-balancing-v2": "3.485.0",
+    "@aws-sdk/client-iam": "3.489.0",
+    "@aws-sdk/client-lambda": "3.485.0",
+    "@aws-sdk/client-opensearch": "3.486.0",
+    "@aws-sdk/client-organizations": "3.485.0",
+    "@aws-sdk/client-sns": "3.485.0",
+    "@aws-sdk/client-sts": "3.489.0",
+    "@aws-sdk/credential-providers": "3.489.0",
+    "@aws-sdk/util-arn-parser": "3.465.0",
+    "@smithy/util-retry": "2.0.9",
     "@supercharge/promise-pool": "3.1.0",
     "async-retry": "1.3.3",
     "aws4": "1.12.0",
@@ -48,6 +48,7 @@
     "winston": "3.3.3"
   },
   "devDependencies": {
+    "aws-sdk-client-mock": "3.0.1",
     "chai": "^4.3.10",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",

source/backend/discovery/package.json

@@ -138,9 +138,12 @@ function createOrganizationsClient(credentials, region) {
 
     return {
         async getAllActiveAccountsFromParent(ouId) {
-            const {Roots} = await organizationsClient.listRoots({});
-            const {Id: rootId, Arn: managementAccountArn} = Roots[0];
-            const managementAccountId = parseArn(managementAccountArn).accountId;
+            const [{Roots}, {Organization}] = await Promise.all([
+                organizationsClient.listRoots({}),
+                organizationsClient.describeOrganization({})
+            ]);
+            const {Id: rootId} = Roots[0];
+            const {MasterAccountId: managementAccountId} = Organization;
 
             const accounts = await (ouId === rootId ? getAllAccounts() : getAllAccountsFromParent(ouId));
 
@@ -596,9 +599,9 @@ function createStsClient(credentials, region) {
     const CredentialsProvider = fromNodeProviderChain();
 
     return {
-        async getCredentials(role) {
+        async getCredentials(RoleArn) {
             const {Credentials} = await sts.assumeRole({
-                    RoleArn: `${role}`,
+                    RoleArn,
                     RoleSessionName: 'discovery'
                 }
             );