@contrail/cli 2.4.0-alpha → 2.4.0

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/2.4.0-alpha darwin-arm64 node-v22.3.0
+@contrail/cli/2.4.0 darwin-arm64 node-v21.7.1
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -174,10 +174,13 @@ Install an app from the marketplace
 
 ```
 USAGE
-  $ contrail app install [-i <value>] [-w]
+  $ contrail app install [-l error|warn|info|debug] [-e] [-i <value>] [-w]
 
 FLAGS
+  -e, --alwaysConfirmEnv          The Environment variables
   -i, --appIdentifier=<value>     The identifier of the app to install
+  -l, --logLevel=<option>         The Log Level
+                                  <options: error|warn|info|debug>
   -w, --installWorkflowTemplates  "Install the app's accompanying workflows"
 
 DESCRIPTION

package/dist/auth/login.d.ts

@@ -1,2 +1,2 @@
-import { AuthContext } from './auth';
+import { AuthContext } from '@contrail/sdk';
 export declare function authUser(): Promise<AuthContext>;

package/dist/auth/login.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const amazon_cognito_identity_js_1 = require("amazon-cognito-identity-js");
 const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const sdk_1 = require("@contrail/sdk");
-const auth_1 = require("./auth");
 const config_1 = require("../helpers/config/config");
 const logger_1 = tslib_1.__importDefault(require("../logger"));
 const CONFIGURATION = {
@@ -17,12 +16,12 @@ async function authUser() {
     const config = await (0, config_1.getConfig)();
     if (config && config.apiUserToken && config.apiGateway && config.orgSlug) {
         logger_1.default.debug('populating auth config from fs config...');
-        auth_1.Auth.config = {
+        const authConfig = {
             apiUserToken: config.apiUserToken,
             apiGateway: config.apiGateway,
             orgSlug: config.orgSlug,
         };
-        (0, sdk_1.setConfig)(auth_1.Auth.config);
+        (0, sdk_1.setConfig)(authConfig);
         try {
             return await refreshCurrentUserOrg();
         }
@@ -96,7 +95,6 @@ exports.authUser = authUser;
 async function setAuthContext(user, params) {
     const config = await (0, config_1.getConfig)();
     let apiGateway;
-    logger_1.default.info(config.environments);
     if (config.environments) {
         const questions = [];
         questions.push({
@@ -113,26 +111,32 @@ async function setAuthContext(user, params) {
         apiGateway = 'https://api.vibeiq.com/prod/api';
     }
     // Set Auth Config
-    auth_1.Auth.config = {
+    const authConfig = {
         apiUserToken: user.idToken.jwtToken,
         apiGateway,
         orgSlug: params.orgSlug,
     };
     // SET SDK CONFIG
-    (0, sdk_1.setConfig)(auth_1.Auth.config);
+    (0, sdk_1.setConfig)(authConfig);
     return refreshCurrentUserOrg();
 }
 async function refreshCurrentUserOrg() {
     logger_1.default.debug('refreshing current user org...');
     const currentUser = await (0, sdk_1.getCurrentUser)();
+    const sdkConfig = await (0, sdk_1.getConfig)();
     if (!currentUser) {
         throw Error('Could not get current user');
     }
-    const org = currentUser.orgs.find((o) => o.orgSlug === auth_1.Auth.config.orgSlug);
+    const org = currentUser.orgs.find((o) => o.orgSlug === sdkConfig.orgSlug);
     if (org) {
-        auth_1.Auth.config.orgId = org.orgId || org.id;
+        sdkConfig.orgId = org.orgId || org.id;
     }
     // cache config in the fs
-    await (0, config_1.storeConfig)(Object.assign({}, auth_1.Auth.config));
-    return Object.assign({}, auth_1.Auth.config);
+    await (0, config_1.storeConfig)(sdkConfig);
+    return {
+        apiUserToken: sdkConfig.apiUserToken,
+        apiGateway: sdkConfig.apiGateway,
+        orgSlug: sdkConfig.orgSlug,
+        orgId: sdkConfig.orgId,
+    };
 }

package/dist/basecommand.js

@@ -6,8 +6,8 @@ const core_1 = require("@oclif/core");
 const logger_1 = tslib_1.__importDefault(require("./logger"));
 const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const config_1 = require("./helpers/config/config");
-const auth_1 = require("@contrail/sdk/lib/auth/auth");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const sdk_1 = require("@contrail/sdk");
 class BaseCommand extends core_1.Command {
     static description = 'Global Flags';
     skipConfirmEnv = false;
@@ -69,7 +69,9 @@ class BaseCommand extends core_1.Command {
             });
             const { confirm } = await inquirer_1.default.prompt(questions);
             if (confirm === 'no') {
-                await (0, config_1.storeConfig)(Object.assign({ orgSlug: '', apiGateway: '' }, auth_1.Auth.config));
+                const emptyAuthConfig = { orgSlug: '', apiGateway: '' };
+                (0, sdk_1.setConfig)(emptyAuthConfig);
+                await (0, config_1.storeConfig)(emptyAuthConfig);
             }
         }
     }

package/dist/commands/app/create.d.ts

@@ -2,5 +2,9 @@ import { BaseCommand } from '../../basecommand';
 export default class CreateApp extends BaseCommand {
     static description: string;
     static examples: string[];
+    static baseFlags: {
+        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
     run(): Promise<void>;
 }

package/dist/commands/app/create.js

@@ -13,6 +13,9 @@ class CreateApp extends basecommand_1.BaseCommand {
         `$ contrail app create
 `,
     ];
+    static baseFlags = {
+        ...basecommand_1.BaseCommand.baseFlags,
+    };
     async run() {
         await (0, login_1.authUser)();
         const currentUser = await (0, sdk_1.getCurrentUser)();

package/dist/commands/app/install.d.ts

@@ -6,6 +6,8 @@ export default class InstallApp extends BaseCommand {
     static flags: {
         appIdentifier: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         installWorkflowTemplates: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/app/install.js

@@ -20,6 +20,7 @@ class InstallApp extends basecommand_1.BaseCommand {
     // variable argument length
     static strict = true;
     static flags = {
+        ...basecommand_1.BaseCommand.baseFlags,
         appIdentifier: core_1.Flags.string({
             char: 'i',
             description: 'The identifier of the app to install',

package/dist/helpers/app/app-template-parsers.d.ts

@@ -1,5 +1,5 @@
 import { ExternalLink } from '@contrail/entity-types';
-import { AppDeclaration, TriggerKeyDefinition, ConfigPropertyElements, AppAccessGrant } from '../../interfaces';
+import { AppDeclaration, ConfigPropertyElements, CreateAppAccessGrantDTO, TriggerKeyDefinition } from '../../interfaces';
 export declare class TriggerKeyDefinitionParser {
     static buildTriggersArray(appDeclaration: AppDeclaration): Array<TriggerKeyDefinition>;
 }
@@ -10,5 +10,5 @@ export declare class ExternalLinkParser {
     static validateAndGetExternalLinks(externalLinks: ExternalLink[]): ExternalLink[];
 }
 export declare class AccessGrantsParser {
-    static buildAccessGrants(appDeclaration: AppDeclaration): Promise<AppAccessGrant[]>;
+    static buildAccessGrants(appDeclaration: AppDeclaration): Promise<CreateAppAccessGrantDTO[]>;
 }

package/dist/helpers/app/app-template-parsers.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccessGrantsParser = exports.ExternalLinkParser = exports.ConfigPropertiesParser = exports.TriggerKeyDefinitionParser = void 0;
-const interfaces_1 = require("../../interfaces");
 const sdk_1 = require("@contrail/sdk");
+const interfaces_1 = require("../../interfaces");
 class TriggerKeyDefinitionParser {
     static buildTriggersArray(appDeclaration) {
         const triggers = [];
@@ -79,19 +79,23 @@ class AccessGrantsParser {
     static async buildAccessGrants(appDeclaration) {
         const accessGrants = [];
         const currentUser = await (0, sdk_1.getCurrentUser)();
-        let currentOrgId = sdk_1.Auth.config.orgId;
+        const config = (0, sdk_1.getConfig)();
+        let currentOrgId = config.orgId;
         if (!currentOrgId) {
-            let currentOrg = currentUser.orgs.find((o) => o.orgSlug === sdk_1.Auth.config.orgSlug);
+            let currentOrg = currentUser.orgs.find((o) => o.orgSlug === config.orgSlug);
             currentOrgId = currentOrg.orgId;
         }
-        const orgs = await new sdk_1.Entities().get({
-            entityName: 'org',
-        });
         for (const accessGrant of appDeclaration.accessGrants) {
-            const recipientOrg = orgs.find((o) => o.slug === accessGrant.orgSlug);
+            const recipientOrg = currentUser.orgs.find((o) => o.orgSlug === accessGrant.orgSlug);
+            if (!recipientOrg) {
+                throw new Error(`You don't have access to the ${accessGrant.orgSlug} organization`);
+            }
+            if (recipientOrg.role !== 'ADMIN') {
+                throw new Error(`Only administrators of the ${accessGrant.orgSlug} organization can share the app`);
+            }
             const grant = {
                 issuerReference: `org:${currentOrgId}`,
-                recipientReference: `org:${recipientOrg.id}`,
+                recipientReference: `org:${recipientOrg.orgId}`,
                 scope: interfaces_1.AppAccessGrantScope.install,
             };
             accessGrants.push(grant);

