@squiz/dxp-cli-next 5.26.0-develop.5 → 5.27.0-develop.1

package/lib/job-runner/job/uploadJob/uploadJob.js

@@ -12,11 +12,11 @@ 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 job_runner_lib_1 = require("@squiz/job-runner-lib");
 const chalk_1 = __importDefault(require("chalk"));
+const commander_1 = require("commander");
 const ora_1 = __importDefault(require("ora"));
 const ApiService_1 = require("../../../ApiService");
-const component_cli_lib_1 = require("@squiz/component-cli-lib");
 const utils_1 = require("../../utils");
 const createUploadJobCommand = () => {
     const uploadJobCommand = new commander_1.Command('uploadJob')
@@ -37,7 +37,8 @@ const createUploadJobCommand = () => {
                 validateStatus: utils_1.validateAxiosStatus,
                 baseUrl: yield (0, utils_1.buildJobRunnerUrl)(options.tenant, options.overrideUrl),
             });
-            yield (0, component_cli_lib_1.uploadJobFolder)(apiService.client, inputSource);
+            const jobUploadService = new job_runner_lib_1.JobUploadService();
+            yield jobUploadService.uploadJobFolder(apiService.client, inputSource);
             spinner.succeed();
             return;
         }

package/lib/migration/settings/settings.js

@@ -24,6 +24,7 @@ const setMigrationSettingsCommand = () => {
         .addOption((0, utils_1.getParamOption)(utils_1.OptionName.MATRIX_URL))
         .addOption((0, utils_1.getParamOption)(utils_1.OptionName.MATRIX_IDENTIFIER))
         .addOption((0, utils_1.getParamOption)(utils_1.OptionName.MATRIX_KEY))
+        .addOption((0, utils_1.getParamOption)(utils_1.OptionName.CONTENT_API_KEY))
         .addOption((0, utils_1.getParamOption)(utils_1.OptionName.TENANT, false))
         .configureOutput({
         outputError(str, write) {
@@ -31,6 +32,7 @@ const setMigrationSettingsCommand = () => {
         },
     })
         .action((options) => __awaiter(void 0, void 0, void 0, function* () {
+        console.log('options', options);
         const spinner = (0, ora_1.default)('Setting migration configuration...').start();
         yield (0, utils_1.throwErrorIfNotLoggedIn)(settingsCommand);
         try {

package/lib/migration/settings/settings.spec.js

@@ -65,6 +65,7 @@ describe('setMigrationSettingsCommand', () => {
             matrixUrl: 'https://matrix.example.com',
             matrixIdentifier: '@user:matrix.example.com',
             matrixKey: '***********123',
+            contentApiKey: '***********456',
         };
         mockSetMigrationSettings.setMigrationSettings.mockResolvedValue(mockSetMigrationSettingResponse);
     });
@@ -82,12 +83,15 @@ describe('setMigrationSettingsCommand', () => {
                 '@user:matrix.example.com',
                 '--matrix-key',
                 'secret-key-123',
+                '--content-api-key',
+                'content-api-key-456',
             ]);
             expect(mockUtils.throwErrorIfNotLoggedIn).toHaveBeenCalledWith(program);
             expect(mockSetMigrationSettings.setMigrationSettings).toHaveBeenCalledWith({
                 matrixUrl: 'https://matrix.example.com',
                 matrixIdentifier: '@user:matrix.example.com',
                 matrixKey: 'secret-key-123',
+                contentApiKey: 'content-api-key-456',
             });
             expect(mockSetMigrationSettings.setMigrationSettings).toHaveBeenCalledTimes(1);
             expect(mockUtils.handleCommandError).not.toHaveBeenCalled();
@@ -107,12 +111,15 @@ describe('setMigrationSettingsCommand', () => {
                 'secret-key-123',
                 '--tenant',
                 'test-tenant',
+                '--content-api-key',
+                'content-api-key-456',
             ]);
             expect(mockSetMigrationSettings.setMigrationSettings).toHaveBeenCalledWith({
                 matrixUrl: 'https://matrix.example.com',
                 matrixIdentifier: '@user:matrix.example.com',
                 matrixKey: 'secret-key-123',
                 tenant: 'test-tenant',
+                contentApiKey: 'content-api-key-456',
             });
         }));
         it('should set migration settings with override URL when environment variable is set', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -132,12 +139,15 @@ describe('setMigrationSettingsCommand', () => {
                 'secret-key-123',
                 '--overrideUrl',
                 'https://custom.migration.url',
+                '--content-api-key',
+                'content-api-key-456',
             ]);
             expect(mockSetMigrationSettings.setMigrationSettings).toHaveBeenCalledWith({
                 matrixUrl: 'https://matrix.example.com',
                 matrixIdentifier: '@user:matrix.example.com',
                 matrixKey: 'secret-key-123',
                 overrideUrl: 'https://custom.migration.url',
+                contentApiKey: 'content-api-key-456',
             });
             process.env.ENABLE_OVERRIDE_MIGRATION_URL = originalEnv;
         }));
