@trayio/cdk-cli 4.19.0 → 4.20.0

package/README.md

@@ -19,7 +19,7 @@ $ npm install -g @trayio/cdk-cli
 $ tray-cdk COMMAND
 running command...
 $ tray-cdk (--version|-v)
-@trayio/cdk-cli/4.19.0 linux-x64 node-v18.20.3
+@trayio/cdk-cli/4.20.0 linux-x64 node-v18.20.3
 $ tray-cdk --help [COMMAND]
 USAGE
   $ tray-cdk COMMAND

package/dist/commands/deployment/get.d.ts

@@ -14,7 +14,6 @@ export default class Get extends Command {
     };
     static examples: string[];
     private regionHandler;
-    private generateConnectorDeploymentId;
     private pollConnectorDeploymentStatus;
     private getLocalConnectorInfo;
     run(): Promise<void>;

package/dist/commands/deployment/get.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/commands/deployment/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAmB,MAAM,aAAa,CAAC;AAiBvD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,OAAO;IACvC,MAAM,CAAC,WAAW,SAAoD;IAEtE,MAAM,CAAC,IAAI;;;;MAiBT;IAEF,MAAM,CAAC,KAAK;;;;;MAOV;IAEF,MAAM,CAAC,QAAQ,WAUb;IAEF,OAAO,CAAC,aAAa,CAGnB;IAEF,OAAO,CAAC,6BAA6B,CAGmC;IAExE,OAAO,CAAC,6BAA6B,CAgCnC;IAEF,OAAO,CAAC,qBAAqB,CAe3B;IAEI,GAAG;CAuFT"}
+{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/commands/deployment/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAmB,MAAM,aAAa,CAAC;AAiBvD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,OAAO;IACvC,MAAM,CAAC,WAAW,SAAoD;IAEtE,MAAM,CAAC,IAAI;;;;MAiBT;IAEF,MAAM,CAAC,KAAK;;;;;MAOV;IAEF,MAAM,CAAC,QAAQ,WAUb;IAEF,OAAO,CAAC,aAAa,CAGnB;IAEF,OAAO,CAAC,6BAA6B,CAgCnC;IAEF,OAAO,CAAC,qBAAqB,CAe3B;IAEI,GAAG;CAiGT"}

package/dist/commands/deployment/get.js

@@ -29,7 +29,6 @@ const fse = __importStar(require("fs-extra"));
 const AxiosHttpClient_1 = require("@trayio/axios/http/AxiosHttpClient");
 const ConnectorDeploymentHttpClient_1 = require("@trayio/tray-client/connector/deployment/ConnectorDeploymentHttpClient");
 const ConnectorDeploymentApi_1 = require("@trayio/tray-api/connector/deployment/ConnectorDeploymentApi");
-const uuid_1 = require("uuid");
 const region_1 = require("../../utils/region");
 const colorizeString_1 = require("../../utils/colorizeString");
 const check_env_1 = require("../../utils/check-env");
@@ -71,7 +70,6 @@ class Get extends core_1.Command {
         `<%= config.bin %> <%= command.id %> my-connector 1.0 3f1de598-d405-4801-9eec-6fe79e8393d3 -t`,
     ];
     regionHandler = new region_1.RegionHandler(ConnectorDeploymentHttpClient_1.ConnectorDeploymentHttpClient, new AxiosHttpClient_1.AxiosHttpClient());
-    generateConnectorDeploymentId = (connectorName, connectorVersion) => (0, uuid_1.v5)(`${connectorName}-${connectorVersion}`, uuid_1.v5.URL);
     pollConnectorDeploymentStatus = async (connectorName, connectorVersion, id, token, flags) => {
         const input = {
             connectorName,
@@ -117,8 +115,8 @@ class Get extends core_1.Command {
         const input = {
             connectorName: args.connectorName,
             connectorVersion: args.connectorVersion,
-            id: args.uuid ||
-                this.generateConnectorDeploymentId(args.connectorName, args.connectorVersion),
+            // TODO: we'll need to require the id once we enable queued deployments
+            id: args.uuid || '',
             token: TRAY_API_TOKEN,
         };
         let response;
@@ -133,6 +131,12 @@ class Get extends core_1.Command {
         core_1.ux.action.stop();
         if (response.isSuccess) {
             switch (response.value.deploymentStatus) {
+                case ConnectorDeploymentApi_1.ConnectorDeploymentStatus.Building:
+                    this.log((0, colorizeString_1.info)(`Connector is currently being built, this could take a few minutes. Please check the connector status again later.`));
+                    break;
+                case ConnectorDeploymentApi_1.ConnectorDeploymentStatus.BuildFailed:
+                    this.log((0, colorizeString_1.error)(`Connector Build Failed, please try again or contact support`));
+                    break;
                 case ConnectorDeploymentApi_1.ConnectorDeploymentStatus.Deploying:
                     this.log((0, colorizeString_1.info)(`Connector is currently being deployed, this could take a few minutes. Please check the connector status again later.`));
                     break;
@@ -148,7 +152,7 @@ class Get extends core_1.Command {
             }
         }
         if (response.isFailure) {
-            this.log((0, colorizeString_1.error)(`Connector Deploy Failed, please try again or contact support`));
+            this.log((0, colorizeString_1.error)(`There was an error checking the deployment status, please try again or contact support`));
             this.log(response.error.message);
         }
     }

package/dist/commands/deployment/get.unit.test.js

@@ -47,6 +47,24 @@ describe('GetDeploymentStatus', () => {
     afterAll(() => {
         jest.clearAllMocks();
     });
+    it('should log success message when connector is building', async () => {
+        status = ConnectorDeploymentApi_1.ConnectorDeploymentStatus.Building;
+        const uxStartSpy = jest.spyOn(core_1.ux.action, 'start');
+        stdout_stderr_1.stdout.start();
+        await get_1.default.run([connectorName, connectorVersion, uuid]);
+        stdout_stderr_1.stdout.stop();
+        expect(uxStartSpy).toHaveBeenCalledWith(`Checking the connector deployment status`);
+        expect(stdout_stderr_1.stdout.output).toEqual(expect.stringContaining('Connector is currently being built, this could take a few minutes. Please check the connector status again later.'));
+    });
+    it('should log failed message when connector fails to build', async () => {
+        status = ConnectorDeploymentApi_1.ConnectorDeploymentStatus.BuildFailed;
+        const uxStartSpy = jest.spyOn(core_1.ux.action, 'start');
+        stdout_stderr_1.stdout.start();
+        await get_1.default.run([connectorName, connectorVersion, uuid]);
+        stdout_stderr_1.stdout.stop();
+        expect(uxStartSpy).toHaveBeenCalledWith(`Checking the connector deployment status`);
+        expect(stdout_stderr_1.stdout.output).toEqual(expect.stringContaining('Connector Build Failed, please try again or contact support'));
+    });
     it('should log success message when connector is deployed', async () => {
         status = ConnectorDeploymentApi_1.ConnectorDeploymentStatus.Deployed;
         const uxStartSpy = jest.spyOn(core_1.ux.action, 'start');
@@ -77,7 +95,7 @@ describe('GetDeploymentStatus', () => {
         stdout_stderr_1.stdout.start();
         await get_1.default.run([connectorName, connectorVersion, uuid]);
         stdout_stderr_1.stdout.stop();
-        expect(stdout_stderr_1.stdout.output).toEqual(expect.stringContaining('Connector Deploy Failed, please try again or contact support'));
+        expect(stdout_stderr_1.stdout.output).toEqual(expect.stringContaining('There was an error checking the deployment status, please try again or contact support'));
         expect(stdout_stderr_1.stdout.output).toEqual(expect.stringContaining('There was an error fetching deployment status'));
     });
     it('should run the polling function when tail flag is set', async () => {

package/oclif.manifest.json

@@ -430,5 +430,5 @@
       ]
     }
   },
-  "version": "4.19.0"
+  "version": "4.20.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayio/cdk-cli",
-  "version": "4.19.0",
+  "version": "4.20.0",
   "description": "A CLI for connector development",
   "exports": {
     "./*": "./dist/*.js"
@@ -20,12 +20,12 @@
     "@oclif/plugin-plugins": "^5",
     "@oclif/plugin-version": "2.0.11",
     "@oclif/test": "3.1.12",
-    "@trayio/axios": "4.19.0",
-    "@trayio/cdk-build": "4.19.0",
-    "@trayio/commons": "4.19.0",
-    "@trayio/generator": "4.19.0",
-    "@trayio/tray-client": "4.19.0",
-    "@trayio/tray-openapi": "4.19.0",
+    "@trayio/axios": "4.20.0",
+    "@trayio/cdk-build": "4.20.0",
+    "@trayio/commons": "4.20.0",
+    "@trayio/generator": "4.20.0",
+    "@trayio/tray-client": "4.20.0",
+    "@trayio/tray-openapi": "4.20.0",
     "chalk": "4.1.2",
     "inquirer": "8.2.6"
   },