@squiz/dxp-cli-next 5.15.0-develop.1 → 5.15.0-develop.2

package/lib/porter/port/portCommand.js

@@ -0,0 +1,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const commander_1 = require("commander");
+const abort_1 = __importDefault(require("./abort/abort"));
+const get_1 = __importDefault(require("./get/get"));
+const start_1 = __importDefault(require("./start/start"));
+const createPortCommand = () => {
+    const portCommand = new commander_1.Command('port');
+    portCommand
+        .description('Porter port commands')
+        .addCommand((0, start_1.default)())
+        .addCommand((0, get_1.default)())
+        .addCommand((0, abort_1.default)());
+    return portCommand;
+};
+exports.default = createPortCommand;

package/lib/porter/port/start/start.d.ts

@@ -0,0 +1,3 @@
+import { Command } from 'commander';
+declare const createStartPortCommand: () => Command;
+export default createStartPortCommand;

package/lib/porter/port/start/start.js

@@ -0,0 +1,79 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const commander_1 = require("commander");
+const chalk_1 = __importDefault(require("chalk"));
+const promises_1 = __importDefault(require("fs/promises"));
+const path_1 = __importDefault(require("path"));
+const ora_1 = __importDefault(require("ora"));
+const ApiService_1 = require("../../../ApiService");
+const utils_1 = require("../../utils");
+const createStartPortCommand = () => {
+    const getCommand = new commander_1.Command('startPort')
+        .description('Start porting a website using the local project configuration')
+        .configureOutput({
+        outputError(str, write) {
+            write(chalk_1.default.red(str));
+        },
+    })
+        .action((options) => __awaiter(void 0, void 0, void 0, function* () {
+        yield (0, utils_1.throwErrorIfNotLoggedIn)(getCommand);
+        const baseUrl = yield (0, utils_1.buildPorterUrl)();
+        let projectName = '';
+        const spinner = (0, ora_1.default)();
+        try {
+            projectName = yield (0, utils_1.getProjectName)();
+            spinner.start('Starting port..');
+            const apiService = new ApiService_1.ApiService(utils_1.validateAxiosStatus, baseUrl);
+            // Read the stage directories for project configuration
+            const stageConfigDir = path_1.default.resolve('stage-configs');
+            const stageDirs = yield promises_1.default.readdir(stageConfigDir);
+            // Currently, skip component-transform and design-dedupe
+            const portSettings = {
+                'component-transform': { run: false },
+                'design-dedupe': { run: false },
+            };
+            // Read the config files for each stage, and construct the overall port settings
+            yield Promise.all(stageDirs.map((stage) => __awaiter(void 0, void 0, void 0, function* () {
+                const stageConfigFile = path_1.default.resolve(stageConfigDir, stage, 'config.json');
+                const stageConfig = yield promises_1.default.readFile(stageConfigFile, {
+                    encoding: 'utf-8',
+                });
+                const config = JSON.parse(stageConfig);
+                const updatedConfig = Object.assign(Object.assign({}, portSettings[stage]), config);
+                portSettings[stage] = updatedConfig;
+            })));
+            (0, utils_1.logDebug)(`Port settings to use: ${JSON.stringify(portSettings)}`);
+            const portRequest = {
+                ['stage-settings']: portSettings,
+            };
+            const response = yield apiService.client.post(`/projects/${projectName}/ports`, portRequest);
+            const jsonResponse = response.data;
+            (0, utils_1.logDebug)(JSON.stringify(jsonResponse));
+            const { portid } = jsonResponse;
+            spinner.succeed();
+            console.log('');
+            console.log(`Website porting in progress with ID: ${portid}`);
+        }
+        catch (error) {
+            (0, utils_1.logDebug)(`ERROR: ${error instanceof Error ? `${error.message}` : JSON.stringify(error)}`);
+            if (spinner.isSpinning) {
+                spinner.fail();
+            }
+            (0, utils_1.handleCommandError)(getCommand, error);
+        }
+    }));
+    return getCommand;
+};
+exports.default = createStartPortCommand;

