From f73e7c44fdcff326439891031afb18245cd4f2f8 Mon Sep 17 00:00:00 2001 From: Allison Kemmerle Date: Tue, 1 Aug 2023 12:27:33 -0400 Subject: [PATCH 1/6] Fix error with undefined project name --- packages/cli/lib/prompts/downloadProjectPrompt.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/cli/lib/prompts/downloadProjectPrompt.js b/packages/cli/lib/prompts/downloadProjectPrompt.js index e7c09c8cc..45b5b8893 100644 --- a/packages/cli/lib/prompts/downloadProjectPrompt.js +++ b/packages/cli/lib/prompts/downloadProjectPrompt.js @@ -5,7 +5,6 @@ const { logApiErrorInstance, ApiErrorContext, } = require('@hubspot/cli-lib/errorHandlers'); -const { getProjectConfig } = require('../projects'); const { EXIT_CODES } = require('../enums/exitCodes'); const { i18n } = require('../lang'); @@ -13,14 +12,12 @@ const i18nKey = 'cli.lib.prompts.downloadProjectPrompt'; const createProjectsList = async () => { const accountId = getAccountId(); - const { projectConfig } = await getProjectConfig(); - const projectName = projectConfig.name; try { const projects = await fetchProjects(accountId); return projects.results; } catch (e) { - logApiErrorInstance(e, new ApiErrorContext({ accountId, projectName })); + logApiErrorInstance(e, new ApiErrorContext({ accountId })); process.exit(EXIT_CODES.ERROR); } }; From 89d973661e07d2eaa9c10d3ca323033777c0ef9d Mon Sep 17 00:00:00 2001 From: Allison Kemmerle Date: Tue, 1 Aug 2023 15:33:47 -0400 Subject: [PATCH 2/6] Remove unnecessary src and hsproject.json creation --- packages/cli/commands/project/download.js | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/packages/cli/commands/project/download.js b/packages/cli/commands/project/download.js index 68df607c8..d1f7c536f 100644 --- a/packages/cli/commands/project/download.js +++ b/packages/cli/commands/project/download.js @@ -17,10 +17,7 @@ const { downloadProject, fetchProjectBuilds, } = require('@hubspot/cli-lib/api/dfs'); -const { - createProjectConfig, - ensureProjectExists, -} = require('../../lib/projects'); +const { ensureProjectExists } = require('../../lib/projects'); const { loadAndValidateOptions } = require('../../lib/validation'); const { downloadProjectPrompt, @@ -63,17 +60,6 @@ exports.handler = async options => { const absoluteDestPath = dest ? path.resolve(getCwd(), dest) : getCwd(); - const projectConfigCreated = await createProjectConfig( - absoluteDestPath, - projectName, - { name: 'no-template' } - ); - - if (!projectConfigCreated) { - logger.log(i18n(`${i18nKey}.logs.downloadCancelled`)); - process.exit(EXIT_CODES.SUCCESS); - } - let buildNumberToDownload = buildNumber; if (!buildNumberToDownload) { @@ -98,10 +84,8 @@ exports.handler = async options => { await extractZipArchive( zippedProject, projectName, - path.resolve(absoluteDestPath, 'src'), - { - includesRootDir: false, - } + path.resolve(absoluteDestPath), + { includesRootDir: false } ); logger.log( From 43b0e0329dd41233514ba44696b07947183bd1f7 Mon Sep 17 00:00:00 2001 From: Allison Kemmerle Date: Tue, 1 Aug 2023 16:08:48 -0400 Subject: [PATCH 3/6] Add platform versioning --- packages/cli/commands/project/download.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/cli/commands/project/download.js b/packages/cli/commands/project/download.js index d1f7c536f..32d4f85e9 100644 --- a/packages/cli/commands/project/download.js +++ b/packages/cli/commands/project/download.js @@ -17,7 +17,7 @@ const { downloadProject, fetchProjectBuilds, } = require('@hubspot/cli-lib/api/dfs'); -const { ensureProjectExists } = require('../../lib/projects'); +const { ensureProjectExists, getProjectConfig } = require('../../lib/projects'); const { loadAndValidateOptions } = require('../../lib/validation'); const { downloadProjectPrompt, @@ -33,6 +33,12 @@ exports.describe = i18n(`${i18nKey}.describe`); exports.handler = async options => { await loadAndValidateOptions(options); + const { projectConfig } = await getProjectConfig(); + const platformVersion = + projectConfig && projectConfig.platformVersion + ? projectConfig.platformVersion + : ''; + const { project, dest, buildNumber } = options; let { project: promptedProjectName } = await downloadProjectPrompt(options); let projectName = promptedProjectName || project; @@ -78,7 +84,8 @@ exports.handler = async options => { const zippedProject = await downloadProject( accountId, projectName, - buildNumberToDownload + buildNumberToDownload, + platformVersion ); await extractZipArchive( From 6907f42236eb9b7dc011ee7d35912316902208cf Mon Sep 17 00:00:00 2001 From: Allison Kemmerle Date: Wed, 2 Aug 2023 16:37:15 -0400 Subject: [PATCH 4/6] Remove platform versioning --- packages/cli/commands/project/download.js | 12 ++++++------ packages/cli/lang/en.lyaml | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/cli/commands/project/download.js b/packages/cli/commands/project/download.js index 32d4f85e9..9cf454e99 100644 --- a/packages/cli/commands/project/download.js +++ b/packages/cli/commands/project/download.js @@ -34,10 +34,11 @@ exports.handler = async options => { await loadAndValidateOptions(options); const { projectConfig } = await getProjectConfig(); - const platformVersion = - projectConfig && projectConfig.platformVersion - ? projectConfig.platformVersion - : ''; + + if (projectConfig) { + logger.warn(i18n(`${i18nKey}.warnings.cannotDownloadWithinProject`)); + process.exit(EXIT_CODES.WARNING); + } const { project, dest, buildNumber } = options; let { project: promptedProjectName } = await downloadProjectPrompt(options); @@ -84,8 +85,7 @@ exports.handler = async options => { const zippedProject = await downloadProject( accountId, projectName, - buildNumberToDownload, - platformVersion + buildNumberToDownload ); await extractZipArchive( diff --git a/packages/cli/lang/en.lyaml b/packages/cli/lang/en.lyaml index ac67a868f..bac40bc59 100644 --- a/packages/cli/lang/en.lyaml +++ b/packages/cli/lang/en.lyaml @@ -589,6 +589,8 @@ en: errors: downloadFailed: "Something went wrong downloading the project" projectNotFound: "Your project {{ projectName }} could not be found in {{ accountId }}" + warnings: + cannotDownloadWithinProject: "Cancelling project download. Please run the command again outside the context of an existing project." options: buildNumber: describe: "The build number to download" From 430dcec47a287441b6be15336c7880e0ccb9992b Mon Sep 17 00:00:00 2001 From: Allison Kemmerle Date: Thu, 3 Aug 2023 07:09:03 -0400 Subject: [PATCH 5/6] Change warning to error message --- packages/cli/commands/project/download.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cli/commands/project/download.js b/packages/cli/commands/project/download.js index 9cf454e99..2bf5dcc5a 100644 --- a/packages/cli/commands/project/download.js +++ b/packages/cli/commands/project/download.js @@ -36,8 +36,8 @@ exports.handler = async options => { const { projectConfig } = await getProjectConfig(); if (projectConfig) { - logger.warn(i18n(`${i18nKey}.warnings.cannotDownloadWithinProject`)); - process.exit(EXIT_CODES.WARNING); + logger.error(i18n(`${i18nKey}.warnings.cannotDownloadWithinProject`)); + process.exit(EXIT_CODES.ERROR); } const { project, dest, buildNumber } = options; From dedb8d14d4b04f946dab206aa52dbd1c1273af6c Mon Sep 17 00:00:00 2001 From: Allison Kemmerle Date: Thu, 3 Aug 2023 11:00:15 -0400 Subject: [PATCH 6/6] Bump cli-lib version --- packages/cli/package.json | 2 +- packages/serverless-dev-runtime/package.json | 2 +- packages/webpack-cms-plugins/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 540495ecd..8e3cc316e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -8,7 +8,7 @@ "url": "https://github.com/HubSpot/hubspot-cms-tools" }, "dependencies": { - "@hubspot/cli-lib": "^4.2.1", + "@hubspot/cli-lib": "^4.2.2", "@hubspot/serverless-dev-runtime": "4.2.1-beta.2", "@hubspot/ui-extensions-dev-server": "^0.5.0", "archiver": "^5.3.0", diff --git a/packages/serverless-dev-runtime/package.json b/packages/serverless-dev-runtime/package.json index 183bf6bb7..8741466e3 100644 --- a/packages/serverless-dev-runtime/package.json +++ b/packages/serverless-dev-runtime/package.json @@ -6,7 +6,7 @@ "repository": "https://github.com/HubSpot/hubspot-cli", "license": "Apache-2.0", "dependencies": { - "@hubspot/cli-lib": "^4.2.1", + "@hubspot/cli-lib": "^4.2.2", "body-parser": "^1.19.0", "chalk": "^4.1.0", "chokidar": "^3.4.3", diff --git a/packages/webpack-cms-plugins/package.json b/packages/webpack-cms-plugins/package.json index 1b69ae903..9d7da3354 100644 --- a/packages/webpack-cms-plugins/package.json +++ b/packages/webpack-cms-plugins/package.json @@ -17,7 +17,7 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "dependencies": { - "@hubspot/cli-lib": "^4.2.1" + "@hubspot/cli-lib": "^4.2.2" }, "gitHead": "0659fd19cabc3645af431b177c11d0c1b089e0f8" }