@celonis/content-cli 0.4.11 → 0.5.1

package/api/compute-pool-api.js

@@ -20,9 +20,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     Object.defineProperty(exports, "__esModule", { value: true });
     const http_client_service_v2_1 = require("../services/http-client-service.v2");
     class ComputePoolApi {
-        findAssignedDatamodels(packageKey) {
+        findAllDataModelsDetails() {
             return __awaiter(this, void 0, void 0, function* () {
-                return http_client_service_v2_1.httpClientV2.get(`/package-manager/api/compute-pools/data-models/assigned?packageKey=${packageKey}`)
+                return http_client_service_v2_1.httpClientV2.get("/package-manager/api/compute-pools/data-models/details")
                     .catch(e => {
                     return null;
                 });

package/api/package-api.js

@@ -38,9 +38,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 });
             });
         }
-        findAllPackagesWithVariableAssignments() {
+        findAllPackagesWithVariableAssignments(type) {
             return __awaiter(this, void 0, void 0, function* () {
-                return http_client_service_v2_1.httpClientV2.get("/package-manager/api/packages/with-variable-assignments").catch(e => {
+                const queryParams = new URLSearchParams();
+                if (type) {
+                    queryParams.set("type", type);
+                }
+                return http_client_service_v2_1.httpClientV2.get(`/package-manager/api/packages/with-variable-assignments?${queryParams.toString()}`).catch(e => {
                     throw new logger_1.FatalError(`Problem getting variables of packages: : ${e}`);
                 });
             });

package/content-cli.js

@@ -5,7 +5,7 @@
         if (v !== undefined) module.exports = v;
     }
     else if (typeof define === "function" && define.amd) {
-        define(["require", "exports", "./util/logger", "semver/functions/satisfies", "commander"], factory);
+        define(["require", "exports", "./util/logger", "semver/functions/satisfies", "commander", "./util/version"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -13,8 +13,7 @@
     const logger_1 = require("./util/logger");
     const semverSatisfies = require("semver/functions/satisfies");
     const program = require("commander");
-    // tslint:disable-next-line:no-var-requires
-    const { version } = require("./package.json");
+    const version_1 = require("./util/version");
     const requiredVersion = ">=10.10.0";
     if (!semverSatisfies(process.version, requiredVersion)) {
         logger_1.logger.error(`Node version ${process.version} not supported. Please upgrade your node version to ${requiredVersion}`);
@@ -27,7 +26,7 @@
     program.command("push", "Commands to push content.");
     program.command("update", "Commands to update content.");
     program.command("list", "Commands to list content.").alias("ls");
-    program.version(version);
+    program.version(version_1.VersionUtils.getCurrentCliVersion());
     program.parse(process.argv);
     if (!process.argv.slice(2).length) {
         program.outputHelp();

package/interfaces/package-manager.interfaces.js

@@ -9,4 +9,11 @@
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    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 = {}));
 });

package/lib/api/compute-pool-api.d.ts

@@ -1,7 +1,7 @@
-import { StudioDataModelTransport } from "../interfaces/package-manager.interfaces";
+import { StudioComputeNodeDescriptor } from "../interfaces/package-manager.interfaces";
 declare class ComputePoolApi {
     static readonly INSTANCE: ComputePoolApi;
-    findAssignedDatamodels(packageKey: string): Promise<StudioDataModelTransport[]>;
+    findAllDataModelsDetails(): Promise<StudioComputeNodeDescriptor[]>;
 }
 export declare const computePoolApi: ComputePoolApi;
 export {};

package/lib/api/package-api.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" />
-import { ActivatePackageTransport, ContentNodeTransport, PackageHistoryTransport, PackageWithVariableAssignments } from "../interfaces/package-manager.interfaces";
+import { ActivatePackageTransport, ContentNodeTransport, PackageHistoryTransport, PackageManagerVariableType, PackageWithVariableAssignments } from "../interfaces/package-manager.interfaces";
 declare class PackageApi {
     static readonly INSTANCE: PackageApi;
     findAllPackages(): Promise<ContentNodeTransport[]>;
     exportPackage(rootPackageKey: string, version?: string): Promise<Buffer>;
-    findAllPackagesWithVariableAssignments(): Promise<PackageWithVariableAssignments[]>;
+    findAllPackagesWithVariableAssignments(type: PackageManagerVariableType): Promise<PackageWithVariableAssignments[]>;
     findLatestVersionById(nodeId: string): Promise<PackageHistoryTransport>;
     findActiveVersionById(nodeId: string): Promise<PackageHistoryTransport>;
     findActiveVersionByIds(nodeIds: string[]): Promise<PackageHistoryTransport[]>;

package/lib/interfaces/batch-export-node-transport.d.ts

@@ -1,11 +1,11 @@
-import { ContentNodeTransport, PackageDependencyTransport, PackageHistoryTransport, StudioDataModelTransport, VariablesAssignments } from "./package-manager.interfaces";
+import { ContentNodeTransport, PackageDependencyTransport, PackageHistoryTransport, StudioComputeNodeDescriptor, VariablesAssignments } from "./package-manager.interfaces";
 import { SpaceTransport } from "./save-space.interface";
 export interface BatchExportNodeTransport extends ContentNodeTransport {
     workingDraftId: string;
     activatedDraftId: string;
     version?: PackageHistoryTransport;
     dependencies?: PackageDependencyTransport[];
-    datamodels?: StudioDataModelTransport[];
+    datamodels?: StudioComputeNodeDescriptor[];
     variables?: VariablesAssignments[];
     space?: SpaceTransport;
 }

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

@@ -51,12 +51,18 @@ export interface VariablesAssignments {
 }
 export interface VariableDefinitionWithValue {
     key: string;
-    type: string;
+    type: PackageManagerVariableType;
     description?: string;
     source?: string;
     runtime?: boolean;
     metadata?: object;
 }
+export declare enum PackageManagerVariableType {
+    DATA_MODEL = "DATA_MODEL",
+    CONNECTION = "CONNECTION",
+    ASSIGNMENT_RULE = "ASSIGNMENT_RULE",
+    PLAIN_TEXT = "PLAIN_TEXT"
+}
 export interface PackageHistoryTransport {
     id: string;
     key: string;
@@ -70,6 +76,7 @@ export interface StudioDataModelTransport {
 export interface StudioComputeNodeDescriptor {
     name: string;
     dataModelId: string;
+    poolId: string;
 }
 export interface ComputePoolTransport {
     id: string;

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

@@ -13,6 +13,7 @@ declare class HttpClientServiceV2 {
     private handleBadRequest;
     private makeOptions;
     private makeOptionsJson;
+    private buildHeaders;
     private buildAuthorizationHeaders;
 }
 export declare const httpClientV2: HttpClientServiceV2;

package/lib/services/package-manager/datamodel-service.d.ts

@@ -1,8 +1,7 @@
-import { BatchExportNodeTransport } from "../../interfaces/batch-export-node-transport";
-import { StudioDataModelTransport } from "../../interfaces/package-manager.interfaces";
-declare class DatamodelService {
-    static readonly INSTANCE: DatamodelService;
-    getDatamodelsForNodes(nodesListToExport: BatchExportNodeTransport[]): Promise<Map<string, StudioDataModelTransport[]>>;
+import { PackageWithVariableAssignments, StudioComputeNodeDescriptor } from "../../interfaces/package-manager.interfaces";
+declare class DataModelService {
+    static readonly INSTANCE: DataModelService;
+    getDataModelDetailsForPackages(packagesWithDataModelVariables: PackageWithVariableAssignments[]): Promise<Map<string, StudioComputeNodeDescriptor[]>>;
 }
-export declare const dataModelService: DatamodelService;
+export declare const dataModelService: DataModelService;
 export {};

package/lib/services/package-manager/variable-service.d.ts

@@ -1,7 +1,6 @@
-import { PackageWithVariableAssignments, VariablesAssignments } from "../../interfaces/package-manager.interfaces";
-import { BatchExportNodeTransport } from "../../interfaces/batch-export-node-transport";
+import { PackageManagerVariableType, PackageWithVariableAssignments, VariablesAssignments } from "../../interfaces/package-manager.interfaces";
 declare class VariableService {
-    getVariableAssignmentsForNodes(nodes: BatchExportNodeTransport[]): Promise<PackageWithVariableAssignments[]>;
+    getVariableAssignmentsForNodes(type?: PackageManagerVariableType): Promise<PackageWithVariableAssignments[]>;
     assignVariableValues(packageKey: string, variablesAssignments: VariablesAssignments[]): Promise<void>;
 }
 export declare const variableService: VariableService;

package/lib/util/tracing.d.ts

@@ -0,0 +1,7 @@
+export declare class TracingUtils {
+    static getTracingHeaders(): {
+        [key: string]: string;
+    };
+    private static getTraceId;
+    private static generateId;
+}

package/lib/util/version.d.ts

@@ -0,0 +1,3 @@
+export declare class VersionUtils {
+    static getCurrentCliVersion(): string;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celonis/content-cli",
-  "version": "0.4.11",
+  "version": "0.5.1",
   "description": "CLI Tool to help manage content in Celonis EMS",
   "main": "content-cli.js",
   "bin": {

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

@@ -13,7 +13,7 @@ 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"], factory);
+        define(["require", "exports", "../interfaces/profile.interface", "request", "./context.service", "../util/logger", "querystring", "../util/tracing", "../util/version"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -23,6 +23,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     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");
     class HttpClientServiceV2 {
         get(url) {
             return __awaiter(this, void 0, void 0, function* () {
@@ -115,7 +117,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         }
         makeFileDownloadOptions(profile) {
             return {
-                headers: this.buildAuthorizationHeaders(profile),
+                headers: this.buildHeaders(profile),
                 responseType: "binary",
             };
         }
@@ -150,16 +152,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         }
         makeOptions(profile, body = {}) {
             const options = {
-                headers: this.buildAuthorizationHeaders(profile),
+                headers: this.buildHeaders(profile),
             };
             return Object.assign(options, body);
         }
         makeOptionsJson(profile, body, contentType) {
             return {
-                headers: this.buildAuthorizationHeaders(profile, contentType),
+                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 {

package/services/package-manager/datamodel-service.js

@@ -19,18 +19,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     const compute_pool_api_1 = require("../../api/compute-pool-api");
-    class DatamodelService {
-        getDatamodelsForNodes(nodesListToExport) {
+    class DataModelService {
+        getDataModelDetailsForPackages(packagesWithDataModelVariables) {
+            var _a;
             return __awaiter(this, void 0, void 0, function* () {
                 const dataModelsMap = new Map();
-                for (const node of nodesListToExport) {
-                    const assignedDataModels = yield compute_pool_api_1.computePoolApi.findAssignedDatamodels(node.key);
+                const allAvailableDataModels = yield compute_pool_api_1.computePoolApi.findAllDataModelsDetails();
+                for (const node of packagesWithDataModelVariables) {
+                    const variablesOfPackage = (_a = packagesWithDataModelVariables.find(nodeWithVariablesAssignment => nodeWithVariablesAssignment.key === node.key)) === null || _a === void 0 ? void 0 : _a.variableAssignments;
+                    const dataModelIds = variablesOfPackage.filter(variable => variable.value).map(variable => variable.value.toString());
+                    const assignedDataModels = allAvailableDataModels.filter(dataModel => dataModelIds.includes(dataModel.dataModelId));
                     dataModelsMap.set(node.key, assignedDataModels);
                 }
                 return dataModelsMap;
             });
         }
     }
-    DatamodelService.INSTANCE = new DatamodelService();
-    exports.dataModelService = DatamodelService.INSTANCE;
+    DataModelService.INSTANCE = new DataModelService();
+    exports.dataModelService = DataModelService.INSTANCE;
 });

package/services/package-manager/package-service.js

@@ -13,7 +13,7 @@ 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", "../../util/logger", "../../api/package-api", "uuid", "../file-service", "./datamodel-service", "../../api/node-api", "../../api/package-dependencies-api", "./variable-service", "./space-service", "fs", "adm-zip", "path", "os", "../../util/semantic-versioning", "../../util/yaml"], factory);
+        define(["require", "exports", "../../util/logger", "../../api/package-api", "uuid", "../file-service", "./datamodel-service", "../../interfaces/package-manager.interfaces", "../../api/node-api", "../../api/package-dependencies-api", "./variable-service", "./space-service", "fs", "adm-zip", "path", "os", "../../util/semantic-versioning", "../../util/yaml"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -23,6 +23,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     const uuid_1 = require("uuid");
     const file_service_1 = require("../file-service");
     const datamodel_service_1 = require("./datamodel-service");
+    const package_manager_interfaces_1 = require("../../interfaces/package-manager.interfaces");
     const node_api_1 = require("../../api/node-api");
     const package_dependencies_api_1 = require("../../api/package-dependencies-api");
     const variable_service_1 = require("./variable-service");
@@ -50,23 +51,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 const fieldsToInclude = ["key", "name", "changeDate", "activatedDraftId", "workingDraftId", "spaceId"];
                 let nodesListToExport = yield package_api_1.packageApi.findAllPackages();
                 if (packageKeys.length > 0) {
-                    nodesListToExport = nodesListToExport.filter(node => {
-                        return packageKeys.includes(node.rootNodeKey);
-                    });
+                    nodesListToExport = nodesListToExport.filter(node => packageKeys.includes(node.rootNodeKey));
                 }
                 if (includeDependencies) {
                     fieldsToInclude.push("type", "value", "dependencies", "id", "updateAvailable", "version", "poolId", "node", "dataModelId", "dataPool", "datamodels");
                     const packagesKeyWithActionFlows = (yield node_api_1.nodeApi.findAllNodesOfType("SCENARIO")).map(node => node.rootNodeKey);
-                    nodesListToExport = nodesListToExport.filter(node => {
-                        return !packagesKeyWithActionFlows.includes(node.rootNodeKey);
-                    });
+                    nodesListToExport = nodesListToExport.filter(node => !packagesKeyWithActionFlows.includes(node.rootNodeKey));
                     const unPublishedNodes = nodesListToExport.filter(node => !node.activatedDraftId);
                     let publishedNodes = nodesListToExport.filter(node => node.activatedDraftId);
                     publishedNodes = yield this.getNodesWithActiveVersion(publishedNodes);
                     nodesListToExport = [...publishedNodes, ...unPublishedNodes];
-                    const dataModelAssignments = yield datamodel_service_1.dataModelService.getDatamodelsForNodes(nodesListToExport);
+                    const packageWithDataModelVariableAssignments = yield variable_service_1.variableService.getVariableAssignmentsForNodes(package_manager_interfaces_1.PackageManagerVariableType.DATA_MODEL);
+                    const dataModelDetailsByNode = yield datamodel_service_1.dataModelService.getDataModelDetailsForPackages(packageWithDataModelVariableAssignments);
                     nodesListToExport.forEach(node => {
-                        node.datamodels = dataModelAssignments.get(node.key);
+                        node.datamodels = dataModelDetailsByNode.get(node.key);
                     });
                     const draftIdByNodeId = new Map();
                     nodesListToExport.forEach(node => draftIdByNodeId.set(node.workingDraftId, node.id));
@@ -176,7 +174,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 nodeInTargetTeam = yield node_api_1.nodeApi.findOneByKeyAndRootNodeKey(packageToImport.packageKey, packageToImport.packageKey);
                 if (this.isLatestVersion(versionOfPackageBeingImported, [...packageToImport.dependenciesByVersion.keys()])) {
                     const variableAssignments = packageToImport.variables
-                        .filter(variable => variable.type === "DATA_MODEL").map(variable => {
+                        .filter(variable => variable.type === package_manager_interfaces_1.PackageManagerVariableType.DATA_MODEL).map(variable => {
                         var _a;
                         variable.value = dmTargetIdsBySourceIds.get((_a = variable.value) === null || _a === void 0 ? void 0 : _a.toString());
                         return variable;
@@ -305,14 +303,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     const dependencyPackages = yield this.getDependencyPackages(nodesListToExport, [], allPackages, actionFlowsPackageKeys, [], versionsByNodeKey);
                     nodesListToExport.push(...dependencyPackages);
                 }
-                const variableAssignments = yield variable_service_1.variableService.getVariableAssignmentsForNodes(nodesListToExport);
+                const packagesWithVariableAssignments = yield variable_service_1.variableService.getVariableAssignmentsForNodes();
                 nodesListToExport.forEach(node => {
                     var _a;
-                    node.variables = (_a = variableAssignments.find(nodeWithVariablesAssignment => nodeWithVariablesAssignment.key === node.key)) === null || _a === void 0 ? void 0 : _a.variableAssignments;
+                    node.variables = (_a = packagesWithVariableAssignments.find(nodeWithVariablesAssignment => nodeWithVariablesAssignment.key === node.key)) === null || _a === void 0 ? void 0 : _a.variableAssignments;
+                });
+                const packagesWithDataModelVariables = packagesWithVariableAssignments.map(packageWithVariablesAssignments => {
+                    packageWithVariablesAssignments.variableAssignments = packageWithVariablesAssignments.variableAssignments.filter(variable => variable.value && variable.type === package_manager_interfaces_1.PackageManagerVariableType.DATA_MODEL);
+                    return packageWithVariablesAssignments;
                 });
-                const dataModelAssignments = yield datamodel_service_1.dataModelService.getDatamodelsForNodes(nodesListToExport);
+                const dataModelDetailsByNode = yield datamodel_service_1.dataModelService.getDataModelDetailsForPackages(packagesWithDataModelVariables);
                 nodesListToExport.forEach(node => {
-                    node.datamodels = dataModelAssignments.get(node.key);
+                    node.datamodels = dataModelDetailsByNode.get(node.key);
                 });
                 nodesListToExport = yield space_service_1.spaceService.getParentSpaces(nodesListToExport);
                 yield this.exportToZip(nodesListToExport, versionsByNodeKey);
@@ -422,15 +424,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 };
                 manifestNode.variables = (_b = node.variables) === null || _b === void 0 ? void 0 : _b.map((variable) => {
                     var _a;
-                    if (variable.type === "DATA_MODEL") {
+                    if (variable.type === package_manager_interfaces_1.PackageManagerVariableType.DATA_MODEL) {
                         // @ts-ignore
-                        const dataModel = (_a = node.datamodels) === null || _a === void 0 ? void 0 : _a.find(dataModel => dataModel.node.dataModelId === variable.value);
+                        const dataModel = (_a = node.datamodels) === null || _a === void 0 ? void 0 : _a.find(dataModel => dataModel.dataModelId === variable.value);
                         return {
                             key: variable.key,
                             type: variable.type,
                             value: variable.value,
-                            dataModelName: dataModel === null || dataModel === void 0 ? void 0 : dataModel.node.name,
-                            dataPoolName: dataModel === null || dataModel === void 0 ? void 0 : dataModel.dataPool.name
+                            dataModelName: dataModel === null || dataModel === void 0 ? void 0 : dataModel.name,
                         };
                     }
                     return variable;

package/services/package-manager/variable-service.js

@@ -21,9 +21,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     const package_api_1 = require("../../api/package-api");
     const variables_api_1 = require("../../api/variables-api");
     class VariableService {
-        getVariableAssignmentsForNodes(nodes) {
+        getVariableAssignmentsForNodes(type) {
             return __awaiter(this, void 0, void 0, function* () {
-                return yield package_api_1.packageApi.findAllPackagesWithVariableAssignments();
+                return yield package_api_1.packageApi.findAllPackagesWithVariableAssignments(type);
             });
         }
         assignVariableValues(packageKey, variablesAssignments) {

package/util/tracing.js

@@ -0,0 +1,28 @@
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports", "crypto"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    const crypto = require("crypto");
+    class TracingUtils {
+        static getTracingHeaders() {
+            return {
+                "x-datadog-trace-id": this.getTraceId(),
+                "x-datadog-sampling-priority": "1",
+            };
+        }
+        static getTraceId() {
+            return process.env.TRACE_ID || this.generateId();
+        }
+        static generateId() {
+            return crypto.randomBytes(8).toString("hex");
+        }
+    }
+    exports.TracingUtils = TracingUtils;
+});

package/util/version.js

@@ -0,0 +1,20 @@
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define(["require", "exports"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    // tslint:disable-next-line:no-var-requires
+    const { version } = require("./../package.json");
+    class VersionUtils {
+        static getCurrentCliVersion() {
+            return version;
+        }
+    }
+    exports.VersionUtils = VersionUtils;
+});