Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor hs project download (Other half in cli-lib) #907

Merged
merged 6 commits into from
Aug 3, 2023
Merged

Refactor hs project download (Other half in cli-lib) #907

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f73e7c4
Fix error with undefined project name
kemmerle Aug 1, 2023
89d9736
Remove unnecessary src and hsproject.json creation
kemmerle Aug 1, 2023
43b0e03
Add platform versioning
kemmerle Aug 1, 2023
6907f42
Remove platform versioning
kemmerle Aug 2, 2023
430dcec
Change warning to error message
kemmerle Aug 3, 2023
dedb8d1
Bump cli-lib version
kemmerle Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 11 additions & 20 deletions packages/cli/commands/project/download.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ const {
downloadProject,
fetchProjectBuilds,
} = require('@hubspot/cli-lib/api/dfs');
const {
createProjectConfig,
ensureProjectExists,
} = require('../../lib/projects');
const { ensureProjectExists, getProjectConfig } = require('../../lib/projects');
const { loadAndValidateOptions } = require('../../lib/validation');
const {
downloadProjectPrompt,
Expand All @@ -36,6 +33,12 @@ exports.describe = i18n(`${i18nKey}.describe`);
exports.handler = async options => {
await loadAndValidateOptions(options);

const { projectConfig } = await getProjectConfig();
kemmerle marked this conversation as resolved.
Show resolved Hide resolved
const platformVersion =
projectConfig && projectConfig.platformVersion
? projectConfig.platformVersion
: '';

const { project, dest, buildNumber } = options;
let { project: promptedProjectName } = await downloadProjectPrompt(options);
let projectName = promptedProjectName || project;
Expand Down Expand Up @@ -63,17 +66,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) {
Expand All @@ -92,16 +84,15 @@ exports.handler = async options => {
const zippedProject = await downloadProject(
accountId,
projectName,
buildNumberToDownload
buildNumberToDownload,
platformVersion
kemmerle marked this conversation as resolved.
Show resolved Hide resolved
);

await extractZipArchive(
zippedProject,
projectName,
path.resolve(absoluteDestPath, 'src'),
{
includesRootDir: false,
}
path.resolve(absoluteDestPath),
{ includesRootDir: false }
);

logger.log(
Expand Down
5 changes: 1 addition & 4 deletions packages/cli/lib/prompts/downloadProjectPrompt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,19 @@ const {
logApiErrorInstance,
ApiErrorContext,
} = require('@hubspot/cli-lib/errorHandlers');
const { getProjectConfig } = require('../projects');
const { EXIT_CODES } = require('../enums/exitCodes');
const { i18n } = require('../lang');

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);
}
};
Expand Down