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

package/lib/cdp/instance/activate/activate.js

@@ -62,10 +62,11 @@ const createActivateCommand = () => {
             else {
                 apiUrl = `${scvDeployBaseUrl.dxpUrl}`;
             }
+            const headerConfig = {
+                headers: Object.assign({}, (!hasRegion && { 'x-dxp-tenant': tenant })),
+            };
             const getDeployResponse = (yield apiService.client
-                .get(apiUrl, {
-                headers: Object.assign({ 'Content-Type': 'application/json' }, (!hasRegion && { 'x-dxp-tenant': tenant })),
-            })
+                .get(apiUrl, headerConfig)
                 .catch((err) => {
                 (0, utils_1.logDebug)(`RAW ERROR: ${JSON.stringify(err)}`);
                 if (err.response && err.response.status != 404) {
@@ -77,9 +78,7 @@ const createActivateCommand = () => {
             }
             (0, utils_1.logDebug)(`PUT ${apiUrl}`);
             const activateInstanceAndDeploySchemaResponse = (yield apiService.client
-                .put(apiUrl, undefined, {
-                headers: Object.assign({ 'Content-Type': 'application/json' }, (!hasRegion && { 'x-dxp-tenant': tenant })),
-            })
+                .put(apiUrl, undefined, headerConfig)
                 .catch((err) => {
                 (0, utils_1.logDebug)(`RAW ERROR: ${JSON.stringify(err)}`);
                 if (err.response) {
@@ -90,7 +89,7 @@ const createActivateCommand = () => {
             if (activateInstanceAndDeploySchemaResponse.status === 409) {
                 throw new Error('Currently activating instance. Please try again later.');
             }
-            yield (0, utils_1.pollForDeployedSchema)(apiUrl, apiService);
+            yield (0, utils_1.pollForDeployedSchema)(apiUrl, apiService, headerConfig);
             spinner.succeed('Done!');
             console.log('');
             console.log('Your Schema has been deployed and instance has been activated.');

package/lib/cdp/instance/activate/activate.spec.js

@@ -103,9 +103,7 @@ describe('cdpInstanceCommand', () => {
             const program = (0, activate_1.default)();
             yield program.parseAsync((0, utils_1.createMockActivateArgs)(region));
             expect(mockedAxiosInstance.put).toHaveBeenCalledWith(`http://localhost:9999/__dxp/${region}/scv-deploy/${mockTenant}`, undefined, {
-                headers: {
-                    'Content-Type': 'application/json',
-                },
+                headers: {},
             });
             expect(logSpy).toHaveBeenNthCalledWith(1, '');
             expect(logSpy).toHaveBeenNthCalledWith(2, '');
@@ -139,9 +137,7 @@ describe('cdpInstanceCommand', () => {
             const program = (0, activate_1.default)();
             yield program.parseAsync((0, utils_1.createMockActivateArgs)(region));
             expect(mockedAxios.put).toHaveBeenCalledWith(`http://localhost:9999/__dxp/${region}/scv-deploy/${mockTenant}`, undefined, {
-                headers: {
-                    'Content-Type': 'application/json',
-                },
+                headers: {},
             });
             expect(errorSpy).toHaveBeenCalledWith(expect.stringContaining('Currently activating instance. Please try again later.'));
         }));
@@ -209,7 +205,6 @@ describe('cdpInstanceCommand', () => {
             yield program.parseAsync(createMockArgs());
             expect(mockedAxiosInstance.put).toHaveBeenCalledWith('http://localhost:9999/__dxp/service/scv-deploy', undefined, {
                 headers: {
-                    'Content-Type': 'application/json',
                     'x-dxp-tenant': 'myTenant',
                 },
             });
@@ -250,7 +245,6 @@ describe('cdpInstanceCommand', () => {
             yield program.parseAsync(createMockArgs());
             expect(mockedAxios.put).toHaveBeenCalledWith('http://localhost:9999/__dxp/service/scv-deploy', undefined, {
                 headers: {
-                    'Content-Type': 'application/json',
                     'x-dxp-tenant': 'myTenant',
                 },
             });

package/lib/cdp/utils.d.ts

@@ -1,4 +1,5 @@
 import { Command } from 'commander';
+import { AxiosRequestConfig } from 'axios';
 import { ApiService } from '../ApiService';
 export interface tenantDetails {
     tenantid: string;
@@ -19,4 +20,4 @@ export declare function createMockActivateArgs(region: string): Array<string>;
 /**
  * Poll the schema to be deployed.
  */
-export declare function pollForDeployedSchema(endpointUrl: string, apiService: ApiService): Promise<unknown>;
+export declare function pollForDeployedSchema(endpointUrl: string, apiService: ApiService, requestConfig?: AxiosRequestConfig | null): Promise<unknown>;

package/lib/cdp/utils.js

@@ -93,7 +93,7 @@ exports.createMockActivateArgs = createMockActivateArgs;
 /**
  * Poll the schema to be deployed.
  */
-function pollForDeployedSchema(endpointUrl, apiService) {
+function pollForDeployedSchema(endpointUrl, apiService, requestConfig = null) {
     return __awaiter(this, void 0, void 0, function* () {
         return new Promise((resolve, reject) => {
             const errHandler = (err) => {
@@ -104,7 +104,9 @@ function pollForDeployedSchema(endpointUrl, apiService) {
             }, API_TIMEOUT);
             const poll = () => __awaiter(this, void 0, void 0, function* () {
                 logDebug(`GET ${endpointUrl}`);
-                const { data, status } = yield apiService.client.get(endpointUrl);
+                const { data, status } = requestConfig
+                    ? yield apiService.client.get(endpointUrl, requestConfig)
+                    : yield apiService.client.get(endpointUrl);
                 logDebug(`Response: ${JSON.stringify(data)}`);
                 if (status !== 200) {
                     return reject(`Unexpected poll request status: ${status}`);

package/package.json

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