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

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,34 +202,25 @@ 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);
-        // Create project config.json as well as 5 example config.json (for each stage)
-        expect(promises_1.default.writeFile).toHaveBeenCalledTimes(6);
+        // Create project dir, create "stage-configs" directory, create directories for (crawl, index, template-dedupe, report)
+        // But validation stage is not created (PERSONIZE-771)
+        expect(promises_1.default.mkdir).toHaveBeenCalledTimes(6);
+        // Create project config.json as well as 4 example config.json (for each stage)
+        // But validation stage is not created (PERSONIZE-771)
+        expect(promises_1.default.writeFile).toHaveBeenCalledTimes(5);
         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,35 +231,23 @@ 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);
-        // Create project config.json as well as 5 example config.json (for each stage)
-        expect(promises_1.default.writeFile).toHaveBeenCalledTimes(6);
+        // But validation stage is not created (PERSONIZE-771)
+        expect(promises_1.default.mkdir).toHaveBeenCalledTimes(6);
+        // Create project config.json as well as 4 example config.json (for each stage)
+        // But validation stage is not created (PERSONIZE-771)
+        expect(promises_1.default.writeFile).toHaveBeenCalledTimes(5);
         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 +258,19 @@ 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)
+        // But validation stage is not created (PERSONIZE-771)
+        expect(promises_1.default.mkdir).toHaveBeenCalledTimes(6);
+        // Create project config.json as well as 4 example config.json (for each stage)
+        // But validation stage is not created (PERSONIZE-771)
+        expect(promises_1.default.writeFile).toHaveBeenCalledTimes(5);
+        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)}`);

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

@@ -31,22 +31,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 nock_1 = __importDefault(require("nock"));
-const get_1 = __importDefault(require("./get"));
 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 GetProjectConfig = __importStar(require("../../utils/GetProjectConfig/GetProjectConfig"));
+const PorterUtils = __importStar(require("../../utils"));
 const logSpy = jest.spyOn(global.console, 'log');
+jest.mock('../../utils');
 describe('getProject', () => {
     let baseUrl;
     let projectName;
-    let projectConfig;
     let mockHandleCommandError;
     let mockHandleError;
     let mockBuildPorterUrl;
@@ -55,14 +48,8 @@ describe('getProject', () => {
     beforeEach(() => {
         jest.resetAllMocks();
         jest.clearAllMocks();
-        nock_1.default.restore();
         projectName = 'porter-project';
         baseUrl = 'mock-url';
-        projectConfig = {
-            service: 'dxp-porter',
-            projectName,
-            version: '0.1.0',
-        };
         mockHandleCommandError = jest.fn(() => Promise.resolve());
         mockHandleError = jest.fn();
         mockBuildPorterUrl = jest.fn(() => Promise.resolve(baseUrl));
@@ -73,14 +60,18 @@ describe('getProject', () => {
         mockClient = {
             get: jest.fn().mockImplementationOnce(() => mockResponse),
         };
+        jest.spyOn(PorterUtils, 'throwErrorIfNotLoggedIn').mockImplementation();
+        jest
+            .spyOn(PorterUtils, 'getProjectName')
+            .mockImplementationOnce(() => Promise.resolve(projectName));
         jest
-            .spyOn(BuildPorterUrl, 'buildPorterUrl')
+            .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(() => {
@@ -92,47 +83,34 @@ describe('getProject', () => {
     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')
-            .mockImplementationOnce(() => {
+            .spyOn(PorterUtils, 'throwErrorIfNotLoggedIn')
+            .mockImplementation(() => {
             throw mockError;
         });
-        (0, nock_1.default)('http://localhost:9999')
-            .get('/__dxp/au/porter/SquizRoot-0000/health')
-            .reply(401);
-        const program = (0, get_1.default)();
-        yield expect(() => program.parseAsync(['dxp-next', 'porter', 'project', 'getProject'])).rejects.toThrow(mockError);
+        const { default: createGetCommand } = require('./get');
+        const program = createGetCommand();
+        yield expect(() => program.parseAsync(['project', 'getProject'])).rejects.toThrow(mockError);
         const opts = program.opts();
         expect(opts).toStrictEqual({});
+        expect(PorterUtils.throwErrorIfNotLoggedIn).toHaveBeenCalled();
+        expect(PorterUtils.buildPorterUrl).not.toHaveBeenCalled();
     }));
-    it('should throw an error if not in a project directory', () => __awaiter(void 0, void 0, void 0, function* () {
-        jest.spyOn(ErrorUtils, 'throwErrorIfNotLoggedIn').mockImplementation();
+    it('should throw an error if project name could not be found', () => __awaiter(void 0, void 0, void 0, function* () {
         jest
-            .spyOn(GetProjectConfig, 'getProjectConfig')
-            .mockImplementationOnce(() => {
-            throw new Error('You must be within a porter project directory to use this command');
+            .spyOn(PorterUtils, 'getProjectName')
+            .mockReset()
+            .mockImplementation(() => {
+            throw new Error();
         });
         const { default: createGetCommand } = require('./get');
         const program = createGetCommand();
         yield program.parseAsync(['dxp-next', 'porter', 'project', 'getProject']);
-        expect(BuildPorterUrl.buildPorterUrl).toHaveBeenCalled();
-        expect(ErrorUtils.handleCommandError).toHaveBeenCalled();
-    }));
-    it('should throw an error if project name is missing in the config.json file', () => __awaiter(void 0, void 0, void 0, function* () {
-        jest.spyOn(ErrorUtils, 'throwErrorIfNotLoggedIn').mockImplementation();
-        jest
-            .spyOn(GetProjectConfig, 'getProjectConfig')
-            .mockImplementationOnce(() => Promise.resolve(Object.assign(Object.assign({}, projectConfig), { projectName: '' })));
-        const { default: createGetCommand } = require('./get');
-        const program = createGetCommand();
-        yield program.parseAsync(['dxp-next', 'porter', 'project', 'getProject']);
-        expect(BuildPorterUrl.buildPorterUrl).toHaveBeenCalled();
-        expect(ErrorUtils.handleCommandError).toHaveBeenCalled();
+        expect(PorterUtils.throwErrorIfNotLoggedIn).toHaveBeenCalled();
+        expect(PorterUtils.buildPorterUrl).toHaveBeenCalled();
+        expect(mockClient.get).not.toHaveBeenCalled();
+        expect(PorterUtils.handleCommandError).toHaveBeenCalled();
     }));
     it('should throw an error if the project does not exist in the cloud', () => __awaiter(void 0, void 0, void 0, function* () {
-        jest.spyOn(ErrorUtils, 'throwErrorIfNotLoggedIn').mockImplementation();
-        jest
-            .spyOn(GetProjectConfig, 'getProjectConfig')
-            .mockImplementationOnce(() => Promise.resolve(projectConfig));
         mockClient.get = jest.fn(() => {
             throw new axios_1.AxiosError('Project does not exist', '404', undefined, undefined, {
                 data: { status: 404 },
@@ -140,16 +118,13 @@ describe('getProject', () => {
         });
         const { default: createGetCommand } = require('./get');
         const program = createGetCommand();
-        yield program.parseAsync(['dxp-next', 'porter', 'project', 'getProject']);
-        expect(BuildPorterUrl.buildPorterUrl).toHaveBeenCalled();
+        yield program.parseAsync(['project', 'getProject']);
+        expect(PorterUtils.throwErrorIfNotLoggedIn).toHaveBeenCalled();
+        expect(PorterUtils.buildPorterUrl).toHaveBeenCalled();
         expect(mockClient.get).toHaveBeenCalled();
-        expect(ErrorUtils.handleError).toHaveBeenCalled();
+        expect(PorterUtils.handleError).toHaveBeenCalled();
     }));
     it('should handle unexpected errors', () => __awaiter(void 0, void 0, void 0, function* () {
-        jest.spyOn(ErrorUtils, 'throwErrorIfNotLoggedIn').mockImplementation();
-        jest
-            .spyOn(GetProjectConfig, 'getProjectConfig')
-            .mockImplementationOnce(() => Promise.resolve(projectConfig));
         mockClient.get = jest.fn(() => {
             throw new axios_1.AxiosError('Internal server error', '500', undefined, undefined, {
                 data: { status: 500 },
@@ -157,23 +132,17 @@ describe('getProject', () => {
         });
         const { default: createGetCommand } = require('./get');
         const program = createGetCommand();
-        yield program.parseAsync(['dxp-next', 'porter', 'project', 'getProject']);
-        expect(BuildPorterUrl.buildPorterUrl).toHaveBeenCalled();
+        yield program.parseAsync(['project', 'getProject']);
+        expect(PorterUtils.throwErrorIfNotLoggedIn).toHaveBeenCalled();
+        expect(PorterUtils.buildPorterUrl).toHaveBeenCalled();
         expect(mockClient.get).toHaveBeenCalled();
-        expect(ErrorUtils.handleCommandError).toHaveBeenCalled();
+        expect(PorterUtils.handleCommandError).toHaveBeenCalled();
     }));
     it('should successfully retrieve the project details (without generated links) and log this to the console', () => __awaiter(void 0, void 0, void 0, function* () {
-        jest.spyOn(ErrorUtils, 'throwErrorIfNotLoggedIn').mockImplementation();
-        jest
-            .spyOn(GetProjectConfig, 'getProjectConfig')
-            .mockImplementationOnce(() => Promise.resolve(projectConfig));
         const mockGetResponse = {
-            portid: '1234-5678-abcd-efgh',
-            stages: {},
-            status: {},
-            'artifacts-link': null,
-            'report-link': null,
-            'stage-settings': {},
+            projectid: projectName,
+            'last-artifacts-link': null,
+            'last-report-link': null,
         };
         mockResponse = {
             data: mockGetResponse,
@@ -181,28 +150,22 @@ describe('getProject', () => {
         };
         const { default: createGetCommand } = require('./get');
         const program = createGetCommand();
-        yield program.parseAsync(['dxp-next', 'porter', 'project', 'getProject']);
-        expect(BuildPorterUrl.buildPorterUrl).toHaveBeenCalled();
+        yield program.parseAsync(['project', 'getProject']);
+        expect(PorterUtils.throwErrorIfNotLoggedIn).toHaveBeenCalled();
+        expect(PorterUtils.buildPorterUrl).toHaveBeenCalled();
         expect(mockClient.get).toHaveBeenCalled();
-        expect(ErrorUtils.handleCommandError).not.toHaveBeenCalled();
+        expect(PorterUtils.handleCommandError).not.toHaveBeenCalled();
         expect(logSpy).toHaveBeenNthCalledWith(2, `Project name: ${projectName}`);
         expect(logSpy).toHaveBeenNthCalledWith(3, 'Download last port report: Not generated');
         expect(logSpy).toHaveBeenNthCalledWith(4, 'Download last port artifacts: Not generated');
     }));
     it('should successfully retrieve the project details and log this to the console', () => __awaiter(void 0, void 0, void 0, function* () {
-        jest.spyOn(ErrorUtils, 'throwErrorIfNotLoggedIn').mockImplementation();
-        jest
-            .spyOn(GetProjectConfig, 'getProjectConfig')
-            .mockImplementationOnce(() => Promise.resolve(projectConfig));
         const mockReportLink = 'mock-report-link';
         const mockArtifactsLink = 'mock-artifacts-link';
         const mockGetResponse = {
-            portid: '1234-5678-abcd-efgh',
-            stages: {},
-            status: {},
-            'artifacts-link': mockArtifactsLink,
-            'report-link': mockReportLink,
-            'stage-settings': {},
+            projectid: '1234-5678-abcd-efgh',
+            'last-artifacts-link': mockArtifactsLink,
+            'last-report-link': mockReportLink,
         };
         mockResponse = {
             data: mockGetResponse,
@@ -210,10 +173,11 @@ describe('getProject', () => {
         };
         const { default: createGetCommand } = require('./get');
         const program = createGetCommand();
-        yield program.parseAsync(['dxp-next', 'porter', 'project', 'getProject']);
-        expect(BuildPorterUrl.buildPorterUrl).toHaveBeenCalled();
+        yield program.parseAsync(['project', 'getProject']);
+        expect(PorterUtils.throwErrorIfNotLoggedIn).toHaveBeenCalled();
+        expect(PorterUtils.buildPorterUrl).toHaveBeenCalled();
         expect(mockClient.get).toHaveBeenCalled();
-        expect(ErrorUtils.handleCommandError).not.toHaveBeenCalled();
+        expect(PorterUtils.handleCommandError).not.toHaveBeenCalled();
         expect(logSpy).toHaveBeenNthCalledWith(2, `Project name: ${projectName}`);
         expect(logSpy).toHaveBeenNthCalledWith(3, `Download last port report: ${mockReportLink}`);
         expect(logSpy).toHaveBeenNthCalledWith(4, `Download last port artifacts: ${mockArtifactsLink}`);

package/lib/porter/project/projectCommand.js

@@ -11,8 +11,8 @@ const createProjectCommand = () => {
     const projectCommand = new commander_1.Command('project');
     projectCommand
         .description('Porter project commands')
-        .addCommand((0, get_1.default)())
         .addCommand((0, add_1.default)())
+        .addCommand((0, get_1.default)())
         .addCommand((0, remove_1.default)());
     return projectCommand;
 };

package/lib/porter/project/remove/remove.js

@@ -18,7 +18,6 @@ const inquirer_1 = require("inquirer");
 const ora_1 = __importDefault(require("ora"));
 const ApiService_1 = require("../../../ApiService");
 const utils_1 = require("../../utils");
-const constants_1 = require("../../constants");
 const createRemoveProjectCommand = () => {
     const removeCommand = new commander_1.Command('removeProject')
         .description('Deletes the project')
@@ -34,11 +33,7 @@ const createRemoveProjectCommand = () => {
         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)();
             const confirmation = yield (0, inquirer_1.prompt)({
                 message: `Are you sure you wish to remove all data about the project "${projectName}" from the cloud permanently? [y/N]`,
                 name: 'answer',