@trayio/cdk-build 1.2.0 → 1.4.0

package/dist/connector/ConnectorBuilder.d.ts

@@ -1,10 +1,12 @@
 import * as TE from 'fp-ts/TaskEither';
 export declare class ConnectorBuilder {
     private operationSchemaGenerator;
+    private legacySchemaConverter;
     buildConnector(cdkProjectPath: string): TE.TaskEither<Error, undefined>;
     private generateSchemas;
     private generateConnectorsJson;
     private generatePackage;
+    private deleteSchemas;
     private getOperations;
 }
 //# sourceMappingURL=ConnectorBuilder.d.ts.map

package/dist/connector/ConnectorBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectorBuilder.d.ts","sourceRoot":"","sources":["../../src/connector/ConnectorBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AASvC,qBAAa,gBAAgB;IAC5B,OAAO,CAAC,wBAAwB,CAA2C;IAE3E,cAAc,CAAC,cAAc,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC;IAQvE,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,sBAAsB;IA8D9B,OAAO,CAAC,eAAe;IA0CvB,OAAO,CAAC,aAAa;CAUrB"}
+{"version":3,"file":"ConnectorBuilder.d.ts","sourceRoot":"","sources":["../../src/connector/ConnectorBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAUvC,qBAAa,gBAAgB;IAC5B,OAAO,CAAC,wBAAwB,CAA2C;IAC3E,OAAO,CAAC,qBAAqB,CAAmC;IAEhE,cAAc,CAAC,cAAc,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC;IASvE,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,sBAAsB;IAmE9B,OAAO,CAAC,eAAe;IAoDvB,OAAO,CAAC,aAAa;IAsCrB,OAAO,CAAC,aAAa;CAUrB"}

package/dist/connector/ConnectorBuilder.js

@@ -34,13 +34,15 @@ const Array_1 = require("fp-ts/Array");
 const pathLib = __importStar(require("path"));
 const fse = __importStar(require("fs-extra"));
 const adm_zip_1 = __importDefault(require("adm-zip"));
+const LegacyTraySchemaConverter_1 = require("@trayio/tray-schema/schema/LegacyTraySchemaConverter");
 const ConnectorOperationSchemaGenerator_1 = require("./operation/ConnectorOperationSchemaGenerator");
 class ConnectorBuilder {
     constructor() {
         this.operationSchemaGenerator = new ConnectorOperationSchemaGenerator_1.ConnectorOperationSchemaGenerator();
+        this.legacySchemaConverter = new LegacyTraySchemaConverter_1.LegacyTraySchemaConverter();
     }
     buildConnector(cdkProjectPath) {
-        return (0, function_1.pipe)(this.generateSchemas(cdkProjectPath), TE.chain(() => this.generateConnectorsJson(cdkProjectPath)), TE.chain(() => this.generatePackage(cdkProjectPath)));
+        return (0, function_1.pipe)(this.generateSchemas(cdkProjectPath), TE.chain(() => this.generateConnectorsJson(cdkProjectPath)), TE.chain(() => this.generatePackage(cdkProjectPath)), TE.chain(() => this.deleteSchemas(cdkProjectPath)));
     }
     generateSchemas(cdkProjectPath) {
         const operations = this.getOperations(cdkProjectPath);
@@ -53,7 +55,6 @@ class ConnectorBuilder {
     generateConnectorsJson(cdkProjectPath) {
         const operations = this.getOperations(cdkProjectPath);
         const operationEntries = operations.map((operation) => {
-            console.log(`Generating schemas for operation ${operation}`); // TODO: Remove this and use a logger
             const operationPath = pathLib.join(cdkProjectPath, 'src', operation);
             const operationJsonPath = pathLib.join(operationPath, 'operation.json');
             const inputJsonPath = pathLib.join(operationPath, 'input.json');
@@ -61,11 +62,11 @@ class ConnectorBuilder {
             const responseJsonPath = pathLib.join(operationPath, 'response.json');
             // TODO: use DynamicType and safecasts
             const operationJson = fse.readJsonSync(operationJsonPath);
-            const inputJson = fse.readJsonSync(inputJsonPath);
-            const outputJson = fse.readJsonSync(outputJsonPath);
+            const inputJson = this.legacySchemaConverter.convertToLegacySchema(fse.readJsonSync(inputJsonPath));
+            const outputJson = this.legacySchemaConverter.convertToLegacySchema(fse.readJsonSync(outputJsonPath));
             const responseJsonOpt = (0, function_1.pipe)(O.fromPredicate((path) => fse.existsSync(path))(responseJsonPath), O.map((path) => fse.readJSONSync(path)));
             const completeOperationJson = Object.assign(Object.assign({}, operationJson), { name: operation, input_schema: inputJson, output_schema: outputJson });
-            return (0, function_1.pipe)(responseJsonOpt, O.map((responseJson) => (Object.assign(Object.assign({}, completeOperationJson), { reply_schema: responseJson }))), O.getOrElse(() => completeOperationJson));
+            return (0, function_1.pipe)(responseJsonOpt, O.map((responseJson) => (Object.assign(Object.assign({}, completeOperationJson), { reply_schema: this.legacySchemaConverter.convertToLegacySchema(responseJson) }))), O.getOrElse(() => completeOperationJson));
         });
         const connectorJsonPath = pathLib.join(cdkProjectPath, 'connector.json');
         const connectorJson = fse.readJsonSync(connectorJsonPath);
@@ -83,6 +84,13 @@ class ConnectorBuilder {
         const connectorJson = fse.readJsonSync(connectorJsonPath);
         const connectorPackage = new adm_zip_1.default();
         connectorPackage.addLocalFolder(pathLib.join(cdkProjectPath, 'src'), pathLib.join(connectorJson.name, 'src'));
+        const entries = connectorPackage.getEntries();
+        // exclude all the ctx.json files from the zip as it can contain sensitive information
+        for (const entry of entries) {
+            if (entry.entryName.endsWith('.ctx.json')) {
+                connectorPackage.deleteFile(entry.entryName);
+            }
+        }
         connectorPackage.addLocalFile(pathLib.join(cdkProjectPath, 'package.json'), connectorJson.name);
         connectorPackage.addLocalFile(pathLib.join(cdkProjectPath, 'tsconfig.json'), connectorJson.name);
         connectorPackage.addLocalFile(pathLib.join(cdkProjectPath, 'jest.config.js'), connectorJson.name);
@@ -91,6 +99,23 @@ class ConnectorBuilder {
         connectorPackage.writeZip(connectorPackagePath);
         return TE.right(undefined);
     }
+    deleteSchemas(cdkProjectPath) {
+        const operations = this.getOperations(cdkProjectPath);
+        return (0, function_1.pipe)((0, Array_1.traverse)(TE.ApplicativeSeq)((operation) => {
+            const operationPath = pathLib.join(cdkProjectPath, 'src', operation);
+            const inputJsonPath = pathLib.join(operationPath, 'input.json');
+            const outputJsonPath = pathLib.join(operationPath, 'output.json');
+            const responseJsonPath = pathLib.join(operationPath, 'response.json');
+            const deleteInputJson = TE.tryCatch(() => fse.remove(inputJsonPath), (reason) => new Error(String(reason)));
+            const deleteOutputJson = TE.tryCatch(() => fse.remove(outputJsonPath), (reason) => new Error(String(reason)));
+            const deleteResponseJson = TE.tryCatch(() => fse.remove(responseJsonPath), (reason) => new Error(String(reason)));
+            return (0, function_1.pipe)(TE.sequenceArray([
+                deleteInputJson,
+                deleteOutputJson,
+                deleteResponseJson,
+            ]), TE.map(() => undefined));
+        })(operations), TE.map(() => undefined));
+    }
     getOperations(cdkProjectPath) {
         const srcPath = pathLib.join(cdkProjectPath, 'src');
         const srcEntries = fse.readdirSync(srcPath, { withFileTypes: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayio/cdk-build",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "Build utilities for CDK projects",
   "exports": {
     "./*": "./dist/*.js"
@@ -14,8 +14,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@trayio/commons": "1.2.0",
-    "@trayio/tray-schema": "1.2.0",
+    "@trayio/commons": "1.4.0",
+    "@trayio/tray-schema": "1.4.0",
     "adm-zip": "0.5.10"
   },
   "typesVersions": {