package/lib/porter/port/start/start.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/porter/port/start/start.spec.js

@@ -0,0 +1,198 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const axios_1 = require("axios");
+const ApiService = __importStar(require("../../../ApiService"));
+const PorterUtils = __importStar(require("../../utils"));
+const fsp = __importStar(require("fs/promises"));
+// const logSpy = jest.spyOn(global.console, 'log');
+jest.mock('../../utils');
+jest.mock('fs/promises');
+describe('startPort', () => {
+    let projectName;
+    let portId;
+    let baseUrl;
+    let mockHandleCommandError;
+    let mockHandleError;
+    let mockBuildPorterUrl;
+    let mockResponse;
+    let mockClient;
+    beforeEach(() => {
+        jest.resetAllMocks();
+        jest.clearAllMocks();
+        projectName = 'mock-project';
+        portId = '1234-5678-1234-5678';
+        baseUrl = 'mock-url';
+        mockHandleCommandError = jest.fn(() => Promise.resolve());
+        mockHandleError = jest.fn();
+        mockBuildPorterUrl = jest.fn(() => Promise.resolve(baseUrl));
+        mockResponse = {
+            data: {},
+            status: 200,
+        };
+        mockClient = {
+            post: jest.fn().mockImplementationOnce(() => mockResponse),
+        };
+        jest.spyOn(PorterUtils, 'throwErrorIfNotLoggedIn').mockImplementation();
+        jest
+            .spyOn(PorterUtils, 'buildPorterUrl')
+            .mockImplementationOnce(mockBuildPorterUrl);
+        jest
+            .spyOn(PorterUtils, 'getProjectName')
+            .mockImplementation(() => Promise.resolve(projectName));
+        jest
+            .spyOn(fsp, 'readdir')
+            .mockImplementationOnce(() => Promise.resolve([
+            'crawl',
+            'index',
+            'template-dedupe',
+            'validation',
+            'report',
+        ]));
+        jest
+            .spyOn(fsp, 'readFile')
+            .mockImplementation(() => Promise.resolve(JSON.stringify({ run: true })));
+        jest
+            .spyOn(PorterUtils, 'handleCommandError')
+            .mockImplementationOnce(mockHandleCommandError);
+        jest
+            .spyOn(PorterUtils, 'handleError')
+            .mockImplementationOnce(mockHandleError);
+        jest.spyOn(process, 'exit').mockImplementation();
+        jest.spyOn(ApiService, 'ApiService').mockImplementationOnce(() => {
+            return {
+                client: mockClient,
+            };
+        });
+    });
+    it('should throw an error if not logged in', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockError = new Error('Error not logged in');
+        jest
+            .spyOn(PorterUtils, 'throwErrorIfNotLoggedIn')
+            .mockImplementationOnce(() => {
+            throw mockError;
+        });
+        const { default: createStartCommand } = require('./start');
+        const program = createStartCommand();
+        yield expect(() => program.parseAsync(['port', 'startPort', portId])).rejects.toThrow(mockError);
+        const opts = program.opts();
+        expect(opts).toStrictEqual({});
+        expect(PorterUtils.buildPorterUrl).not.toHaveBeenCalled();
+    }));
+    it('should throw an error if project name could not be found', () => __awaiter(void 0, void 0, void 0, function* () {
+        jest.spyOn(PorterUtils, 'getProjectName').mockImplementationOnce(() => {
+            throw new Error();
+        });
+        const { default: createStartCommand } = require('./start');
+        const program = createStartCommand();
+        yield program.parseAsync(['port', 'startPort', portId]);
+        expect(PorterUtils.buildPorterUrl).toHaveBeenCalled();
+        expect(mockClient.post).not.toHaveBeenCalled();
+        expect(PorterUtils.handleCommandError).toHaveBeenCalled();
+    }));
+    it('should handle errors reading stage config files', () => __awaiter(void 0, void 0, void 0, function* () {
+        jest
+            .spyOn(fsp, 'readdir')
+            .mockReset()
+            .mockImplementationOnce(() => {
+            throw new Error('ENOENT: no such file or directory');
+        });
+        const { default: createStartCommand } = require('./start');
+        const program = createStartCommand();
+        yield program.parseAsync(['port', 'startPort', portId]);
+        expect(PorterUtils.buildPorterUrl).toHaveBeenCalled();
+        expect(mockClient.post).not.toHaveBeenCalled();
+        expect(PorterUtils.handleCommandError).toHaveBeenCalled();
+    }));
+    it('should handle 400 error from the porter service', () => __awaiter(void 0, void 0, void 0, function* () {
+        mockClient.post = jest.fn(() => {
+            throw new axios_1.AxiosError('Bad request', '400', undefined, undefined, {
+                data: {
+                    status: 400,
+                    title: 'Bad request',
+                    'invalid-params': [
+                        { name: 'crawl.run', reason: 'crawl.run is required in the body' },
+                    ],
+                },
+            });
+        });
+        const { default: createStartCommand } = require('./start');
+        const program = createStartCommand();
+        yield program.parseAsync(['port', 'startPort', portId]);
+        expect(PorterUtils.buildPorterUrl).toHaveBeenCalled();
+        expect(mockClient.post).toHaveBeenCalled();
+        expect(PorterUtils.handleCommandError).toHaveBeenCalled();
+    }));
+    it('should handle unexpected errors', () => __awaiter(void 0, void 0, void 0, function* () {
+        mockClient.post = jest.fn(() => {
+            throw new axios_1.AxiosError('Internal server error', '500', undefined, undefined, {
+                data: { status: 500 },
+            });
+        });
+        const { default: createStartCommand } = require('./start');
+        const program = createStartCommand();
+        yield program.parseAsync(['port', 'startPort', portId]);
+        expect(PorterUtils.buildPorterUrl).toHaveBeenCalled();
+        expect(mockClient.post).toHaveBeenCalled();
+        expect(PorterUtils.handleError).not.toHaveBeenCalled();
+        expect(PorterUtils.handleCommandError).toHaveBeenCalled();
+    }));
+    it('should successfully start a website port and log to the console', () => __awaiter(void 0, void 0, void 0, function* () {
+        const uuid = '1234-1234-1234-1234';
+        const mockPostResponse = {
+            portid: uuid,
+        };
+        mockResponse = {
+            data: mockPostResponse,
+            status: 200,
+        };
+        const { default: createStartCommand } = require('./start');
+        const program = createStartCommand();
+        yield program.parseAsync(['port', 'startPort', portId]);
+        expect(PorterUtils.buildPorterUrl).toHaveBeenCalled();
+        expect(mockClient.post).toHaveBeenCalledWith(`/projects/${projectName}/ports`, {
+            'stage-settings': {
+                crawl: { run: true },
+                index: { run: true },
+                'component-transform': { run: false },
+                'design-dedupe': { run: false },
+                'template-dedupe': { run: true },
+                validation: { run: true },
+                report: { run: true },
+            },
+        });
+        expect(PorterUtils.handleError).not.toHaveBeenCalled();
+        expect(PorterUtils.handleCommandError).not.toHaveBeenCalled();
+    }));
+});

