this can be simplified since derivedAccountID is already the id

HubSpot · Jan 10, 2025 · 5dc138b · 5dc138b
1 parent aa7a06c
commit 5dc138b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/lib/__tests__/commonOpts.test.ts b/lib/__tests__/commonOpts.test.ts
@@ -6,7 +6,6 @@ const {
 const {
   getAndLoadConfigIfNeeded,
   getAccountConfig,
-  getAccountId,
   loadConfigFromEnvironment,
 } = require('@hubspot/local-dev-lib/config');
 const { getCmsPublishMode } = require('../commonOpts');
@@ -40,7 +39,6 @@ describe('lib/commonOpts', () => {
 
     afterEach(() => {
       getAndLoadConfigIfNeeded.mockReset();
-      getAccountId.mockReset();
       getAccountConfig.mockReset();
       loadConfigFromEnvironment.mockReset();
     });
@@ -68,7 +66,6 @@ describe('lib/commonOpts', () => {
           getAndLoadConfigIfNeeded.mockReturnValue(
             configWithDefaultCmsPublishMode
           );
-          getAccountId.mockReturnValue(accounts.DEV);
           getAccountConfig.mockReturnValue(devAccountConfig);
           loadConfigFromEnvironment.mockReturnValue(undefined);
           expect(getCmsPublishMode({ account: accounts.DEV })).toBe(
@@ -81,7 +78,6 @@ describe('lib/commonOpts', () => {
           getAndLoadConfigIfNeeded.mockReturnValue(
             configWithDefaultCmsPublishMode
           );
-          getAccountId.mockReturnValue(accounts.PROD);
           getAccountConfig.mockReturnValue(prodAccountConfig);
           loadConfigFromEnvironment.mockReturnValue(undefined);
           expect(getCmsPublishMode({ account: accounts.PROD })).toBe(

diff --git a/lib/commonOpts.ts b/lib/commonOpts.ts
@@ -8,7 +8,6 @@ import {
 } from '@hubspot/local-dev-lib/constants/files';
 import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
 import {
-  getAccountId,
   getAccountConfig,
   getAndLoadConfigIfNeeded,
 } from '@hubspot/local-dev-lib/config';
@@ -114,9 +113,8 @@ export function getCmsPublishMode(
     return cmsPublishMode.toLowerCase() as CmsPublishMode;
   }
   // 2. config[account].defaultCmsPublishMode
-  const accountId = getAccountId(options.derivedAccountId);
-  if (accountId) {
-    const accountConfig = getAccountConfig(accountId);
+  if (options.derivedAccountId) {
+    const accountConfig = getAccountConfig(options.derivedAccountId);
     if (accountConfig && accountConfig.defaultCmsPublishMode) {
       return accountConfig.defaultCmsPublishMode;
     }