@celonis/content-cli 1.2.1 → 1.2.2

package/commands/configuration-management/batch-import-export.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", "uuid", "form-data", "stream", "adm-zip", "./interfaces/batch-export-import.constants", "../../core/utils/file-service", "../../core/utils/logger", "../../core/utils/json", "../studio/api/package-api", "./api/batch-import-export-api", "./studio.service", "../../core/git-profile/git/git.service", "node:fs"], factory);
+        define(["require", "exports", "uuid", "form-data", "stream", "adm-zip", "./interfaces/batch-export-import.constants", "../../core/utils/file-service", "../../core/utils/logger", "../../core/utils/json", "../studio/api/package-api", "./api/batch-import-export-api", "./studio.service", "../../core/git-profile/git/git.service", "fs"], factory);
     }
 })(function (require, exports) {
     "use strict";
@@ -31,7 +31,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     const batch_import_export_api_1 = require("./api/batch-import-export-api");
     const studio_service_1 = require("./studio.service");
     const git_service_1 = require("../../core/git-profile/git/git.service");
-    const fs = require("node:fs");
+    const fs = require("fs");
     class BatchImportExportService {
         constructor(context) {
             this.batchImportExportApi = new batch_import_export_api_1.BatchImportExportApi(context);
@@ -121,9 +121,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 }
                 else {
                     sourceToBeImported = sourcePath;
-                    if (file_service_1.fileService.isDirectory(sourcePath)) {
-                        sourceToBeImported = file_service_1.fileService.zipDirectoryInBatchExportFormat(sourceToBeImported);
-                    }
+                }
+                if (file_service_1.fileService.isDirectory(sourceToBeImported)) {
+                    sourceToBeImported = file_service_1.fileService.zipDirectoryInBatchExportFormat(sourceToBeImported);
                 }
                 let configs = new AdmZip(sourceToBeImported);
                 const studioManifests = this.parseEntryData(configs, batch_export_import_constants_1.BatchExportImportConstants.STUDIO_FILE_NAME);

package/commands/git-profile/git-profile-command.service.js

@@ -35,11 +35,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     profile.name = yield questions.ask("Name of the Git profile to create: ");
                     profile.username = yield questions.ask("Your Git username: ");
                     profile.repository = yield questions.ask("Your repository (format: repoOwner/repoName): ");
-                    const type = yield questions.ask("Authentication type: PAT (1), SSH token (2): ");
+                    const type = yield questions.ask("Authentication type: HTTPS (1), SSH token (2): ");
                     switch (type) {
                         case "1":
-                            profile.authenticationType = git_profile_interface_1.AuthenticationType.PAT;
-                            profile.token = yield questions.ask("Your Personal Access Token (PAT): ");
+                            profile.authenticationType = git_profile_interface_1.AuthenticationType.HTTPS;
                             break;
                         case "2":
                             profile.authenticationType = git_profile_interface_1.AuthenticationType.SSH;

package/content-cli.js

@@ -47,6 +47,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     program.version(version_1.VersionUtils.getCurrentCliVersion());
     program.option("-q, --quietmode", "Reduce output to a minimum", false);
     program.option("-p, --profile [profile]");
+    program.option("--gitProfile [gitProfile]", "Git profile to use");
     program.option("--debug", "Print debug messages", false);
     program.option("--dev", "Development Mode", false);
     program.parseOptions(process.argv);

package/core/git-profile/git/git.service.js

@@ -55,7 +55,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 const repoUrl = this.getRepoUrl();
                 const git = (0, simple_git_1.default)();
                 try {
-                    yield git.clone(repoUrl, workingDir, ["--branch", "main"]);
+                    yield git.clone(repoUrl, workingDir);
                     const repoGit = (0, simple_git_1.default)({ baseDir: workingDir });
                     yield repoGit.addConfig("user.name", (_a = this.gitProfile.username) !== null && _a !== void 0 ? _a : "content-cli");
                     yield repoGit.addConfig("user.email", `${(_b = this.gitProfile.username) !== null && _b !== void 0 ? _b : "cli"}@users.noreply.github.com`);
@@ -92,12 +92,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         checkoutOrCreateLocalBranch(git, branch) {
             return __awaiter(this, void 0, void 0, function* () {
                 const branches = yield git.branch();
-                if (!branches.all.includes(`remotes/origin/${branch}`)) {
-                    yield git.checkoutLocalBranch(branch);
+                if (branches.current === branch) {
+                    return;
                 }
-                else {
-                    yield git.checkout(["-b", branch, "--track", `origin/${branch}`]);
+                if (branches.all.includes(branch)) {
+                    yield git.checkout(branch);
+                    return;
                 }
+                if (branches.all.includes(`remotes/origin/${branch}`)) {
+                    yield git.checkout(["--track", `origin/${branch}`]);
+                    return;
+                }
+                yield git.checkoutLocalBranch(branch);
             });
         }
         getRepoUrl() {
@@ -105,9 +111,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             if (authenticationType === "SSH") {
                 return `git@github.com:${repository}.git`;
             }
-            const safeUsername = encodeURIComponent(username !== null && username !== void 0 ? username : "git");
-            const safeToken = encodeURIComponent(token);
-            return `https://${safeUsername}:${safeToken}@github.com/${repository}.git`;
+            if (token) {
+                const safeUsername = encodeURIComponent(username !== null && username !== void 0 ? username : "git");
+                const safeToken = encodeURIComponent(token);
+                return `https://${safeUsername}:${safeToken}@github.com/${repository}.git`;
+            }
+            return `https://github.com/${repository}.git`;
         }
         cleanupGitDirectory(repoDirectory) {
             const gitPath = path.join(repoDirectory, ".git");

package/core/git-profile/git-profile.interface.js

@@ -13,6 +13,6 @@
     // tslint:disable-next-line:variable-name
     exports.AuthenticationType = {
         SSH: "SSH",
-        PAT: "Personal Access Token",
+        HTTPS: "HTTPS",
     };
 });

package/core/git-profile/git-profile.service.js

@@ -34,7 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         findProfile(profileName) {
             return __awaiter(this, void 0, void 0, function* () {
                 return new Promise((resolve, reject) => {
-                    if (process.env.USERNAME && process.env.GIT_TOKEN && process.env.REPOSITORY) {
+                    if (process.env.GIT_USERNAME && process.env.GIT_TOKEN && process.env.GIT_REPOSITORY) {
                         resolve(this.buildProfileFromEnvVariables());
                     }
                     else {
@@ -59,7 +59,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                         resolve(profile);
                     })
                         .catch(err => {
-                        logger_1.logger.error(new logger_1.FatalError("Git Profile does not exit."));
+                        logger_1.logger.error(new logger_1.FatalError("Git Profile does not exist."));
                         reject(err);
                     });
                 });
@@ -85,10 +85,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             return __awaiter(this, void 0, void 0, function* () {
                 const profileVariables = this.getProfileEnvVariables();
                 const profile = {
-                    name: profileVariables.repository,
+                    name: "env-profile",
+                    username: profileVariables.username,
                     repository: profileVariables.repository,
-                    token: profileVariables.apiToken,
-                    authenticationType: git_profile_interface_1.AuthenticationType.SSH,
+                    token: profileVariables.token,
+                    authenticationType: git_profile_interface_1.AuthenticationType.HTTPS,
                 };
                 profile.authenticationType = yield git_profile_validator_1.GitProfileValidator.validateProfile(profile);
                 return profile;
@@ -123,9 +124,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         }
         getProfileEnvVariables() {
             return {
-                username: process.env.USERNAME,
+                username: process.env.GIT_USERNAME,
                 token: process.env.GIT_TOKEN,
-                repository: process.env.REPOSITORY,
+                repository: process.env.GIT_REPOSITORY,
             };
         }
     }

package/core/git-profile/git-profile.validator.js

@@ -13,14 +13,13 @@ 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", "../utils/logger", "./git-profile.interface"], factory);
+        define(["require", "exports", "../utils/logger"], factory);
     }
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.GitProfileValidator = void 0;
     const logger_1 = require("../utils/logger");
-    const git_profile_interface_1 = require("./git-profile.interface");
     class GitProfileValidator {
         static validateProfile(gitProfile) {
             return __awaiter(this, void 0, void 0, function* () {
@@ -36,9 +35,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 if (gitProfile.authenticationType == null) {
                     logger_1.logger.error(new logger_1.FatalError("The authentication type can not be empty"));
                 }
-                if (gitProfile.authenticationType === git_profile_interface_1.AuthenticationType.PAT && gitProfile.token == null) {
-                    logger_1.logger.error(new logger_1.FatalError("The token can not be empty for authentication with PAT"));
-                }
             });
         }
     }

package/lib/core/git-profile/git-profile.interface.d.ts

@@ -1,11 +1,11 @@
 export interface GitProfile {
     name: string;
     username?: string;
-    repository: string;
     token?: string;
+    repository: string;
     authenticationType: AuthenticationType;
 }
-export type AuthenticationType = "SSH" | "Personal Access Token";
+export type AuthenticationType = "SSH" | "HTTPS";
 export declare const AuthenticationType: {
     [key: string]: AuthenticationType;
 };

package/package.json

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