package/lib/porter/project/add/add.spec.js

@@ -35,14 +35,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const nock_1 = __importDefault(require("nock"));
 const commander_1 = require("commander");
 const promises_1 = __importDefault(require("fs/promises"));
 const axios_1 = require("axios");
 const ApiService = __importStar(require("../../../ApiService"));
-const BuildPorterUrl = __importStar(require("../../utils/BuildPorterUrl/BuildPorterUrl"));
-const ErrorUtils = __importStar(require("../../utils/ErrorUtils/ErrorUtils"));
-const DoesPathExist = __importStar(require("../../utils/DoesPathExist/DoesPathExist"));
+const PorterUtils = __importStar(require("../../utils"));
 const mockCliVersion = '1.2.3';
 jest.mock('../../../../package.json', () => {
     return {
@@ -57,6 +54,7 @@ jest.mock('fs/promises', () => {
         writeFile: jest.fn(),
     };
 });
+jest.mock('../../utils');
 describe('addProject', () => {
     let projectName;
     let projectPath;
@@ -69,7 +67,6 @@ describe('addProject', () => {
     beforeEach(() => {
         jest.resetAllMocks();
         jest.clearAllMocks();
-        nock_1.default.restore();
         projectName = 'porter-project';
         projectPath = 'tmp/project-dir';
         baseUrl = 'mock-url';
@@ -83,14 +80,18 @@ describe('addProject', () => {
         mockClient = {
             put: jest.fn().mockImplementationOnce(() => mockResponse),
         };
+        jest.spyOn(PorterUtils, 'throwErrorIfNotLoggedIn').mockImplementation();
         jest
-            .spyOn(BuildPorterUrl, 'buildPorterUrl')
+            .spyOn(PorterUtils, 'doesPathExist')
+            .mockImplementationOnce(() => Promise.resolve(false));
+        jest
+            .spyOn(PorterUtils, 'buildPorterUrl')
             .mockImplementationOnce(mockBuildPorterUrl);
         jest
-            .spyOn(ErrorUtils, 'handleCommandError')
+            .spyOn(PorterUtils, 'handleCommandError')
             .mockImplementationOnce(mockHandleCommandError);
         jest
-            .spyOn(ErrorUtils, 'handleError')
+            .spyOn(PorterUtils, 'handleError')
             .mockImplementationOnce(mockHandleError);
         jest.spyOn(process, 'exit').mockImplementation();
         jest.spyOn(ApiService, 'ApiService').mockImplementationOnce(() => {
@@ -105,8 +106,6 @@ describe('addProject', () => {
         const { default: createAddCommand } = require('./add');
         const program = createAddCommand();
         yield expect(() => program.parseAsync([
-            'dxp-next',
-            'porter',
             'project',
             'addProject',
             '--project-name',
@@ -119,18 +118,13 @@ describe('addProject', () => {
     it('should throw an error if not logged in', () => __awaiter(void 0, void 0, void 0, function* () {
         const mockError = new Error('Error not logged in');
         jest
-            .spyOn(ErrorUtils, 'throwErrorIfNotLoggedIn')
+            .spyOn(PorterUtils, 'throwErrorIfNotLoggedIn')
             .mockImplementationOnce(() => {
             throw mockError;
         });
-        (0, nock_1.default)('http://localhost:9999')
-            .get('/__dxp/au/porter/SquizRoot-0000/health')
-            .reply(401);
         const { default: createAddCommand } = require('./add');
         const program = createAddCommand();
         yield expect(() => program.parseAsync([
-            'dxp-next',
-            'porter',
             'project',
             'addProject',
             '--project-name',
@@ -141,23 +135,16 @@ describe('addProject', () => {
         const opts = program.opts();
         expect(opts.projectName).toEqual(projectName);
         expect(opts.path).toEqual(projectPath);
-        expect(BuildPorterUrl.buildPorterUrl).not.toHaveBeenCalled();
+        expect(PorterUtils.buildPorterUrl).not.toHaveBeenCalled();
     }));
     it('should throw an error if project directory already exists', () => __awaiter(void 0, void 0, void 0, function* () {
         jest
-            .spyOn(ErrorUtils, 'throwErrorIfNotLoggedIn')
-            .mockImplementationOnce(() => Promise.resolve(undefined));
-        jest
-            .spyOn(DoesPathExist, 'doesPathExist')
+            .spyOn(PorterUtils, 'doesPathExist')
+            .mockReset()
             .mockImplementationOnce(() => Promise.resolve(true));
-        (0, nock_1.default)('http://localhost:9999')
-            .get('/__dxp/au/porter/SquizRoot-0000/health')
-            .reply(200);
         const { default: createAddCommand } = require('./add');
         const program = createAddCommand();
         yield program.parseAsync([
-            'dxp-next',
-            'porter',
             'project',
             'addProject',
             '--project-name',
@@ -168,28 +155,18 @@ describe('addProject', () => {
         const opts = program.opts();
         expect(opts.projectName).toEqual(projectName);
         expect(opts.path).toEqual(projectPath);
-        expect(BuildPorterUrl.buildPorterUrl).toHaveBeenCalled();
-        expect(DoesPathExist.doesPathExist).toHaveBeenCalled();
-        expect(ErrorUtils.handleCommandError).toHaveBeenCalled();
+        expect(PorterUtils.buildPorterUrl).toHaveBeenCalled();
+        expect(PorterUtils.doesPathExist).toHaveBeenCalled();
+        expect(mockClient.put).not.toHaveBeenCalled();
+        expect(PorterUtils.handleCommandError).toHaveBeenCalled();
     }));
     it('should throw an error if parent directory does not exist', () => __awaiter(void 0, void 0, void 0, function* () {
-        jest
-            .spyOn(ErrorUtils, 'throwErrorIfNotLoggedIn')
-            .mockImplementationOnce(() => Promise.resolve(undefined));
-        jest
-            .spyOn(DoesPathExist, 'doesPathExist')
-            .mockImplementationOnce(() => Promise.resolve(false));
         jest.spyOn(promises_1.default, 'access').mockImplementationOnce(() => {
             throw new Error();
         });
-        (0, nock_1.default)('http://localhost:9999')
-            .get('/__dxp/au/porter/SquizRoot-0000/health')
-            .reply(200);
         const { default: createAddCommand } = require('./add');
         const program = createAddCommand();
         yield program.parseAsync([
-            'dxp-next',
-            'porter',
             'project',
             'addProject',
             '--project-name',
@@ -200,31 +177,21 @@ describe('addProject', () => {
         const opts = program.opts();
         expect(opts.projectName).toEqual(projectName);
         expect(opts.path).toEqual(projectPath);
-        expect(BuildPorterUrl.buildPorterUrl).toHaveBeenCalled();
-        expect(DoesPathExist.doesPathExist).toHaveBeenCalled();
+        expect(PorterUtils.buildPorterUrl).toHaveBeenCalled();
+        expect(PorterUtils.doesPathExist).toHaveBeenCalled();
         expect(promises_1.default.access).toHaveBeenCalled();
-        expect(ErrorUtils.handleCommandError).toHaveBeenCalled();
+        expect(mockClient.put).not.toHaveBeenCalled();
+        expect(PorterUtils.handleCommandError).toHaveBeenCalled();
     }));
     it('should clean up the directory if project already exists', () => __awaiter(void 0, void 0, void 0, function* () {
-        jest
-            .spyOn(ErrorUtils, 'throwErrorIfNotLoggedIn')
-            .mockImplementationOnce(() => Promise.resolve(undefined));
-        jest
-            .spyOn(DoesPathExist, 'doesPathExist')
-            .mockImplementationOnce(() => Promise.resolve(false));
         mockClient.put = jest.fn(() => {
             throw new axios_1.AxiosError('Project already exists', '409', undefined, undefined, {
                 data: { status: 409 },
             });
         });
-        (0, nock_1.default)('http://localhost:9999')
-            .get('/__dxp/au/porter/SquizRoot-0000/health')
-            .reply(200);
         const { default: createAddCommand } = require('./add');
         const program = createAddCommand();
         yield program.parseAsync([
-            'dxp-next',
-            'porter',
             'project',
             'addProject',
             '--project-name',
@@ -235,8 +202,8 @@ describe('addProject', () => {
         const opts = program.opts();
         expect(opts.projectName).toEqual(projectName);
         expect(opts.path).toEqual(projectPath);
-        expect(BuildPorterUrl.buildPorterUrl).toHaveBeenCalled();
-        expect(DoesPathExist.doesPathExist).toHaveBeenCalled();
+        expect(PorterUtils.buildPorterUrl).toHaveBeenCalled();
+        expect(PorterUtils.doesPathExist).toHaveBeenCalled();
         expect(promises_1.default.access).toHaveBeenCalled();
         // Create project dir, create "stage-configs" directory, create directories for (crawl, index, template-dedupe, validation, report)
         expect(promises_1.default.mkdir).toHaveBeenCalledTimes(7);
@@ -245,24 +212,13 @@ describe('addProject', () => {
         expect(promises_1.default.writeFile).toHaveBeenNthCalledWith(1, expect.any(String), expect.stringContaining(mockCliVersion));
         expect(mockClient.put).toHaveBeenCalled();
         expect(promises_1.default.rm).toHaveBeenCalled();
-        expect(ErrorUtils.handleError).toHaveBeenCalled();
-        expect(ErrorUtils.handleCommandError).not.toHaveBeenCalled();
+        expect(PorterUtils.handleError).toHaveBeenCalled();
+        expect(PorterUtils.handleCommandError).not.toHaveBeenCalled();
     }));
     it('should handle unexpected errors', () => __awaiter(void 0, void 0, void 0, function* () {
-        jest
-            .spyOn(ErrorUtils, 'throwErrorIfNotLoggedIn')
-            .mockImplementationOnce(() => Promise.resolve(undefined));
-        jest
-            .spyOn(DoesPathExist, 'doesPathExist')
-            .mockImplementationOnce(() => Promise.resolve(false));
-        (0, nock_1.default)('http://localhost:9999')
-            .get('/__dxp/au/porter/SquizRoot-0000/health')
-            .reply(200);
         const { default: createAddCommand } = require('./add');
         const program = createAddCommand();
         yield program.parseAsync([
-            'dxp-next',
-            'porter',
             'project',
             'addProject',
             '--project-name',
@@ -273,8 +229,8 @@ describe('addProject', () => {
         const opts = program.opts();
         expect(opts.projectName).toEqual(projectName);
         expect(opts.path).toEqual(projectPath);
-        expect(BuildPorterUrl.buildPorterUrl).toHaveBeenCalled();
-        expect(DoesPathExist.doesPathExist).toHaveBeenCalled();
+        expect(PorterUtils.buildPorterUrl).toHaveBeenCalled();
+        expect(PorterUtils.doesPathExist).toHaveBeenCalled();
         expect(promises_1.default.access).toHaveBeenCalled();
         // Create project dir, create "stage-configs" directory, create directories for (crawl, index, template-dedupe, validation, report)
         expect(promises_1.default.mkdir).toHaveBeenCalledTimes(7);
@@ -282,26 +238,12 @@ describe('addProject', () => {
         expect(promises_1.default.writeFile).toHaveBeenCalledTimes(6);
         expect(promises_1.default.writeFile).toHaveBeenNthCalledWith(1, expect.any(String), expect.stringContaining(mockCliVersion));
         expect(mockClient.put).toHaveBeenCalled();
-        expect(ErrorUtils.handleCommandError).not.toHaveBeenCalled();
+        expect(PorterUtils.handleCommandError).not.toHaveBeenCalled();
     }));
     it('should successfully initialise the project directory and the porter project', () => __awaiter(void 0, void 0, void 0, function* () {
-        jest
-            .spyOn(ErrorUtils, 'throwErrorIfNotLoggedIn')
-            .mockImplementationOnce(() => Promise.resolve(undefined));
-        jest
-            .spyOn(DoesPathExist, 'doesPathExist')
-            .mockImplementationOnce(() => Promise.resolve(false));
-        jest.spyOn(promises_1.default, 'mkdir').mockImplementationOnce(() => {
-            throw new Error('mock error');
-        });
-        (0, nock_1.default)('http://localhost:9999')
-            .get('/__dxp/au/porter/SquizRoot-0000/health')
-            .reply(200);
         const { default: createAddCommand } = require('./add');
         const program = createAddCommand();
         yield program.parseAsync([
-            'dxp-next',
-            'porter',
             'project',
             'addProject',
             '--project-name',
@@ -312,12 +254,17 @@ describe('addProject', () => {
         const opts = program.opts();
         expect(opts.projectName).toEqual(projectName);
         expect(opts.path).toEqual(projectPath);
-        expect(BuildPorterUrl.buildPorterUrl).toHaveBeenCalled();
-        expect(DoesPathExist.doesPathExist).toHaveBeenCalled();
+        expect(PorterUtils.buildPorterUrl).toHaveBeenCalled();
+        expect(PorterUtils.doesPathExist).toHaveBeenCalled();
         expect(promises_1.default.access).toHaveBeenCalled();
-        expect(promises_1.default.mkdir).toHaveBeenCalledTimes(1);
-        expect(promises_1.default.writeFile).not.toHaveBeenCalled();
-        expect(mockClient.put).not.toHaveBeenCalled();
-        expect(ErrorUtils.handleCommandError).toHaveBeenCalled();
+        // Create project dir, create "stage-configs" directory, create directories for (crawl, index, template-dedupe, validation, report)
+        expect(promises_1.default.mkdir).toHaveBeenCalledTimes(7);
+        // Create project config.json as well as 5 example config.json (for each stage)
+        expect(promises_1.default.writeFile).toHaveBeenCalledTimes(6);
+        expect(promises_1.default.writeFile).toHaveBeenNthCalledWith(1, expect.any(String), expect.stringContaining(mockCliVersion));
+        expect(mockClient.put).toHaveBeenCalled();
+        expect(promises_1.default.rm).not.toHaveBeenCalled();
+        expect(PorterUtils.handleError).not.toHaveBeenCalled();
+        expect(PorterUtils.handleCommandError).not.toHaveBeenCalled();
     }));
 });

package/lib/porter/project/get/get.js

@@ -17,7 +17,6 @@ const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
 const ApiService_1 = require("../../../ApiService");
 const utils_1 = require("../../utils");
-const constants_1 = require("../../constants");
 const createGetProjectCommand = () => {
     const getCommand = new commander_1.Command('getProject')
         .description('Retrieves the project')
@@ -33,21 +32,17 @@ const createGetProjectCommand = () => {
         let projectName = '';
         const spinner = (0, ora_1.default)();
         try {
-            const projectConfig = yield (0, utils_1.getProjectConfig)();
-            projectName = projectConfig.projectName;
-            if (!projectName) {
-                throw new Error(constants_1.PORTER_ERRORS.projectNameMissing);
-            }
+            projectName = yield (0, utils_1.getProjectName)();
             spinner.start('Retrieving project..');
             const apiService = new ApiService_1.ApiService(utils_1.validateAxiosStatus, baseUrl);
             const response = yield apiService.client.get(`/projects/${projectName}`);
             const jsonResponse = response.data;
-            (0, utils_1.logDebug)(jsonResponse);
+            (0, utils_1.logDebug)(JSON.stringify(jsonResponse));
             spinner.succeed();
             console.log('');
             console.log(`Project name: ${projectName}`);
-            console.log(`Download last port report: ${jsonResponse['report-link'] || 'Not generated'}`);
-            console.log(`Download last port artifacts: ${jsonResponse['artifacts-link'] || 'Not generated'}`);
+            console.log(`Download last port report: ${jsonResponse['last-report-link'] || 'Not generated'}`);
+            console.log(`Download last port artifacts: ${jsonResponse['last-artifacts-link'] || 'Not generated'}`);
         }
         catch (error) {
             (0, utils_1.logDebug)(`ERROR: ${error instanceof Error ? `${error.message}` : JSON.stringify(error)}`);