@@ -159,6 +169,8 @@ describe('setMigrationSettingsCommand', () => {
                 '@user:matrix.example.com',
                 '--matrix-key',
                 'secret-key-123',
+                '--content-api-key',
+                'content-api-key-456',
             ]);
             expect(mockUtils.handleCommandError).toHaveBeenCalledWith(program, apiError);
         }));
@@ -178,6 +190,8 @@ describe('setMigrationSettingsCommand', () => {
                 '@user:matrix.example.com',
                 '--matrix-key',
                 'secret-key-123',
+                '--content-api-key',
+                'content-api-key-456',
             ]);
             expect(mockUtils.handleCommandError).toHaveBeenCalledWith(program, networkError);
         }));
@@ -195,6 +209,8 @@ describe('setMigrationSettingsCommand', () => {
                     '@user:matrix.example.com',
                     '--matrix-key',
                     'secret-key-123',
+                    '--content-api-key',
+                    'content-api-key-456',
                 ]);
             }).toThrow();
         });
@@ -210,6 +226,8 @@ describe('setMigrationSettingsCommand', () => {
                     'https://matrix.example.com',
                     '--matrix-key',
                     'secret-key-123',
+                    '--content-api-key',
+                    'content-api-key-456',
                 ]);
             }).toThrow();
         });
@@ -225,6 +243,8 @@ describe('setMigrationSettingsCommand', () => {
                     'https://matrix.example.com',
                     '--matrix-identifier',
                     '@user:matrix.example.com',
+                    '--content-api-key',
+                    'content-api-key-456',
                 ]);
             }).toThrow();
         });
@@ -248,6 +268,8 @@ describe('setMigrationSettingsCommand', () => {
                 '@user:matrix.example.com',
                 '--matrix-key',
                 'secret-key-123',
+                '--content-api-key',
+                'content-api-key-456',
                 '--tenant',
                 'test-tenant',
             ]);
