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

package/lib/migration/create/create.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
-const fs_1 = __importDefault(require("fs"));
 const utils_1 = require("../utils");
 const createMigrationCommand = () => {
     const createCommand = new commander_1.Command('create')
@@ -25,28 +24,16 @@ const createMigrationCommand = () => {
         .addOption((0, utils_1.getParamOption)(utils_1.OptionName.PREVIEW_ASSET_ID))
         .addOption((0, utils_1.getParamOption)(utils_1.OptionName.MATRIX_URL))
         .addOption((0, utils_1.getParamOption)(utils_1.OptionName.TENANT, false))
-        .argument('<exportPath>', 'Path to the export folder (e.g., ./export)')
         .configureOutput({
         outputError(str, write) {
             write(chalk_1.default.red(str));
         },
     })
-        .action((exportPath, options) => __awaiter(void 0, void 0, void 0, function* () {
+        .action((options) => __awaiter(void 0, void 0, void 0, function* () {
         yield (0, utils_1.throwErrorIfNotLoggedIn)(createCommand);
-        let spinner = (0, ora_1.default)('Validating export folder structure').start();
+        let spinner = (0, ora_1.default)('Creating migration').start();
         try {
-            // Validate export folder structure
-            (0, utils_1.validateExportFolder)(exportPath);
-            spinner.succeed('Export folder structure validated');
-            // Create tar file
-            spinner = (0, ora_1.default)('Creating tar file from export folder').start();
-            const tarFilePath = yield (0, utils_1.createTarFile)(exportPath);
-            if (!tarFilePath) {
-                throw new Error('Tar file creation failed');
-            }
-            spinner.succeed(`Tar file created: ${tarFilePath}`);
             // Create migration
-            spinner = (0, ora_1.default)('Creating migration').start();
             const response = yield (0, utils_1.createMigration)(options);
             if (!response) {
                 throw new Error('Migration creation failed');
@@ -54,14 +41,6 @@ const createMigrationCommand = () => {
             spinner.succeed('Migration created successfully');
             // Upload file to S3
             spinner = (0, ora_1.default)('Uploading file to S3').start();
-            const uploadUrl = response.uploadUrl;
-            const s3Url = yield (0, utils_1.uploadFileToS3)(uploadUrl, tarFilePath, options.tenant);
-            if (!s3Url) {
-                throw new Error('File upload failed');
-            }
-            spinner.succeed('File uploaded to S3');
-            // Clean up tar file
-            fs_1.default.unlinkSync(tarFilePath);
             spinner.succeed(`Successfully created migration: ${JSON.stringify({
                 migrationId: response.assetMigration.migrationId,
                 assetId: response.assetMigration.assetId,

package/lib/migration/create/create.spec.js

@@ -38,17 +38,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const nock_1 = __importDefault(require("nock"));
 const create_1 = __importDefault(require("./create"));
 const utils = __importStar(require("../utils/common"));
-const ApplicationStore = __importStar(require("../../ApplicationStore"));
-const fs_1 = __importDefault(require("fs"));
 const createMigration = __importStar(require("../utils/createMigration"));
 jest.mock('../utils/common');
 jest.mock('../utils/createMigration');
-jest.mock('../../ApplicationStore');
-jest.mock('fs');
 const mockUtils = utils;
 const mockCreateMigration = createMigration;
-const mockApplicationStore = ApplicationStore;
-const mockFs = fs_1.default;
 describe('createMigrationCommand', () => {
     let logSpy;
     let mockCreateMigrationResponse;
@@ -57,12 +51,7 @@ describe('createMigrationCommand', () => {
         jest.clearAllMocks();
         jest.resetAllMocks();
         logSpy = jest.spyOn(console, 'log').mockImplementation(() => { });
-        mockApplicationStore.getApplicationFile.mockResolvedValue('session-cookie');
         mockUtils.throwErrorIfNotLoggedIn.mockResolvedValue(undefined);
-        mockCreateMigration.validateExportFolder.mockImplementation(() => { });
-        mockCreateMigration.createTarFile.mockResolvedValue('/path/to/export_123.tar.gz');
-        mockUtils.uploadFileToS3.mockResolvedValue('https://s3.amazonaws.com/uploaded-file');
-        mockFs.unlinkSync.mockImplementation(() => { });
         mockCreateMigrationResponse = {
             assetMigration: {
                 migrationId: 'migration-123',
@@ -95,23 +84,14 @@ describe('createMigrationCommand', () => {
                 'preview-456',
                 '--matrix-url',
                 'https://matrix.example.com',
-                '/path/to/export',
             ]);
             expect(mockUtils.throwErrorIfNotLoggedIn).toHaveBeenCalledWith(program);
-            expect(mockCreateMigration.validateExportFolder).toHaveBeenCalledWith('/path/to/export');
-            expect(mockCreateMigration.createTarFile).toHaveBeenCalledWith('/path/to/export');
             expect(mockCreateMigration.createMigration).toHaveBeenCalledWith({
                 assetId: 'asset-123',
                 previewAssetId: 'preview-456',
                 matrixUrl: 'https://matrix.example.com',
             });
-            expect(mockUtils.uploadFileToS3).toHaveBeenCalledWith('https://upload.s3.amazonaws.com', '/path/to/export_123.tar.gz', undefined);
-            expect(mockFs.unlinkSync).toHaveBeenCalledWith('/path/to/export_123.tar.gz');
-            expect(mockCreateMigration.validateExportFolder).toHaveBeenCalledTimes(1);
-            expect(mockCreateMigration.createTarFile).toHaveBeenCalledTimes(1);
             expect(mockCreateMigration.createMigration).toHaveBeenCalledTimes(1);
-            expect(mockUtils.uploadFileToS3).toHaveBeenCalledTimes(1);
-            expect(mockFs.unlinkSync).toHaveBeenCalledTimes(1);
             expect(mockUtils.handleCommandError).not.toHaveBeenCalled();
         }));
         it('should create migration with tenant option', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -127,7 +107,6 @@ describe('createMigrationCommand', () => {
                 'https://matrix.example.com',
                 '--tenant',
                 'test-tenant',
-                '/path/to/export',
             ]);
             expect(mockCreateMigration.createMigration).toHaveBeenCalledWith({
                 assetId: 'asset-123',
@@ -135,7 +114,6 @@ describe('createMigrationCommand', () => {
                 matrixUrl: 'https://matrix.example.com',
                 tenant: 'test-tenant',
             });
-            expect(mockUtils.uploadFileToS3).toHaveBeenCalledWith('https://upload.s3.amazonaws.com', '/path/to/export_123.tar.gz', 'test-tenant');
         }));
         it('should create migration with override URL when environment variable is set', () => __awaiter(void 0, void 0, void 0, function* () {
             const originalEnv = process.env.ENABLE_OVERRIDE_MIGRATION_URL;
@@ -152,7 +130,6 @@ describe('createMigrationCommand', () => {
                 'https://matrix.example.com',
                 '--overrideUrl',
                 'https://custom.migration.url',
-                '/path/to/export',
             ]);
             expect(mockCreateMigration.createMigration).toHaveBeenCalledWith({
                 assetId: 'asset-123',
@@ -164,46 +141,9 @@ describe('createMigrationCommand', () => {
         }));
     });
     describe('error scenarios', () => {
-        it('should handle validation error for export folder', () => __awaiter(void 0, void 0, void 0, function* () {
-            const validationError = new Error('Export folder does not exist');
-            mockCreateMigration.validateExportFolder.mockImplementation(() => {
-                throw validationError;
-            });
-            mockUtils.handleCommandError.mockImplementation(() => { });
-            const program = (0, create_1.default)();
-            yield program.parseAsync([
-                'node',
-                'dxp-cli',
-                '--asset-id',
-                'asset-123',
-                '--preview-asset-id',
-                'preview-456',
-                '--matrix-url',
-                'https://matrix.example.com',
-                '/invalid/path',
-            ]);
-            expect(mockUtils.handleCommandError).toHaveBeenCalledWith(program, validationError);
-            expect(mockCreateMigration.createTarFile).not.toHaveBeenCalled();
-        }));
-        it('should handle tar file creation failure', () => __awaiter(void 0, void 0, void 0, function* () {
-            mockCreateMigration.createTarFile.mockResolvedValue(null);
-            const program = (0, create_1.default)();
-            yield program.parseAsync([
-                'node',
-                'dxp-cli',
-                '--asset-id',
-                'asset-123',
-                '--preview-asset-id',
-                'preview-456',
-                '--matrix-url',
-                'https://matrix.example.com',
-                '/path/to/export',
-            ]);
-            expect(mockCreateMigration.createMigration).not.toHaveBeenCalled();
-            expect(mockUtils.uploadFileToS3).not.toHaveBeenCalled();
-        }));
         it('should handle migration creation failure', () => __awaiter(void 0, void 0, void 0, function* () {
             mockCreateMigration.createMigration.mockResolvedValue(null);
+            mockUtils.handleCommandError.mockImplementation(() => { });
             const program = (0, create_1.default)();
             yield program.parseAsync([
                 'node',
@@ -214,26 +154,8 @@ describe('createMigrationCommand', () => {
                 'preview-456',
                 '--matrix-url',
                 'https://matrix.example.com',
-                '/path/to/export',
-            ]);
-            expect(mockUtils.uploadFileToS3).not.toHaveBeenCalled();
-            expect(mockFs.unlinkSync).not.toHaveBeenCalled();
-        }));
-        it('should handle S3 upload failure', () => __awaiter(void 0, void 0, void 0, function* () {
-            mockUtils.uploadFileToS3.mockResolvedValue(null);
-            const program = (0, create_1.default)();
-            yield program.parseAsync([
-                'node',
-                'dxp-cli',
-                '--asset-id',
-                'asset-123',
-                '--preview-asset-id',
-                'preview-456',
-                '--matrix-url',
-                'https://matrix.example.com',
-                '/path/to/export',
             ]);
-            expect(mockFs.unlinkSync).not.toHaveBeenCalled();
+            expect(mockUtils.handleCommandError).toHaveBeenCalledWith(program, new Error('Migration creation failed'));
         }));
         it('should handle migration API error', () => __awaiter(void 0, void 0, void 0, function* () {
             const apiError = new Error('Migration API failed');
@@ -249,7 +171,6 @@ describe('createMigrationCommand', () => {
                 'preview-456',
                 '--matrix-url',
                 'https://matrix.example.com',
-                '/path/to/export',
             ]);
             expect(mockUtils.handleCommandError).toHaveBeenCalledWith(program, apiError);
         }));
@@ -268,9 +189,8 @@ describe('createMigrationCommand', () => {
                 'preview-456',
                 '--matrix-url',
                 'https://matrix.example.com',
-                '/path/to/export',
             ])).rejects.toThrow('Not logged in');
-            expect(mockCreateMigration.validateExportFolder).not.toHaveBeenCalled();
+            expect(mockCreateMigration.createMigration).not.toHaveBeenCalled();
         }));
     });
     describe('required options validation', () => {
@@ -284,7 +204,6 @@ describe('createMigrationCommand', () => {
                     'preview-456',
                     '--matrix-url',
                     'https://matrix.example.com',
-                    '/path/to/export',
                 ]);
             }).toThrow();
         });
@@ -298,7 +217,6 @@ describe('createMigrationCommand', () => {
                     'asset-123',
                     '--matrix-url',
                     'https://matrix.example.com',
-                    '/path/to/export',
                 ]);
             }).toThrow();
         });
@@ -312,22 +230,6 @@ describe('createMigrationCommand', () => {
                     'asset-123',
                     '--preview-asset-id',
                     'preview-456',
-                    '/path/to/export',
-                ]);
-            }).toThrow();
-        });
-        it('should require exportPath argument', () => {
-            const program = (0, create_1.default)().exitOverride();
-            expect(() => {
-                program.parse([
-                    'node',
-                    'dxp-cli',
-                    '--asset-id',
-                    'asset-123',
-                    '--preview-asset-id',
-                    'preview-456',
-                    '--matrix-url',
-                    'https://matrix.example.com',
                 ]);
             }).toThrow();
         });
@@ -351,7 +253,6 @@ describe('createMigrationCommand', () => {
                 'https://matrix.example.com',
                 '--tenant',
                 'test-tenant',
-                '/path/to/export',
             ]);
             const opts = program.opts();
             expect(opts.assetId).toBe('asset-123');
@@ -372,13 +273,8 @@ describe('createMigrationCommand', () => {
                 'preview-456',
                 '--matrix-url',
                 'https://matrix.example.com',
-                '/path/to/export',
             ]);
-            expect(mockCreateMigration.validateExportFolder).toHaveBeenCalledWith('/path/to/export');
-            expect(mockCreateMigration.createTarFile).toHaveBeenCalledWith('/path/to/export');
             expect(mockCreateMigration.createMigration).toHaveBeenCalled();
-            expect(mockUtils.uploadFileToS3).toHaveBeenCalled();
-            expect(mockFs.unlinkSync).toHaveBeenCalled();
         }));
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dxp-cli-next",
-  "version": "5.28.0-develop.1",
+  "version": "5.28.0-develop.2",
   "repository": {
     "url": "https://gitlab.squiz.net/dxp/dxp-cli-next"
   },