Merge pull request actions#57 from akamai/feature/DEVPOPS-903

Feature/DEVPOPS-903
krzyk · Dec 11, 2019 · 994ae9b · 994ae9b
2 parents adeb2a0 + a98bd0e
commit 994ae9b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/cli-main.ts b/src/cli-main.ts
@@ -951,6 +951,7 @@ program
   .option('-n, --name <string>', 'Recommended to use the sandbox name provided during creation. If sandbox folder name already exists locally, custom sandbox name can be provided.')
   .action(async function(jwt, options) {
     helpExitOnNoArgs(options);
+    sandboxSvc.setAccountWide(true);
       try {
         let sandboxName;
         const decodedJwt :object= jwtDecode(jwt);
@@ -960,7 +961,7 @@ program
           sandboxName = options.name
         }
         else {
-          let sandbox = await sandboxSvc.getSandbox(sandboxId, true);
+          let sandbox = await sandboxSvc.getSandbox(sandboxId);
           sandboxName = sandbox['name'];
           console.log(`Fetched Sandbox Name : ${sandboxName} from the provided jwtToken`);
         }
@@ -976,6 +977,7 @@ program
       catch(e) {
         console.error(`Error syncing sandbox : ${e.message}`);
       }
+    sandboxSvc.setAccountWide(false);
 
   });
 

diff --git a/src/service/sandbox-svc.ts b/src/service/sandbox-svc.ts
@@ -3,6 +3,7 @@ import * as cliUtils from '../utils/cli-utils';
 import * as fs from 'fs';
 
 var accountKey: string = null;
+var accountWide: boolean = false;
 
 
 const SANDBOX_API_BASE = '/sandbox-api/v1';
@@ -11,6 +12,14 @@ export function setAccountKey(account: string) {
   accountKey = account;
 }
 
+export function setAccountWide(value: boolean) {
+  accountWide = value;
+}
+
+export function getAccountWide() {
+  return accountWide;
+}
+
 function isOkStatus(code) {
   return code >= 200 && code < 300;
 }
@@ -94,6 +103,9 @@ function putTarball(path: string, edgeworkerTarballPath) {
 }
 
 function getJson(path: string) {
+  if(accountWide) {
+    path += `?access=account`;
+  }
   return sendEdgeRequest(path, 'GET', '', {});
 }
 
@@ -132,10 +144,7 @@ export function getAllSandboxes() {
   });
 }
 
-export function getSandbox(sandboxId: string, accountWide=false) {
-  if(accountWide) {
-    return getJson(`${SANDBOX_API_BASE}/sandboxes/${sandboxId}?access=account`).then(r => r.body);
-  }
+export function getSandbox(sandboxId: string) {
   return getJson(`${SANDBOX_API_BASE}/sandboxes/${sandboxId}`).then(r => r.body);
 }