Merge pull request #266 from Cox-Automotive/json-output-clarity

Adds clarity to JSON output
Cox-Automotive · Sep 26, 2023 · 1cb2875 · 1cb2875
2 parents fd5e15a + 119c189
commit 1cb2875
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -3,7 +3,7 @@
 
 Thanks for upgrading to the latest version of the ALKS CLI!
 
-* adds optional JSON output for `alks developer accounts` command
+* updates JSON output of `alks developer accounts` to be an object indexed by accountId
 
 Have feedback? https://github.com/Cox-Automotive/ALKS-CLI/issues
 

diff --git a/e2e/test.bats b/e2e/test.bats
@@ -179,5 +179,5 @@ setup() {
 
     run alks developer accounts -o json
     [ "$status" -eq 0 ]
-    assert_output --partial "[["
+    assert_output --partial "]}}"
 }
diff --git a/src/lib/handlers/alks-developer-accounts.ts b/src/lib/handlers/alks-developer-accounts.ts
@@ -20,22 +20,22 @@ export async function handleAlksDeveloperAccounts(
   if (!contains(outputVals, output)) {
     errorAndExit(
       'The output provided (' +
-        output +
-        ') is not in the allowed values: ' +
-        outputVals.join(', ')
+      output +
+      ') is not in the allowed values: ' +
+      outputVals.join(', ')
     );
   }
   const outputObj = output == 'json'
     ? []
     : (
-    new Table({
-      head: [
-        clc.white.bold('Account'),
-        clc.white.bold('Role'),
-        clc.white.bold('Type'),
-      ],
-      colWidths: [50, 50, 25],
-    }));
+      new Table({
+        head: [
+          clc.white.bold('Account'),
+          clc.white.bold('Role'),
+          clc.white.bold('Type'),
+        ],
+        colWidths: [50, 50, 25],
+      }));
 
   const doExport = options.export;
   const accountRegex = getAccountRegex();
@@ -90,7 +90,23 @@ export async function handleAlksDeveloperAccounts(
 
     if (!doExport) {
       if (output == 'json') {
-        console.log(JSON.stringify(outputObj));
+
+        const accountsOutput: Record<string, any> = {}
+        outputObj.forEach((accountRolePair: string[]) => {
+          const accountId: string = accountRolePair[0].split('/')[0] 
+
+          if (!(accountId in accountsOutput)) {
+            accountsOutput[accountId] = {
+              accountAlias: accountRolePair[0].split('- ')[1],
+              roles: [{role: accountRolePair[1], isIamActive: accountRolePair[2] == "IAM"}]
+            }
+          } else {
+            accountsOutput[accountId].roles.push(
+              {role: accountRolePair[1], isIamActive: accountRolePair[2] == "IAM"}
+            )
+          }
+       })
+        console.log(JSON.stringify(accountsOutput));
       } else {
         console.error(clc.white.underline.bold('\nAvailable Accounts'));
         console.log(clc.white(outputObj.toString()));