fix: badly formatted event pattern in evb-diagram, replay bug, prettier code bindings

Author: ljacobsson

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@mhlabs/evb-cli",
-  "version": "1.1.38",
+  "version": "1.1.39",
   "description": "A package for building EventBridge/CloudWatch Events patterns",
   "main": "index.js",
   "scripts": {
@@ -15,7 +15,7 @@
   "dependencies": {
     "@mhlabs/aws-sdk-sso": "^0.0.16",
     "aws-sdk": "^2.853.0",
-    "axios": "^0.21.1",
+    "axios": "^0.21.4",
     "cli-spinner": "^0.2.10",
     "commander": "^4.1.1",
     "date-prompt": "^1.0.0",

package.json

@@ -1,24 +1,24 @@
 const schemaBrowser = require("../shared/schema-browser");
 const inputUtil = require("../shared/input-util");
 const templateParser = require("../shared/template-parser");
-const program = require("commander");
 const SchemasClient = require("aws-sdk/clients/schemas");
 const schemas = new SchemasClient();
-const authHelper = require("../shared/auth-helper");
 const jsf = require("json-schema-faker");
 const jp = require("jsonpath");
 const toJsonSchema = require("to-json-schema");
 const fs = require("fs");
 const {
   quicktype,
   InputData,
-  jsonInputForTargetLanguage,
   JSONSchemaInput,
   JSONSchemaStore,
-  TargetLanguage,
 } = require("quicktype-core");
 const languages = require("quicktype-core/dist/language/All");
-
+require("./languages/csharp");
+require("./languages/typescript");
+require("./languages/python");
+require("./languages/java");
+require("./languages/swift");
 async function loadFromRegistry(cmd) {
   const schemaLocation = await schemaBrowser.getSchemaName(schemas);
   const schema = await schemas

src/commands/code-binding/code-binding.js

@@ -7,6 +7,7 @@ program
   .alias("cb")
   .option("-t, --template [template]", "Path to template file")
   .option("-n, --type-name [typeName]", "Type name", "MyType")
+  .option("-p, --profile [profile]", "AWS profile to use")
   .option(
     "-o, --output-file [outputFile]",
     "Output file name. Writes to std out if skipped"

src/commands/code-binding/index.js

@@ -37,7 +37,7 @@
 
     <script type="text/javascript">
       let network;
-      let token = uuidv4();      
+      let token = uuidv4();
       let socket;
       const rule = {
         EventPattern: '{"source":["aws.events"]}',
@@ -71,6 +71,9 @@
       function draw() {
         // create a network
         var container = document.getElementById("mynetwork");
+        edges.forEach((edge) => {
+          edge.title = preTitle(edge.title);
+        });
         var data = {
           nodes: nodes,
           edges: edges,
@@ -106,7 +109,7 @@
           },
         };
         network = new vis.Network(container, data, options);
-        network.on("selectEdge", function (params) {          
+        network.on("selectEdge", function (params) {
           if (socket) {
             socket.close();
           }
@@ -227,6 +230,12 @@
         }
       }
 
+      function preTitle(text) {
+        const container = document.createElement("pre");
+        container.innerText = text;
+        return container;
+      }
+
       function groupByTag(event) {
         const tag = event.target.value;
         nodes = new vis.DataSet(nodes.get({ filter: (p) => !p.tagRelation }));
@@ -282,7 +291,9 @@
     >:<select id="tagFilterValue"></select>
     <div id="mynetwork"></div>
     <div id="wssOutput">
-      <div>Event feed:<br>Click on a connection to subscribe to its events</div>
+      <div>
+        Event feed:<br />Click on a connection to subscribe to its events
+      </div>
       <pre id="feed"></pre>
     </div>
   </body>

src/commands/diagram/diagram-builder.js

@@ -63,7 +63,7 @@ async function initLocalPatternListener(
   let rules = [];
   for (const resourceKey of Object.keys(template.Resources)) {
     const resource = template.Resources[resourceKey];
-    templateParser.handleSAMFunction(resource, rules, resourceKey, replaySettings);
+    templateParser.handleSAMResource(resource, rules, resourceKey, replaySettings);
     templateParser.handleEventsRule(resource, rules, resourceKey, replaySettings);
     rules = rules.sort((a, b) => a.Name > b.Name);
   }

src/commands/diagram/ui/index.html

@@ -1,8 +1,8 @@
 const { replay } = require("../shared/archive-util");
 
-function handleSAMFunction(resource, rules, resourceKey, replaySettings) {
+function handleSAMResource(resource, rules, resourceKey, replaySettings) {
   if (
-    resource.Type === "AWS::Serverless::Function" &&
+    (resource.Type === "AWS::Serverless::Function" || resource.Type === "AWS::Serverless::StateMachine") &&
     resource.Properties &&
     resource.Properties.Events
   ) {
@@ -62,5 +62,5 @@ function handleEventsRule(resource, rules, resourceKey, replaySettings) {
 
 module.exports = {
   handleEventsRule,
-  handleSAMFunction,
+  handleSAMResource,
 };

src/commands/local/listeners/localPatternListener.js

@@ -38,6 +38,7 @@ async function replayLambda(cmd) {
           config.FunctionEventInvokeConfigs.length &&
           config.FunctionEventInvokeConfigs[0].DestinationConfig &&
           config.FunctionEventInvokeConfigs[0].DestinationConfig.OnFailure &&
+          config.FunctionEventInvokeConfigs[0].DestinationConfig.OnFailure.Destination &&
           config.FunctionEventInvokeConfigs[0].DestinationConfig.OnFailure.Destination.startsWith(
             "arn:aws:events:"
           )
@@ -53,7 +54,7 @@ async function replayLambda(cmd) {
   let functionConfig;
 
   if (destinations.length > 1) {
-    functionConfig = inputUtil.selectFrom(
+    functionConfig = await inputUtil.selectFrom(
       destinations.map((d) => {
         return {
           name: d.FunctionEventInvokeConfigs[0].FunctionArn.split(":").slice(