package/dist/interfaces.d.ts

@@ -32,11 +32,13 @@ export interface AccessGrantConfiguration {
     orgSlug: string;
     permissions: AppAccessPermission[];
 }
-export interface AppAccessGrant {
+export type CreateAppAccessGrantDTO = {
     issuerReference: string;
     recipientReference: string;
-    appId?: string;
     scope: AppAccessGrantScope;
+};
+export interface AppAccessGrant extends CreateAppAccessGrantDTO {
+    appId: string;
 }
 export declare enum AppAccessGrantScope {
     install = "INSTALL"

package/dist/templates/typescript/src/actions/logItem.ts

@@ -17,7 +17,7 @@ export class LogItemAction implements AppAction {
       entityName: 'item',
       id: event.id,
     });
-    console.log('Got item: ', item);
+    console.log('Got item: ', JSON.stringify(item, null, 2));
 
     return {
       output: {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.4.0-alpha",
+  "version": "2.4.0",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -13,7 +13,31 @@
         "$ contrail app create\n"
       ],
       "flags": {},
-      "args": {}
+      "args": {},
+      "baseFlags": {
+        "logLevel": {
+          "description": "The Log Level",
+          "required": false,
+          "char": "l",
+          "options": [
+            "error",
+            "warn",
+            "info",
+            "debug"
+          ],
+          "input": [],
+          "multiple": false,
+          "type": "option"
+        },
+        "alwaysConfirmEnv": {
+          "description": "The Environment variables",
+          "required": false,
+          "char": "e",
+          "default": true,
+          "allowNo": false,
+          "type": "boolean"
+        }
+      }
     },
     "app:delete": {
       "id": "app:delete",
@@ -78,6 +102,28 @@
         "$ contrail app install --appIdentifier @VibeIQ/Flex-PLM-Connector\n"
       ],
       "flags": {
+        "logLevel": {
+          "name": "logLevel",
+          "type": "option",
+          "char": "l",
+          "description": "The Log Level",
+          "required": false,
+          "multiple": false,
+          "options": [
+            "error",
+            "warn",
+            "info",
+            "debug"
+          ]
+        },
+        "alwaysConfirmEnv": {
+          "name": "alwaysConfirmEnv",
+          "type": "boolean",
+          "char": "e",
+          "description": "The Environment variables",
+          "required": false,
+          "allowNo": false
+        },
         "appIdentifier": {
           "name": "appIdentifier",
           "type": "option",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "2.4.0-alpha",
+  "version": "2.4.0",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",
@@ -23,7 +23,7 @@
   ],
   "dependencies": {
     "@contrail/entity-types": "^1.1.17",
-    "@contrail/sdk": "^1.3.12",
+    "@contrail/sdk": "1.4",
     "@contrail/types": "^3.0.48",
     "@contrail/util": "^1.0.41",
     "@oclif/core": "^2",
@@ -139,4 +139,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
+}

package/dist/auth/auth.d.ts

@@ -1,9 +0,0 @@
-export interface AuthContext {
-    apiUserToken: string;
-    apiGateway?: string;
-    orgSlug?: string;
-    orgId?: string;
-}
-export declare class Auth {
-    static config: AuthContext;
-}

package/dist/auth/auth.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Auth = void 0;
-class Auth {
-    static config;
-}
-exports.Auth = Auth;