@celonis/content-cli 0.5.5 → 0.6.1

package/content/manager/widget-sourcemaps.manager.js

@@ -18,6 +18,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.WidgetSourcemapsManager = void 0;
     const child_process_1 = require("child_process");
     const logger_1 = require("../../util/logger");
     const base_manager_1 = require("./base.manager");
@@ -44,7 +45,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                         "--disable-git",
                     ];
                     const datadogCommandLine = [...commandLines, "--minified-path-prefix=/package-manager/"].join(" ");
-                    child_process_1.exec(datadogCommandLine, (error, stdout) => {
+                    (0, child_process_1.exec)(datadogCommandLine, (error, stdout) => {
                         var _a;
                         if (error) {
                             logger_1.logger.error(new logger_1.GracefulError(error.message));
@@ -54,7 +55,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                         }
                         if (process.env.AWS_ACCESS_KEY_ID_CDN && process.env.AWS_SECRET_ACCESS_KEY_CDN) {
                             try {
-                                const uploadSourcemapsStdout = child_process_1.execSync([
+                                const uploadSourcemapsStdout = (0, child_process_1.execSync)([
                                     ...commandLines,
                                     `--minified-path-prefix=https://static.celonis.cloud/static/package-manager/`,
                                 ].join(" "));

package/content/manager/widget.manager.js

@@ -4,12 +4,14 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "./base.manager"], factory);
+        define(["require", "exports", "./base.manager", "form-data"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.WidgetManager = void 0;
     const base_manager_1 = require("./base.manager");
+    const FormData = require("form-data");
     class WidgetManager extends base_manager_1.BaseManager {
         constructor() {
             super(...arguments);
@@ -49,11 +51,9 @@
             };
         }
         getBody() {
-            return {
-                formData: {
-                    file: this.content,
-                },
-            };
+            const formData = new FormData();
+            formData.append("file", this.content);
+            return formData;
         }
         getSerializedFileContent(data) {
             return data;

package/content-cli-export.js

@@ -18,6 +18,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.Export = void 0;
     const commander = require("commander");
     const package_command_1 = require("./commands/package.command");
     const logger_1 = require("./util/logger");

package/content-cli-import.js

@@ -18,6 +18,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.Import = void 0;
     const commander = require("commander");
     const package_command_1 = require("./commands/package.command");
     const data_pool_command_1 = require("./commands/data-pool.command");

package/content-cli-list.js

@@ -18,6 +18,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.List = void 0;
     const package_command_1 = require("./commands/package.command");
     const space_command_1 = require("./commands/space.command");
     const data_pool_command_1 = require("./commands/data-pool.command");

package/content-cli-push.js

@@ -104,7 +104,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 if (process.env.AWS_ACCESS_KEY_ID_CDN && process.env.AWS_SECRET_ACCESS_KEY_CDN) {
                     try {
                         const dir = path.resolve(process.cwd());
-                        const pushToS3stdout = child_process_1.execSync(`aws s3 cp ${dir} s3://celonis-static-origin/static/package-manager/ --recursive --exclude="*.map" --exclude="*.yaml" --profile default`).toString("utf-8");
+                        const pushToS3stdout = (0, child_process_1.execSync)(`aws s3 cp ${dir} s3://celonis-static-origin/static/package-manager/ --recursive --exclude="*.map" --exclude="*.yaml" --profile default`).toString("utf-8");
                         logger_1.logger.info(pushToS3stdout);
                     }
                     catch (error) {

package/interfaces/package-manager.interfaces.js

@@ -9,11 +9,12 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.PackageManagerVariableType = void 0;
     var PackageManagerVariableType;
     (function (PackageManagerVariableType) {
         PackageManagerVariableType["DATA_MODEL"] = "DATA_MODEL";
         PackageManagerVariableType["CONNECTION"] = "CONNECTION";
         PackageManagerVariableType["ASSIGNMENT_RULE"] = "ASSIGNMENT_RULE";
         PackageManagerVariableType["PLAIN_TEXT"] = "PLAIN_TEXT";
-    })(PackageManagerVariableType = exports.PackageManagerVariableType || (exports.PackageManagerVariableType = {}));
+    })(PackageManagerVariableType || (exports.PackageManagerVariableType = PackageManagerVariableType = {}));
 });

package/interfaces/profile.interface.js

@@ -9,6 +9,7 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.AuthenticationType = void 0;
     // tslint:disable-next-line:variable-name
     exports.AuthenticationType = {
         BEARER: "Bearer",

package/lib/content-cli-list.d.ts

@@ -1,5 +1,5 @@
 import commander = require("commander");
-declare type CommanderStatic = commander.CommanderStatic;
+type CommanderStatic = commander.CommanderStatic;
 export declare class List {
     static packages(program: CommanderStatic): CommanderStatic;
     static spaces(program: CommanderStatic): CommanderStatic;

package/lib/interfaces/data-pool-manager.interfaces.d.ts

@@ -1,5 +1,5 @@
 export declare type DataPoolStatus = "CANCEL" | "FAIL" | "QUEUED" | "RUNNING" | "SKIPPED" | "SUCCESS" | "UNCONFIGURED";
-export declare type Tag = {};
+export type Tag = {};
 export declare class DataSourceSlimTransport {
     id: string;
     name: string;

package/lib/interfaces/profile.interface.d.ts

@@ -4,7 +4,7 @@ export interface Profile {
     apiToken: string;
     authenticationType: AuthenticationType;
 }
-export declare type AuthenticationType = "Bearer" | "AppKey";
+export type AuthenticationType = "Bearer" | "AppKey";
 export declare const AuthenticationType: {
     [key: string]: AuthenticationType;
 };

package/lib/services/http-client-service.v2.d.ts

@@ -7,12 +7,10 @@ declare class HttpClientServiceV2 {
     downloadFile(url: string): Promise<any>;
     private handleResponseStreamData;
     private resolveUrl;
-    private makeFileDownloadOptions;
     private handleResponse;
+    private handleError;
     private checkBadRequest;
     private handleBadRequest;
-    private makeOptions;
-    private makeOptionsJson;
     private buildHeaders;
     private buildAuthorizationHeaders;
 }

package/lib/services/http-client.service.d.ts

@@ -1,15 +1,14 @@
 import { Profile } from "../interfaces/profile.interface";
 export declare class HttpClientService {
-    pushData(url: string, profile: Profile, body: object): Promise<any>;
+    pushData(url: string, profile: Profile, body: any): Promise<any>;
     pullData(url: string, profile: Profile): Promise<any>;
     pullFileData(url: string, profile: Profile): Promise<any>;
     updateData(url: string, profile: Profile, body: object): Promise<any>;
     findAll(url: string, profile: Profile): Promise<any>;
-    private makeOptions;
-    private makeFileDownloadOptions;
     private buildAuthorizationHeaders;
     private handleResponseStreamData;
     private handleResponse;
+    private handleError;
     private checkBadRequest;
     private handleBadRequest;
 }

package/lib/validators/profile.validator.d.ts

@@ -1,5 +1,5 @@
 import { Profile } from "../interfaces/profile.interface";
 export declare class ProfileValidator {
     static validateProfile(profile: Profile): Promise<any>;
-    private static parseBody;
+    private static tryAuthenticationType;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celonis/content-cli",
-  "version": "0.5.5",
+  "version": "0.6.1",
   "description": "CLI Tool to help manage content in Celonis EMS",
   "main": "content-cli.js",
   "bin": {
@@ -11,29 +11,33 @@
   "homepage": "https://github.com/celonis/content-cli",
   "scripts": {
     "build": "./node_modules/.bin/tsc && cp package.json dist/package.json",
-    "lint": "tslint -p ."
+    "lint": "tslint -p .",
+    "test": "jest"
   },
   "dependencies": {
     "@datadog/datadog-ci": "^0.17.12",
     "adm-zip": "^0.4.14",
+    "axios": "1.6.2",
     "commander": "^6.0.0",
-    "request": "^2.88.0",
-    "request-promise-native": "^1.0.5",
+    "form-data": "4.0.0",
     "semver": "^7.3.2",
     "valid-url": "^1.0.9",
     "winston": "^3.1.0",
-    "yaml": "2.0.0-8"
+    "yaml": "2.2.2"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.4.34",
-    "@types/node": "^16.11.19",
-    "@types/request": "~2.48.1",
+    "@types/jest": "29.5.11",
+    "@types/node": "20.10.4",
+    "jest": "29.7.0",
     "lint-staged": "^9.5.0",
     "prettier": "^1.19.1",
+    "ts-jest": "29.1.1",
+    "ts-node": "10.9.2",
     "tslint": "^5.20.1",
     "tslint-config-prettier": "^1.18.0",
     "tslint-consistent-codestyle": "^1.16.0",
-    "typescript": "~3.8.0"
+    "typescript": "5.3.3"
   },
   "lint-staged": {
     "src/**/*.ts": [

package/services/connection/connection.service.js

@@ -18,6 +18,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.connectionService = void 0;
     const data_pool_api_1 = require("../../api/data-pool-api");
     const logger_1 = require("../../util/logger");
     class ConnectionService {

package/services/content.service.js

@@ -18,6 +18,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.ContentService = void 0;
     const profile_service_1 = require("./profile.service");
     const logger_1 = require("../util/logger");
     class ContentService {

package/services/context.service.js

@@ -18,6 +18,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.contextService = void 0;
     const profile_service_1 = require("./profile.service");
     class ContextService {
         getContext() {

package/services/data-pool/data-pool-service.js

@@ -18,6 +18,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.dataPoolService = void 0;
     const data_pool_api_1 = require("../../api/data-pool-api");
     const logger_1 = require("../../util/logger");
     const uuid_1 = require("uuid");
@@ -29,7 +30,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 const importReport = yield data_pool_api_1.dataPoolApi.executeDataPoolsBatchImport(requestFileContent);
                 const importReportString = JSON.stringify(importReport, null, 4);
                 if (outputToJsonFile) {
-                    const reportFileName = "batch_import_report_" + uuid_1.v4() + ".json";
+                    const reportFileName = "batch_import_report_" + (0, uuid_1.v4)() + ".json";
                     file_service_1.fileService.writeToFileWithGivenName(importReportString, reportFileName);
                     logger_1.logger.info("Batch import report file: " + reportFileName);
                 }
@@ -43,7 +44,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 const exportedDataPool = yield data_pool_api_1.dataPoolApi.exportDataPool(poolId);
                 const exportedDataPoolString = JSON.stringify(exportedDataPool, null, 4);
                 if (outputToJsonFile) {
-                    const reportFileName = uuid_1.v4() + "_data_pool_" + poolId + ".json";
+                    const reportFileName = (0, uuid_1.v4)() + "_data_pool_" + poolId + ".json";
                     file_service_1.fileService.writeToFileWithGivenName(exportedDataPoolString, reportFileName);
                     logger_1.logger.info(file_service_1.FileService.fileDownloadedMessage + reportFileName);
                 }
@@ -79,7 +80,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             });
         }
         exportListOfPools(nodes) {
-            const filename = uuid_1.v4() + ".json";
+            const filename = (0, uuid_1.v4)() + ".json";
             file_service_1.fileService.writeToFileWithGivenName(JSON.stringify(nodes), filename);
             logger_1.logger.info(file_service_1.FileService.fileDownloadedMessage + filename);
         }

package/services/file-service.js

@@ -18,6 +18,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.fileService = exports.FileService = void 0;
     const fs = require("fs");
     const path = require("path");
     const logger_1 = require("../util/logger");
@@ -32,7 +33,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             fs.mkdirSync(path.resolve(process.cwd(), dirName));
         }
         readManifestFile(importedFileName) {
-            const manifest = yaml_1.parse(fs.readFileSync(path.resolve(importedFileName + "/manifest.yml"), { encoding: "utf-8" }));
+            const manifest = (0, yaml_1.parse)(fs.readFileSync(path.resolve(importedFileName + "/manifest.yml"), { encoding: "utf-8" }));
             return Promise.all(manifest);
         }
         readFileToJson(fileName) {

package/services/http-client-service.v2.js

@@ -13,24 +13,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "../interfaces/profile.interface", "request", "./context.service", "../util/logger", "querystring", "../util/tracing", "../util/version"], factory);
+        define(["require", "exports", "../interfaces/profile.interface", "./context.service", "../util/logger", "../util/tracing", "../util/version", "axios", "form-data"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.httpClientV2 = void 0;
     const profile_interface_1 = require("../interfaces/profile.interface");
-    const request = require("request");
     const context_service_1 = require("./context.service");
     const logger_1 = require("../util/logger");
-    const querystring = require("querystring");
     const tracing_1 = require("../util/tracing");
     const version_1 = require("../util/version");
+    const axios_1 = require("axios");
+    const FormData = require("form-data");
     class HttpClientServiceV2 {
         get(url) {
             return __awaiter(this, void 0, void 0, function* () {
                 return new Promise((resolve, reject) => {
-                    request.get(this.resolveUrl(url), this.makeOptions(context_service_1.contextService.getContext().profile, null), (err, res) => {
-                        this.handleResponse(res, resolve, reject);
+                    axios_1.default.get(this.resolveUrl(url), {
+                        headers: this.buildHeaders(context_service_1.contextService.getContext().profile)
+                    }).then(response => {
+                        this.handleResponse(response, resolve, reject);
+                    }).catch(err => {
+                        this.handleError(err, resolve, reject);
                     });
                 }).catch(e => {
                     throw new logger_1.FatalError(e);
@@ -40,8 +45,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         postFile(url, body, parameters) {
             return __awaiter(this, void 0, void 0, function* () {
                 return new Promise((resolve, reject) => {
-                    request.post(this.resolveUrl(url) + "?" + querystring.stringify(parameters), this.makeOptions(context_service_1.contextService.getContext().profile, body), (err, res) => {
-                        this.handleResponse(res, resolve, reject);
+                    const formData = new FormData();
+                    formData.append("package", body.formData.package);
+                    axios_1.default.post(this.resolveUrl(url), formData, {
+                        headers: Object.assign(Object.assign({}, this.buildHeaders(context_service_1.contextService.getContext().profile, "multipart/form-data")), formData.getHeaders()),
+                        params: parameters
+                    }).then(response => {
+                        this.handleResponse(response, resolve, reject);
+                    }).catch(err => {
+                        this.handleError(err, resolve, reject);
                     });
                 }).catch(e => {
                     throw new logger_1.FatalError(e);
@@ -51,8 +63,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         post(url, body) {
             return __awaiter(this, void 0, void 0, function* () {
                 return new Promise((resolve, reject) => {
-                    request.post(this.resolveUrl(url), this.makeOptionsJson(context_service_1.contextService.getContext().profile, typeof body === "string" || body instanceof String ? body : JSON.stringify(body), "application/json;charset=utf-8"), (err, res) => {
-                        this.handleResponse(res, resolve, reject);
+                    axios_1.default.post(this.resolveUrl(url), typeof body === "string" || body instanceof String ? body : JSON.stringify(body), {
+                        headers: this.buildHeaders(context_service_1.contextService.getContext().profile, "application/json;charset=utf-8")
+                    }).then(response => {
+                        this.handleResponse(response, resolve, reject);
+                    }).catch(err => {
+                        this.handleError(err, resolve, reject);
                     });
                 }).catch(e => {
                     throw new logger_1.FatalError(e);
@@ -62,8 +78,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         put(url, body) {
             return __awaiter(this, void 0, void 0, function* () {
                 return new Promise((resolve, reject) => {
-                    request.put(this.resolveUrl(url), this.makeOptionsJson(context_service_1.contextService.getContext().profile, JSON.stringify(body), "application/json;charset=utf-8"), (err, res) => {
-                        this.handleResponse(res, resolve, reject);
+                    axios_1.default.put(this.resolveUrl(url), JSON.stringify(body), {
+                        headers: this.buildHeaders(context_service_1.contextService.getContext().profile, "application/json;charset=utf-8")
+                    }).then(response => {
+                        this.handleResponse(response, resolve, reject);
+                    }).catch(err => {
+                        this.handleError(err, resolve, reject);
                     });
                 }).catch(e => {
                     throw new logger_1.FatalError(e);
@@ -73,8 +93,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         delete(url) {
             return __awaiter(this, void 0, void 0, function* () {
                 return new Promise((resolve, reject) => {
-                    request.delete(this.resolveUrl(url), this.makeOptionsJson(context_service_1.contextService.getContext().profile, "application/json;charset=utf-8"), (err, res) => {
-                        this.handleResponse(res, resolve, reject);
+                    axios_1.default.delete(this.resolveUrl(url), {
+                        headers: this.buildHeaders(context_service_1.contextService.getContext().profile, "application/json;charset=utf-8")
+                    }).then(response => {
+                        this.handleResponse(response, resolve, reject);
+                    }).catch(err => {
+                        this.handleError(err, resolve, reject);
                     });
                 }).catch(e => {
                     throw new logger_1.FatalError(e);
@@ -84,23 +108,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         downloadFile(url) {
             return __awaiter(this, void 0, void 0, function* () {
                 return new Promise((resolve, reject) => {
-                    request
-                        .post(this.resolveUrl(url), this.makeFileDownloadOptions(context_service_1.contextService.getContext().profile))
-                        .on("response", (response) => {
+                    axios_1.default.post(this.resolveUrl(url), null, {
+                        headers: this.buildHeaders(context_service_1.contextService.getContext().profile),
+                        responseType: "stream"
+                    }).then(response => {
                         const data = [];
-                        response.on("data", (chunk) => {
+                        response.data.on("data", (chunk) => {
                             data.push(chunk);
                         });
-                        response.on("end", () => {
-                            if (this.checkBadRequest(response.statusCode)) {
-                                this.handleBadRequest(response.statusCode, data.toString(), reject);
+                        response.data.on("end", () => {
+                            if (this.checkBadRequest(response.status)) {
+                                this.handleBadRequest(response.status, data.toString(), reject);
                             }
                             else {
                                 this.handleResponseStreamData(Buffer.concat(data), resolve, reject);
                             }
                         });
-                    })
-                        .on("error", error => reject(error));
+                    }).catch(err => {
+                        this.handleError(err, resolve, reject);
+                    });
                 });
             });
         }
@@ -115,28 +141,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         resolveUrl(url) {
             return context_service_1.contextService.getContext().profile.team.replace(/\/?$/, url);
         }
-        makeFileDownloadOptions(profile) {
-            return {
-                headers: this.buildHeaders(profile),
-                responseType: "binary",
-            };
-        }
         handleResponse(res, resolve, reject) {
-            if (this.checkBadRequest(res.statusCode)) {
-                this.handleBadRequest(res.statusCode, res.body, reject);
+            if (this.checkBadRequest(res.status)) {
+                this.handleBadRequest(res.status, res.data, reject);
                 return;
             }
-            let body = {};
-            try {
-                if (res.body) {
-                    body = JSON.parse(res.body);
-                }
+            resolve(res.data);
+        }
+        handleError(err, resolve, reject) {
+            if (err.response) {
+                this.handleResponse(err.response, resolve, reject);
             }
-            catch (e) {
-                reject("Something went wrong. Please check that you have the right url and api key.");
-                return;
+            else {
+                reject(err.message);
             }
-            resolve(body);
         }
         checkBadRequest(statusCode) {
             return statusCode >= 400;
@@ -144,32 +162,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         // tslint:disable-next-line:typedef
         handleBadRequest(statusCode, data, reject) {
             if (data) {
-                reject(data);
+                reject(JSON.stringify(data));
             }
             else {
                 reject("Backend responded with status code " + statusCode);
             }
         }
-        makeOptions(profile, body = {}) {
-            const options = {
-                headers: this.buildHeaders(profile),
-            };
-            return Object.assign(options, body);
-        }
-        makeOptionsJson(profile, body, contentType) {
-            return {
-                headers: this.buildHeaders(profile, contentType),
-                body: body,
-            };
-        }
         buildHeaders(profile, contentType) {
             return Object.assign(Object.assign(Object.assign({}, this.buildAuthorizationHeaders(profile, contentType)), tracing_1.TracingUtils.getTracingHeaders()), { "User-Agent": "content-cli v" + version_1.VersionUtils.getCurrentCliVersion() });
         }
         buildAuthorizationHeaders(profile, contentType) {
             const authenticationType = profile.authenticationType || profile_interface_1.AuthenticationType.BEARER;
             return {
-                authorization: `${authenticationType} ${profile.apiToken}`,
-                "content-type": contentType !== null && contentType !== void 0 ? contentType : "application/json",
+                Authorization: `${authenticationType} ${profile.apiToken}`,
+                "Content-Type": contentType !== null && contentType !== void 0 ? contentType : "application/json",
             };
         }
     }