Convert lib/serverlessLogs and lib/buildAccount to TS (#1337)

HubSpot · Jan 16, 2025 · c045dfb · c045dfb
1 parent e8f353f
commit c045dfb
Show file tree

Hide file tree

Showing 12 changed files with 265 additions and 263 deletions.
diff --git a/commands/logs.ts b/commands/logs.ts
@@ -61,13 +61,7 @@ const endpointLog = async (accountId, functionPath, options) => {
       }
     };
 
-    await tailLogs({
-      accountId,
-      compact,
-      tailCall,
-      fetchLatest,
-      name: functionPath,
-    });
+    await tailLogs(accountId, functionPath, fetchLatest, tailCall, compact);
   } else if (latest) {
     try {
       const { data } = await getLatestFunctionLog(accountId, functionPath);

diff --git a/commands/sandbox/create.ts b/commands/sandbox/create.ts
@@ -28,7 +28,7 @@ const {
   HUBSPOT_ACCOUNT_TYPES,
   HUBSPOT_ACCOUNT_TYPE_STRINGS,
 } = require('@hubspot/local-dev-lib/constants/config');
-const { buildNewAccount } = require('../../lib/buildAccount');
+const { buildSandbox } = require('../../lib/buildAccount');
 const {
   hubspotAccountNamePrompt,
 } = require('../../lib/prompts/accountNamePrompt');
@@ -130,13 +130,13 @@ exports.handler = async options => {
   }
 
   try {
-    const { result } = await buildNewAccount({
-      name: sandboxName,
-      accountType: sandboxType,
+    const result = await buildSandbox(
+      sandboxName,
       accountConfig,
+      sandboxType,
       env,
-      force,
-    });
+      force
+    );
 
     const sandboxAccountConfig = getAccountConfig(result.sandbox.sandboxHubId);
     // For v1 sandboxes, keep sync here. Once we migrate to v2, this will be handled by BE automatically

diff --git a/lang/en.lyaml b/lang/en.lyaml
@@ -1499,7 +1499,7 @@ en:
         missingScopeError: "Couldn't execute the {{ request }} because the access key for {{ accountName }} is missing required scopes. To update scopes, run {{ authCommand }}. Then deactivate the existing key and generate a new one that includes the missing scopes."
     serverless:
       verifyAccessKeyAndUserAccess:
-        fetchScopeDataError: "Error verifying access of scopeGroup {{ scopeGroup }}: {{ error }}"
+        fetchScopeDataError: "Error verifying access of scopeGroup {{ scopeGroup }}:"
         portalMissingScope: "Your account does not have access to this action. Talk to an account admin to request it."
         userMissingScope: "You don't have access to this action. Ask an account admin to change your permissions in Users & Teams settings."
         genericMissingScope: "Your access key does not allow this action. Please generate a new access key by running `hs auth personalaccesskey`."

diff --git a/lib/__tests__/serverlessLogs.test.ts b/lib/__tests__/serverlessLogs.test.ts
@@ -12,16 +12,10 @@ const ACCOUNT_ID = 123;
 describe('lib/serverlessLogs', () => {
   describe('tailLogs()', () => {
     let stdinMock;
-    let spinnies;
 
     beforeEach(() => {
       jest.spyOn(process, 'exit').mockImplementation(() => {});
       stdinMock = mockStdIn.stdin();
-      spinnies = {
-        succeed: jest.fn(),
-        fail: jest.fn(),
-        stopAll: jest.fn(),
-      };
     });
 
     afterEach(() => {
@@ -33,14 +27,16 @@ describe('lib/serverlessLogs', () => {
       const compact = false;
       const fetchLatest = jest.fn(() => {
         return Promise.resolve({
-          id: '1234',
-          executionTime: 510,
-          log: 'Log message',
-          error: null,
-          status: 'SUCCESS',
-          createdAt: 1620232011451,
-          memory: '70/128 MB',
-          duration: '53.40 ms',
+          data: {
+            id: '1234',
+            executionTime: 510,
+            log: 'Log message',
+            error: null,
+            status: 'SUCCESS',
+            createdAt: 1620232011451,
+            memory: '70/128 MB',
+            duration: '53.40 ms',
+          },
         });
       });
       const tailCall = jest.fn(() => {
@@ -54,13 +50,7 @@ describe('lib/serverlessLogs', () => {
         });
       });
 
-      await tailLogs({
-        accountId: ACCOUNT_ID,
-        compact,
-        spinnies,
-        fetchLatest,
-        tailCall,
-      });
+      await tailLogs(ACCOUNT_ID, 'name', fetchLatest, tailCall, compact);
       jest.runOnlyPendingTimers();
 
       expect(fetchLatest).toHaveBeenCalled();
@@ -116,13 +106,7 @@ describe('lib/serverlessLogs', () => {
         Promise.resolve({ data: latestLogResponse })
       );
 
-      await tailLogs({
-        accountId: ACCOUNT_ID,
-        compact,
-        spinnies,
-        fetchLatest,
-        tailCall,
-      });
+      await tailLogs(ACCOUNT_ID, 'name', fetchLatest, tailCall, compact);
       jest.runOnlyPendingTimers();
       expect(outputLogs).toHaveBeenCalledWith(
         latestLogResponse,
@@ -148,13 +132,7 @@ describe('lib/serverlessLogs', () => {
         )
       );
 
-      await tailLogs({
-        accountId: ACCOUNT_ID,
-        compact,
-        spinnies,
-        fetchLatest,
-        tailCall,
-      });
+      await tailLogs(ACCOUNT_ID, 'name', fetchLatest, tailCall, compact);
       jest.runOnlyPendingTimers();
       expect(tailCall).toHaveBeenCalledTimes(2);
     });