@contrail/cli 3.1.7 → 3.2.0

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.1.7 darwin-arm64 node-v20.18.0
+@contrail/cli/3.2.0 darwin-arm64 node-v20.18.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/dist/commands/app/extension/deploy.js

@@ -10,7 +10,7 @@ const app_extension_packages_1 = require("../../../api/app-extension-packages");
 const apps_1 = require("../../../api/apps");
 const login_1 = require("../../../auth/login");
 const basecommand_1 = require("../../../basecommand");
-const extension_package_1 = require("../../../helpers/app/extension-package");
+const extension_package_deployer_1 = require("../../../helpers/app/extension-package-deployer");
 const load_app_config_1 = require("../../../helpers/app/load-app-config");
 const interfaces_1 = require("../../../interfaces");
 const logger_1 = tslib_1.__importDefault(require("../../../logger"));
@@ -40,7 +40,7 @@ class DeployExtension extends basecommand_1.BaseCommand {
             await this.validateExtensionDeclaration(appDeclaration, extensionIdentifier);
             const extensionDir = this.getExtensionDirectory(extensionIdentifier);
             // 2. Package and upload extension
-            const createdPackage = await (0, extension_package_1.createExtensionPackage)(app.id, extensionDir, { debug: this.flags.debug });
+            const createdPackage = await (0, extension_package_deployer_1.createExtensionPackage)(app.id, extensionDir, { debug: this.flags.debug });
             // 3. Poll until package is ready (timeout after 1 minute)
             const readyPackage = await this.pollUntilPackageIsReady(createdPackage);
             logger_1.default.info("Extension package is ready...Checking for extension deployment");

package/dist/commands/app/extension/deployment/list.js

@@ -6,7 +6,7 @@ const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const login_1 = require("../../../../auth/login");
 const basecommand_1 = require("../../../../basecommand");
-const extension_package_1 = require("../../../../helpers/app/extension-package");
+const extension_package_deployer_1 = require("../../../../helpers/app/extension-package-deployer");
 const load_app_config_1 = require("../../../../helpers/app/load-app-config");
 const logger_1 = tslib_1.__importDefault(require("../../../../logger"));
 const lodash_1 = require("lodash");
@@ -26,7 +26,7 @@ class ListExtensionDeployments extends basecommand_1.BaseCommand {
         await (0, login_1.authUser)();
         logger_1.default.info(`${chalk_1.default.blue.bold('START')} Listing extension deployments.`);
         const appDeclaration = (0, load_app_config_1.loadAppConfig)();
-        const app = await (0, extension_package_1.getExistingApp)(appDeclaration);
+        const app = await (0, extension_package_deployer_1.getExistingApp)(appDeclaration);
         const packages = this.flags.all
             ? await this.getAllExtensionPackages(app.id)
             : await this.getLatest20ExtensionPackages(app.id);

package/dist/helpers/app/app-deployer.js

@@ -14,6 +14,7 @@ const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const child_process_1 = tslib_1.__importDefault(require("child_process"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const extensions_deployer_1 = require("./extensions-deployer");
+const metadata_extractor_1 = require("./metadata-extractor");
 class AppDeployer {
     debug;
     dryRun;
@@ -165,6 +166,25 @@ class AppDeployer {
     }
 }
 exports.AppDeployer = AppDeployer;
+async function createSourceArchive(tmpDir) {
+    logger_1.default.info('Creating source code archive...');
+    const sourceFiles = ['src/', 'package.json', 'app.yml'];
+    if (fs_1.default.existsSync('package-lock.json')) {
+        sourceFiles.push('package-lock.json');
+    }
+    const sourceDir = `${tmpDir}/source`;
+    fs_1.default.mkdirSync(sourceDir, { recursive: true });
+    sourceFiles.forEach((sourceFile) => {
+        if (!fs_1.default.existsSync(sourceFile))
+            return;
+        const isDirectory = fs_1.default.statSync(sourceFile).isDirectory();
+        const copyOptions = isDirectory ? { recursive: true } : undefined;
+        fs_1.default.cpSync(sourceFile, `${sourceDir}/${sourceFile}`, copyOptions);
+    });
+    await (0, zip_a_folder_1.zip)(`${sourceDir}/`, `${tmpDir}/source-code.zip`);
+    logger_1.default.info('Source code archive created.');
+    return `${tmpDir}/source-code.zip`;
+}
 async function createNodePackage(appIdentifier, debug, dryRun) {
     // zip src code and package.json and package-lock.json files into a zip file
     // and upload as a code package.
@@ -178,6 +198,8 @@ async function createNodePackage(appIdentifier, debug, dryRun) {
             fs_1.default.cpSync('package-lock.json', 'tmp/package-lock.json');
         }
         fs_1.default.mkdirSync('tmp/node_modules', { recursive: true });
+        const buildInfoPath = await (0, metadata_extractor_1.createBuildMetadata)('tmp');
+        const sourceArchivePath = await createSourceArchive('tmp');
         logger_1.default.info('Installing production dependencies started...');
         child_process_1.default.execSync('npm install --omit=dev --prefix tmp/');
         logger_1.default.info('Installing production dependencies done.');
@@ -199,6 +221,9 @@ async function createNodePackage(appIdentifier, debug, dryRun) {
         logger_1.default.info('Copying Assets done.');
         // including the app.yml file in the package at the dist level
         fs_1.default.cpSync('app.yml', 'tmp/dist/app.yml');
+        // Copy build info and source code zip to dist
+        fs_1.default.cpSync(buildInfoPath, 'tmp/dist/build-info.json');
+        fs_1.default.cpSync(sourceArchivePath, 'tmp/dist/source-code.zip');
         logger_1.default.info('Zipping package...');
         await (0, zip_a_folder_1.zip)('tmp/', 'tmp.zip');
         logger_1.default.info('Zipping package done.');

package/dist/helpers/app/{extension-package.js → extension-package-deployer.js}

@@ -96,10 +96,7 @@ async function uploadExtensionPackage(appExtensionPackage, tmpDir, options) {
     });
     logger_1.default.debug(`${chalk_1.default.green.bold('EXTENSION')}      Uploaded extension package to ${appExtensionPackage.uploadURL}`);
     logger_1.default.info(`${chalk_1.default.green.bold('EXTENSION')}      Extension package uploaded. ID: ${appExtensionPackage.id}`);
-    if (options.debug) {
-        logger_1.default.debug(JSON.stringify(result, null, 2));
-    }
-    if (result.status !== 200) {
+    if (result.status < 200 || result.status >= 300) {
         logger_1.default.error(`${chalk_1.default.red.bold('EXTENSION')}      Failed to upload extension package. Status: ${result.status}`);
         logger_1.default.error(JSON.stringify(result, null, 2));
         throw new Error(`Failed to upload extension package. Status: ${result.status}`);

package/dist/helpers/app/metadata-extractor.d.ts

@@ -0,0 +1 @@
+export declare function createBuildMetadata(tmpDir: string): string;

package/dist/helpers/app/metadata-extractor.js

@@ -0,0 +1,100 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createBuildMetadata = void 0;
+const tslib_1 = require("tslib");
+const os = tslib_1.__importStar(require("os"));
+const child_process_1 = require("child_process");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+function createBuildMetadata(tmpDir) {
+    const buildTimestamp = new Date();
+    const systemInfo = {
+        nodeVersion: process.version,
+        platform: process.platform,
+        architecture: process.arch,
+        operatingSystem: os.type(),
+        osRelease: os.release(),
+        hostname: os.hostname(),
+        totalMemory: os.totalmem(),
+        freeMemory: os.freemem(),
+        cpuCount: os.cpus().length,
+        cpuModel: os.cpus()[0]?.model || 'unknown',
+        homeDirectory: os.homedir(),
+        tmpDirectory: os.tmpdir(),
+        processId: process.pid,
+        processTitle: process.title,
+        execPath: process.execPath,
+        workingDirectory: process.cwd(),
+    };
+    const environmentInfo = {
+        shell: process.env.SHELL,
+        term: process.env.TERM,
+        lang: process.env.LANG,
+        timezone: process.env.TZ || Intl.DateTimeFormat().resolvedOptions().timeZone,
+    };
+    let gitInfo = {};
+    try {
+        const gitCommitHash = (0, child_process_1.execSync)('git rev-parse HEAD', {
+            encoding: 'utf8',
+            timeout: 5000,
+        }).trim();
+        const gitBranch = (0, child_process_1.execSync)('git rev-parse --abbrev-ref HEAD', {
+            encoding: 'utf8',
+            timeout: 5000,
+        }).trim();
+        const gitRemoteUrl = (0, child_process_1.execSync)('git config --get remote.origin.url', {
+            encoding: 'utf8',
+            timeout: 5000,
+        }).trim();
+        const gitCommitMessage = (0, child_process_1.execSync)('git log -1 --pretty=%B', {
+            encoding: 'utf8',
+            timeout: 5000,
+        }).trim();
+        const gitAuthor = (0, child_process_1.execSync)('git log -1 --pretty=format:"%an <%ae>"', {
+            encoding: 'utf8',
+            timeout: 5000,
+        }).trim();
+        const gitCommitDate = (0, child_process_1.execSync)('git log -1 --pretty=format:"%ai"', {
+            encoding: 'utf8',
+            timeout: 5000,
+        }).trim();
+        const gitTagsOutput = (0, child_process_1.execSync)('git tag --points-at HEAD', {
+            encoding: 'utf8',
+            timeout: 5000,
+        }).trim();
+        const gitTags = gitTagsOutput ? gitTagsOutput.split('\n') : [];
+        gitInfo = {
+            commitHash: gitCommitHash,
+            shortCommitHash: gitCommitHash.substring(0, 8),
+            branch: gitBranch,
+            remoteUrl: gitRemoteUrl,
+            commitMessage: gitCommitMessage,
+            author: gitAuthor,
+            commitDate: gitCommitDate,
+            tags: gitTags,
+        };
+    }
+    catch (error) {
+        gitInfo = {
+            error: 'Git information unavailable',
+            message: error instanceof Error ? error.message : 'Unknown git error',
+        };
+    }
+    const buildInfo = {
+        buildTimestamp: buildTimestamp.toISOString(),
+        buildTimestampUnix: Math.floor(buildTimestamp.getTime() / 1000),
+        buildTool: 'contrail-cli',
+        buildUser: process.env.USER || process.env.USERNAME || 'unknown',
+        system: systemInfo,
+        environment: environmentInfo,
+        git: gitInfo,
+        metadata: {
+            schemaVersion: '1.0.0',
+            generatedBy: 'contrail-cli-app-deployer',
+            purpose: 'Build and deployment metadata for debugging and auditing',
+        },
+    };
+    const buildInfoPath = `${tmpDir}/build-info.json`;
+    fs_1.default.writeFileSync(buildInfoPath, JSON.stringify(buildInfo, null, 2));
+    return buildInfoPath;
+}
+exports.createBuildMetadata = createBuildMetadata;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.1.7",
+  "version": "3.2.0",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.1.7",
+  "version": "3.2.0",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",