Merge pull request #1019 from HubSpot/akb/fix-platform-version-errors

Fix error when displaying platform version errors
HubSpot · Mar 14, 2024 · 658f618 · 658f618
2 parents ae2685f + d4a7a82
commit 658f618
Show file tree

Hide file tree

Showing 7 changed files with 1,426 additions and 1,457 deletions.
diff --git a/packages/cli/commands/project/dev.js b/packages/cli/commands/project/dev.js
@@ -27,7 +27,6 @@ const {
   ensureProjectExists,
   handleProjectUpload,
   pollProjectBuildAndDeploy,
-  showPlatformVersionWarning,
   validateProjectConfig,
 } = require('../../lib/projects');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
@@ -264,8 +263,6 @@ exports.handler = async options => {
     }
 
     if (shouldCreateProject) {
-      await showPlatformVersionWarning(accountId, projectConfig);
-
       SpinniesManager.add('createProject', {
         text: i18n(`${i18nKey}.status.creatingProject`, {
           accountIdentifier: uiAccountDescription(targetAccountId),

diff --git a/packages/cli/commands/project/upload.js b/packages/cli/commands/project/upload.js
@@ -16,7 +16,6 @@ const {
   logFeedbackMessage,
   validateProjectConfig,
   pollProjectBuildAndDeploy,
-  showPlatformVersionWarning,
 } = require('../../lib/projects');
 const { i18n } = require('../../lib/lang');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
@@ -47,8 +46,6 @@ exports.handler = async options => {
 
   validateProjectConfig(projectConfig, projectDir);
 
-  await showPlatformVersionWarning(accountId, projectConfig);
-
   await ensureProjectExists(accountId, projectConfig.name, {
     forceCreate,
     uploadCommand: true,

diff --git a/packages/cli/commands/project/watch.js b/packages/cli/commands/project/watch.js
@@ -22,7 +22,6 @@ const {
   pollDeployStatus,
   validateProjectConfig,
   logFeedbackMessage,
-  showPlatformVersionWarning,
 } = require('../../lib/projects');
 const {
   cancelStagedBuild,
@@ -104,8 +103,6 @@ exports.handler = async options => {
 
   validateProjectConfig(projectConfig, projectDir);
 
-  await showPlatformVersionWarning(accountId, projectConfig);
-
   await ensureProjectExists(accountId, projectConfig.name);
 
   try {

diff --git a/packages/cli/lang/en.lyaml b/packages/cli/lang/en.lyaml
@@ -983,10 +983,6 @@ en:
         logFeedbackMessage:
           feedbackHeader: "We'd love to hear your feedback!"
           feedbackMessage: "How are you liking the new projects and developer tools? \n > Run `{{#yellow}}hs feedback{{/yellow}}` to let us know what you think!\n"
-        showPlatformVersionWarning:
-          docsLink: "Projects platform versioning (BETA)"
-          noPlatformVersion: "No platformVersion found in hsproject.json. Falling back to default version. Starting Mar 31, 2024, new project builds without a specified version will no longer be supported. To update your project to the latest version, see {{ docsLink }}."
-          deprecatedVersion: "Starting Mar 31, 2024, new project builds with platformVersion 2023.1 or unspecified versions will no longer be supported. It's recommended that you update your project to the latest version. For more info, see {{ docsLink }}."
       ui:
         betaTag: "{{#bold}}[BETA]{{/bold}}"
         betaWarning:
@@ -1357,7 +1353,7 @@ en:
         overrideErrors:
           platformVersionErrors:
             header: "Platform version update required"
-            unspecifiedPlatformVersion: "Projects with {{#bold}}unspecified platformVersion{{/bold}} are no longer supported."
+            unspecifiedPlatformVersion: "Projects with an {{#bold}}{{platformVersion}}{{/bold}} are no longer supported."
             platformVersionRetired: "Projects with {{#bold}} platformVersion {{ platformVersion }}{{/bold}} are no longer supported."
             nonExistentPlatformVersion: "Projects with {{#bold}} platformVersion {{ platformVersion }}{{/bold}} are not supported."
             updateProject: "Please update your project to the latest version and try again."

diff --git a/packages/cli/lib/errorHandlers/overrideErrors.js b/packages/cli/lib/errorHandlers/overrideErrors.js
@@ -7,13 +7,21 @@ const { uiLine, uiLink } = require('../ui');
 
 const i18nKey = 'cli.lib.errorHandlers.overrideErrors';
 
-function createPlatformVersionError(subCategory, errorData) {
-  const platformVersion = errorData.context.PLATFORM_VERSION[0];
+function createPlatformVersionError(subCategory, errData) {
   const docsLink = uiLink(
     i18n(`${i18nKey}.platformVersionErrors.docsLink`),
     'https://developers.hubspot.com/docs/platform/platform-versioning'
   );
 
+  const platformVersionKey = {
+    [PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_NOT_SPECIFIED]:
+      'unspecified platformVersion',
+    [PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_RETIRED]:
+      errData.context.RETIRED_PLATFORM_VERSION,
+    [PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_SPECIFIED_DOES_NOT_EXIST]:
+      errData.context.PLATFORM_VERSION,
+  };
+
   const errorTypeToTranslationKey = {
     [PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_NOT_SPECIFIED]:
       'unspecifiedPlatformVersion',
@@ -23,6 +31,7 @@ function createPlatformVersionError(subCategory, errorData) {
       'nonExistentPlatformVersion',
   };
 
+  const platformVersion = platformVersionKey[subCategory] || '';
   const translationKey = errorTypeToTranslationKey[subCategory];
 
   uiLine();

diff --git a/packages/cli/lib/projects.js b/packages/cli/lib/projects.js
@@ -871,32 +871,6 @@ const createProjectComponent = async (
   );
 };
 
-const showPlatformVersionWarning = async (accountId, projectConfig) => {
-  const platformVersion = projectConfig.platformVersion;
-  const docsLink = uiLink(
-    i18n(`${i18nKey}.showPlatformVersionWarning.docsLink`),
-    'https://developers.hubspot.com/docs/platform/platform-versioning'
-  );
-
-  if (!platformVersion) {
-    logger.log('');
-    logger.warn(
-      i18n(`${i18nKey}.showPlatformVersionWarning.noPlatformVersion`, {
-        docsLink,
-      })
-    );
-    logger.log('');
-  } else if (platformVersion === '2023.1') {
-    logger.log('');
-    logger.warn(
-      i18n(`${i18nKey}.showPlatformVersionWarning.deprecatedVersion`, {
-        docsLink,
-      })
-    );
-    logger.log('');
-  }
-};
-
 module.exports = {
   writeProjectConfig,
   getProjectConfig,
@@ -913,5 +887,4 @@ module.exports = {
   ensureProjectExists,
   logFeedbackMessage,
   createProjectComponent,
-  showPlatformVersionWarning,
 };