@squiz/dxp-cli-next 5.28.0-develop.3 → 5.28.0-develop.4

package/lib/migration/create/create.js

@@ -31,7 +31,7 @@ const createMigrationCommand = () => {
     })
         .action((options) => __awaiter(void 0, void 0, void 0, function* () {
         yield (0, utils_1.throwErrorIfNotLoggedIn)(createCommand);
-        let spinner = (0, ora_1.default)('Creating migration').start();
+        const spinner = (0, ora_1.default)('Creating migration').start();
         try {
             // Create migration
             const response = yield (0, utils_1.createMigration)(options);
@@ -39,8 +39,6 @@ const createMigrationCommand = () => {
                 throw new Error('Migration creation failed');
             }
             spinner.succeed('Migration created successfully');
-            // Upload file to S3
-            spinner = (0, ora_1.default)('Uploading file to S3').start();
             spinner.succeed(`Successfully created migration: ${JSON.stringify({
                 migrationId: response.assetMigration.migrationId,
                 assetId: response.assetMigration.assetId,

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

@@ -65,7 +65,6 @@ describe('createMigrationCommand', () => {
                 updated: 1234567890,
                 migrationIdAssetId: 'migration-123-asset-456',
             },
-            uploadUrl: 'https://upload.s3.amazonaws.com',
         };
         mockCreateMigration.createMigration.mockResolvedValue(mockCreateMigrationResponse);
     });

package/lib/migration/types/createMigration.types.d.ts

@@ -3,5 +3,4 @@ export interface CreateMigrationOptions extends CommonCommandOptions, Pick<Asset
 }
 export interface CreateMigrationApiResponse {
     assetMigration: AssetMigration;
-    uploadUrl: string;
 }

package/lib/migration/utils/common.d.ts

@@ -28,5 +28,4 @@ export declare function buildMigrationUrl(tenantID?: string, overrideUrl?: strin
  */
 export declare function validateAxiosStatus(status: number): boolean;
 export declare function getMigrationHeaders(tenantID?: string, isJson?: boolean): Promise<Record<string, string>>;
-export declare function uploadFileToS3(uploadUrl: string, filePath: string, tenantID?: string): Promise<string>;
 export declare function redactKey(key: string, visibleChars?: number): string;

package/lib/migration/utils/common.js

@@ -12,8 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.redactKey = exports.uploadFileToS3 = exports.getMigrationHeaders = exports.validateAxiosStatus = exports.buildMigrationUrl = exports.throwErrorIfNotLoggedIn = exports.handleCommandError = void 0;
-const fs_1 = __importDefault(require("fs"));
+exports.redactKey = exports.getMigrationHeaders = exports.validateAxiosStatus = exports.buildMigrationUrl = exports.throwErrorIfNotLoggedIn = exports.handleCommandError = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const ApplicationConfig_1 = require("../../ApplicationConfig");
 const axios_1 = __importDefault(require("axios"));
@@ -105,18 +104,6 @@ function getMigrationHeaders(tenantID, isJson = true) {
     });
 }
 exports.getMigrationHeaders = getMigrationHeaders;
-function uploadFileToS3(uploadUrl, filePath, tenantID) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const fileBuffer = fs_1.default.readFileSync(filePath);
-        const response = yield fetch(uploadUrl, {
-            method: 'PUT',
-            body: fileBuffer,
-            headers: yield getMigrationHeaders(tenantID, false),
-        });
-        return response.url;
-    });
-}
-exports.uploadFileToS3 = uploadFileToS3;
 function redactKey(key, visibleChars = 3) {
     if (!key)
         return '';

package/lib/migration/utils/common.spec.js

@@ -155,37 +155,6 @@ describe('Migration Utils', () => {
             expect(mockFetchApplicationConfig).toHaveBeenCalledWith('tenant-id');
         }));
     });
-    describe('uploadFileToS3', () => {
-        beforeEach(() => {
-            mockFs.readFileSync.mockReturnValue(Buffer.from('file content'));
-            mockFetchApplicationConfig.mockResolvedValue({
-                tenant: 'test-tenant',
-                baseUrl: 'https://example.com',
-                region: 'au',
-            });
-        });
-        it('uploads file successfully', () => __awaiter(void 0, void 0, void 0, function* () {
-            const mockResponse = {
-                url: 'https://s3.amazonaws.com/uploaded-file',
-            };
-            mockFetch.mockResolvedValue(mockResponse);
-            const result = yield (0, _1.uploadFileToS3)('https://upload.url', '/path/to/file.tar.gz', 'tenant-id');
-            expect(result).toBe('https://s3.amazonaws.com/uploaded-file');
-            expect(mockFetch).toHaveBeenCalledWith('https://upload.url', {
-                method: 'PUT',
-                body: Buffer.from('file content'),
-                headers: {
-                    'x-dxp-tenant': 'test-tenant',
-                },
-            });
-        }));
-        it('handles file read error', () => __awaiter(void 0, void 0, void 0, function* () {
-            mockFs.readFileSync.mockImplementation(() => {
-                throw new Error('File not found');
-            });
-            yield expect((0, _1.uploadFileToS3)('https://upload.url', '/nonexistent/file.tar.gz')).rejects.toThrow('File not found');
-        }));
-    });
     describe('redactKey', () => {
         it('redacts key correctly', () => {
             expect((0, _1.redactKey)('1234567890', 3)).toBe('*******890');

package/lib/migration/utils/createMigration.js

@@ -37,19 +37,15 @@ function createMigration(options) {
                 throw new Error(`Migration creation failed with status: ${response.status}`);
             }
             // Validate response structure
-            const { assetMigration, uploadUrl } = response.data || {};
+            const { assetMigration } = response.data || {};
             if (!(assetMigration === null || assetMigration === void 0 ? void 0 : assetMigration.migrationId) ||
                 !(assetMigration === null || assetMigration === void 0 ? void 0 : assetMigration.assetId) ||
                 !(assetMigration === null || assetMigration === void 0 ? void 0 : assetMigration.stage) ||
                 !(assetMigration === null || assetMigration === void 0 ? void 0 : assetMigration.status)) {
                 throw new Error('Invalid response format from migration service');
             }
-            if (!uploadUrl) {
-                throw new Error('Upload URL not found in response');
-            }
             return {
                 assetMigration,
-                uploadUrl,
             };
         }
         catch (error) {

package/lib/migration/utils/createMigration.spec.js

@@ -161,7 +161,6 @@ describe('createMigration', () => {
                             updated: 1234567890,
                             migrationIdAssetId: 'migration-123-asset-123',
                         },
-                        uploadUrl: 'https://upload.s3.amazonaws.com',
                     },
                 };
                 mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
@@ -195,27 +194,11 @@ describe('createMigration', () => {
                             stage: 'pending',
                             status: 'created',
                         },
-                        uploadUrl: 'https://upload.s3.amazonaws.com',
                     },
                 };
                 mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
                 yield expect((0, _1.createMigration)(mockOptions)).rejects.toThrow('Invalid response format from migration service');
             }));
-            it('handles missing upload URL', () => __awaiter(void 0, void 0, void 0, function* () {
-                const mockResponse = {
-                    status: 200,
-                    data: {
-                        assetMigration: {
-                            migrationId: 'migration-123',
-                            assetId: 'asset-123',
-                            stage: 'pending',
-                            status: 'created',
-                        },
-                    },
-                };
-                mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
-                yield expect((0, _1.createMigration)(mockOptions)).rejects.toThrow('Upload URL not found in response');
-            }));
             it('handles API service errors', () => __awaiter(void 0, void 0, void 0, function* () {
                 const error = new Error('Network error');
                 mockApiServiceInstance.client.post.mockRejectedValue(error);

package/package.json

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