@contrail/cli 3.5.5-alpha.a73fd77 → 3.5.5-alpha.cb68c04

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.5.5-alpha.a73fd77 linux-x64 node-v24.21.0
+@contrail/cli/3.5.5-alpha.cb68c04 linux-x64 node-v24.21.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/dist/auth/login.d.ts

@@ -1,3 +1,4 @@
 import { AuthContext } from '@contrail/sdk';
 export declare function authUser(): Promise<AuthContext>;
 export declare function getVersionFromPackageJson(): string;
+export declare function parseNetworkFailureReason(e: any): string;

package/dist/auth/login.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVersionFromPackageJson = exports.authUser = void 0;
+exports.parseNetworkFailureReason = exports.getVersionFromPackageJson = exports.authUser = void 0;
 const tslib_1 = require("tslib");
 const amazon_cognito_identity_js_1 = require("amazon-cognito-identity-js");
 const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
@@ -15,6 +15,20 @@ const CONFIGURATION = {
     apiGateway: 'https://api.vibeiq.com/prod/api',
 };
 async function authUser() {
+    try {
+        return await resolveAuthContext();
+    }
+    catch (e) {
+        const reason = parseNetworkFailureReason(e);
+        if (!reason) {
+            throw e;
+        }
+        logger_1.default.error(`Could not reach the VibeIQ API: ${reason}`);
+        process.exit(1);
+    }
+}
+exports.authUser = authUser;
+async function resolveAuthContext() {
     logger_1.default.debug('authorizing user...');
     const config = await (0, config_1.getConfig)();
     if (process.env.CONTRAIL_CLI_API_KEY) {
@@ -40,16 +54,14 @@ async function authUser() {
             return await refreshCurrentUserOrg();
         }
         catch (e) {
-            if (isNetworkConnectionError(e)) {
-                logger_1.default.error("Encountered a network connection issue. Please ensure you're connected to the internet and try again");
-                process.exit(1);
+            if (parseNetworkFailureReason(e)) {
+                throw e;
             }
             logger_1.default.info('Token expired. Requesting auth credentials...');
         }
     }
     return await authenticateWithUsernamePassword(config);
 }
-exports.authUser = authUser;
 async function getOrgSlug(config) {
     const orgSlug = config?.orgSlug || process.env.CONTRAIL_CLI_ORG_SLUG;
     if (!orgSlug) {
@@ -215,7 +227,11 @@ async function returnAndStoreConfig(config) {
     await (0, config_1.storeConfig)(configCopy);
     return configCopy;
 }
-function isNetworkConnectionError(e) {
+function parseNetworkFailureReason(e) {
     const cause = e?.cause;
-    return cause?.code === 'ENOTFOUND' || cause?.code === 'ECONNREFUSED';
+    if (!cause) {
+        return null;
+    }
+    return cause.code ? `${cause.code}: ${cause.message}` : cause.message;
 }
+exports.parseNetworkFailureReason = parseNetworkFailureReason;

package/dist/auth/login.spec.js

@@ -1,6 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const login_1 = require("./login");
+describe('parseNetworkFailureReason', () => {
+    it('reports the cause behind a fetch failure', () => {
+        const e = Object.assign(new TypeError('fetch failed'), {
+            cause: Object.assign(new Error('unable to get local issuer certificate'), {
+                code: 'UNABLE_TO_GET_ISSUER_CERT_LOCALLY',
+            }),
+        });
+        expect((0, login_1.parseNetworkFailureReason)(e)).toBe('UNABLE_TO_GET_ISSUER_CERT_LOCALLY: unable to get local issuer certificate');
+    });
+    it('falls back to the message when the cause carries no code', () => {
+        const e = Object.assign(new TypeError('fetch failed'), { cause: new Error('bad port') });
+        expect((0, login_1.parseNetworkFailureReason)(e)).toBe('bad port');
+    });
+    it('returns null for an API error so the caller still treats it as an expired token', () => {
+        expect((0, login_1.parseNetworkFailureReason)(new Error('Token expired'))).toBeNull();
+    });
+});
 describe('getVersionFromPackageJson', () => {
     it('should return the version value from package.json', () => {
         const version = (0, login_1.getVersionFromPackageJson)();

package/dist/commands/app/upgrade.js

@@ -95,10 +95,6 @@ async function upgradeAndWait(appOrgToUpgrade, versionToUpgrade) {
             entityName: 'app-org',
             id: appOrgToUpgrade.id,
         });
-        if (appStillUpgrading.status === 'READY' && appStillUpgrading.lastInstallError) {
-            logger_1.default.info(`${chalk_1.default.red.bold('APP UPGRADE')} ${appStillUpgrading.lastInstallError}`);
-            return;
-        }
         if (appStillUpgrading.status === 'READY') {
             logger_1.default.info(`${chalk_1.default.green.bold('APP UPGRADE')} App Upgraded`);
             return;

package/dist/interfaces.d.ts

@@ -168,7 +168,6 @@ export interface AppOrg {
     appVersion?: AppVersion;
     apiKey?: AppApiKey;
     appConfig?: any;
-    lastInstallError?: string;
 }
 export interface Webhook {
     id?: string;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.5-alpha.a73fd77",
+  "version": "3.5.5-alpha.cb68c04",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

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

package/dist/commands/app/upgrade.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/commands/app/upgrade.spec.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const get = jest.fn();
-const update = jest.fn();
-const info = jest.fn();
-jest.mock('@contrail/sdk', () => ({
-    Auth: jest.fn(),
-    Entities: jest.fn(() => ({
-        get: (...args) => get(...args),
-        update: (...args) => update(...args),
-    })),
-}));
-jest.mock('../../common', () => ({ delay: () => Promise.resolve() }));
-jest.mock('../../logger', () => ({ info: (...args) => info(...args) }));
-const upgrade_1 = require("./upgrade");
-describe('upgradeAndWait', () => {
-    beforeEach(() => {
-        get.mockReset();
-        update.mockReset().mockResolvedValue({});
-        info.mockReset();
-    });
-    it('should report success once the app is ready', async () => {
-        get.mockResolvedValue({ status: 'READY' });
-        await (0, upgrade_1.upgradeAndWait)({ id: 'app-org-1' }, 'version-2');
-        expect(info).toHaveBeenLastCalledWith(expect.stringContaining('App Upgraded'));
-    });
-    it('should report why the upgrade was reverted instead of calling it upgraded', async () => {
-        get.mockResolvedValue({
-            status: 'READY',
-            lastInstallError: '1.0.1 could not finish installing (template write failed); reverted to 1.0.0',
-        });
-        await (0, upgrade_1.upgradeAndWait)({ id: 'app-org-1' }, 'version-2');
-        expect(info).toHaveBeenLastCalledWith(expect.stringContaining('reverted to 1.0.0'));
-        expect(info).not.toHaveBeenCalledWith(expect.stringContaining('App Upgraded'));
-    });
-});