@@ -255,6 +277,7 @@ describe('setMigrationSettingsCommand', () => {
             expect(opts.matrixUrl).toBe('https://matrix.example.com');
             expect(opts.matrixIdentifier).toBe('@user:matrix.example.com');
             expect(opts.matrixKey).toBe('secret-key-123');
+            expect(opts.contentApiKey).toBe('content-api-key-456');
             expect(opts.tenant).toBe('test-tenant');
         });
         it('should parse options with kebab-case to camelCase conversion', () => {
@@ -270,11 +293,14 @@ describe('setMigrationSettingsCommand', () => {
                 '@user:matrix.example.com',
                 '--matrix-key',
                 'secret-key-123',
+                '--content-api-key',
+                'content-api-key-456',
             ]);
             const opts = program.opts();
             expect(opts.matrixUrl).toBe('https://matrix.example.com');
             expect(opts.matrixIdentifier).toBe('@user:matrix.example.com');
             expect(opts.matrixKey).toBe('secret-key-123');
+            expect(opts.contentApiKey).toBe('content-api-key-456');
         });
     });
     afterEach(() => {

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

@@ -3,6 +3,7 @@ export interface MatrixIdentifierSchema {
     matrixUrl: string;
     matrixIdentifier: string;
     matrixKey: string;
+    contentApiKey: string;
 }
 export interface SetMigrationSettingOptions extends CommonCommandOptions, MatrixIdentifierSchema {
 }

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

@@ -6,7 +6,8 @@ export declare enum OptionName {
     TENANT = "tenant",
     MIGRATION_ID = "migration-id",
     MATRIX_IDENTIFIER = "matrix-identifier",
-    MATRIX_KEY = "matrix-key"
+    MATRIX_KEY = "matrix-key",
+    CONTENT_API_KEY = "content-api-key"
 }
 export declare const getParamOption: (param: OptionName, makeOptionMandatory?: boolean) => Option;
 export declare const addOverrideUrlOption: (command: Command) => void;

package/lib/migration/utils/options.js

@@ -11,6 +11,7 @@ var OptionName;
     OptionName["MIGRATION_ID"] = "migration-id";
     OptionName["MATRIX_IDENTIFIER"] = "matrix-identifier";
     OptionName["MATRIX_KEY"] = "matrix-key";
+    OptionName["CONTENT_API_KEY"] = "content-api-key";
 })(OptionName = exports.OptionName || (exports.OptionName = {}));
 const params = new Map([
     [
@@ -62,6 +63,13 @@ const params = new Map([
             description: 'The Asset Management API key for the Migrator API to interact with Matrix API',
         },
     ],
+    [
+        OptionName.CONTENT_API_KEY,
+        {
+            flags: '--content-api-key <string>',
+            description: 'The Content API key for the Migrator API to interact with Content API',
+        },
+    ],
 ]);
 const getParamOption = (param, makeOptionMandatory = true) => {
     const paramInfo = params.get(param);

package/lib/migration/utils/setMigrationSettings.js

@@ -23,7 +23,9 @@ function setMigrationSettings(options) {
                 matrixUrl: options.matrixUrl,
                 matrixIdentifier: options.matrixIdentifier,
                 matrixKey: options.matrixKey,
+                contentApiKey: options.contentApiKey,
             };
+            console.log('payload', payload);
             const response = yield apiService.client.post(migrationUrl, payload, {
                 headers: yield (0, _1.getMigrationHeaders)(options.tenant),
             });
@@ -39,6 +41,9 @@ function setMigrationSettings(options) {
                 matrixKey: response.data.matrixKey
                     ? (0, _1.redactKey)(response.data.matrixKey, 3)
                     : '',
+                contentApiKey: response.data.contentApiKey
+                    ? (0, _1.redactKey)(response.data.contentApiKey, 3)
+                    : '',
             };
             return responseData;
         }

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

@@ -48,6 +48,7 @@ describe('setMigrationSettings', () => {
             matrixUrl: 'https://matrix.example.com',
             matrixIdentifier: 'test-identifier',
             matrixKey: 'test-key-123',
+            contentApiKey: 'test-content-api-key-456',
         };
         mockBuildMigrationUrl.mockResolvedValue('https://migration.example.com');
         mockGetMigrationHeaders.mockResolvedValue({
@@ -63,6 +64,7 @@ describe('setMigrationSettings', () => {
                 matrixUrl: 'https://matrix.example.com',
                 matrixIdentifier: 'test-identifier',
                 matrixKey: 'test-key-123',
+                contentApiKey: 'test-content-api-key-456',
             },
         };
         mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
@@ -71,6 +73,7 @@ describe('setMigrationSettings', () => {
             matrixUrl: 'https://matrix.example.com',
             matrixIdentifier: 'test-identifier',
             matrixKey: '***123',
+            contentApiKey: '***456',
         });
         expect(mockBuildMigrationUrl).toHaveBeenCalledWith('test-tenant', undefined, 'settings');
         expect(mockGetMigrationHeaders).toHaveBeenCalledWith('test-tenant');
@@ -78,6 +81,7 @@ describe('setMigrationSettings', () => {
             matrixUrl: 'https://matrix.example.com',
             matrixIdentifier: 'test-identifier',
             matrixKey: 'test-key-123',
+            contentApiKey: 'test-content-api-key-456',
         }, {
             headers: {
                 'Content-Type': 'application/json',
@@ -94,6 +98,7 @@ describe('setMigrationSettings', () => {
                 matrixUrl: 'https://matrix.example.com',
                 matrixIdentifier: 'test-identifier',
                 matrixKey: 'test-key-123',
+                contentApiKey: 'test-content-api-key-456',
             },
         };
         mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);
@@ -132,6 +137,7 @@ describe('setMigrationSettings', () => {
                 matrixUrl: 'https://matrix.example.com',
                 matrixIdentifier: 'test-identifier',
                 matrixKey: 'test-key-123',
+                contentApiKey: 'test-content-api-key-456',
             },
         };
         mockApiServiceInstance.client.post.mockResolvedValue(mockResponse);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dxp-cli-next",
-  "version": "5.26.0-develop.5",
+  "version": "5.27.0-develop.1",
   "repository": {
     "url": "https://gitlab.squiz.net/dxp/dxp-cli-next"
   },
@@ -42,9 +42,10 @@
   "dependencies": {
     "@apidevtools/swagger-parser": "10.1.0",
     "@squiz/component-cli-lib": "1.72.12",
+    "@squiz/dx-logger-lib": "^1.65.1",
     "@squiz/dxp-porter-shared": "0.4.0",
+    "@squiz/job-runner-lib": "2.1.0",
     "@squiz/local-component-dev-ui": "0.6.20",
-    "@squiz/dx-logger-lib": "^1.65.1",
     "axios": "1.1.3",
     "cli-color": "2.0.3",
     "commander": "9.4.0",