rolling back pageres changes in favour of a separate cli for CI-mode

NetRock6 · Oct 24, 2020 · 3442ecd · 3442ecd
1 parent bb71529
commit 3442ecd
Show file tree

Hide file tree

Showing 4 changed files with 105 additions and 2,207 deletions.
diff --git a/graph/Vis.js b/graph/Vis.js
@@ -8,7 +8,6 @@ const path = require("path");
 const open = require("open");
 const ColorHash = require("color-hash");
 const { yamlParse, yamlDump } = require("yaml-cfn");
-const Pageres = require('pageres');
 
 const colorHash = new ColorHash();
 let nodes = [];
@@ -158,7 +157,7 @@ function pathToDescriptor(path) {
   return path.split(".").slice(-1)[0];
 }
 
-async function renderTemplate(template, isJson, filePath, outputType, imagePath) {
+async function renderTemplate(template, isJson, filePath, ciMode) {
   useJson = isJson;
   const { nodes, edges } = makeGraph(template, "root");
   const fileContent = `
@@ -167,7 +166,7 @@ async function renderTemplate(template, isJson, filePath, outputType, imagePath)
   var edges = new vis.DataSet(${JSON.stringify(edges)});
   var nested = ${JSON.stringify(nested.sort())};
   var types = ${JSON.stringify(Array.from(types).sort())};
-  var showSidebar = ${outputType === "html"};
+  var showSidebar = ${!ciMode};
   `;
   const uiPath = filePath || path.join(tempDirectory, "cfn-diagram");
   if (!fs.existsSync(uiPath)) {
@@ -182,14 +181,9 @@ async function renderTemplate(template, isJson, filePath, outputType, imagePath)
     path.join(uiPath, "icons.js")
   );
   fs.writeFileSync(path.join(uiPath, "data.js"), fileContent);
-  if (outputType === "html") {
+  if (!ciMode) {
     open(path.join(uiPath, "index.html"));
-  } else {
-    await new Pageres({filename: "cfn-diagram"})
-		.src(`file://${path.join(uiPath, "index.html")}`, ['1024x768'], {crop: true})
-		.dest(imagePath)
-		.run()
-  }
+  } 
 }
 
 module.exports = {

diff --git a/index.js b/index.js
@@ -19,6 +19,8 @@ const actionOption = {
   EdgeLabels: "Edge labels: On",
 };
 
+let ciMode = false;
+
 program.version(package.version, "-v, --vers", "output the current version");
 
 program
@@ -29,9 +31,16 @@ program
     "Path to template",
     "template.yaml"
   )
+  .option(
+    "-c, --ci-mode",
+    "Disable interactivity",
+    false
+  )
   .option("-o, --output-file [outputFile]", "Output file", "template.drawio")
   .description("Generates a draw.io diagram from a CloudFormation template")
   .action(async (cmd) => {
+    ciMode = cmd.ciMode;
+
     await generate(cmd);
   });
 program
@@ -43,44 +52,34 @@ program
     "template.yaml"
   )
   .option(
-    "-o, --output-path [outputPath]",
-    "Output file",
-    `${path.join(tempDirectory, "cfn-diagram")}`
-  )
-  .description("Generates a vis.js diagram from a CloudFormation template")
-  .action(async (cmd) => {
-    const template = getTemplate(cmd);
-    await Vis.renderTemplate(template.template, template.isJson, cmd.outputPath, "html");
-  });
-program
-  .command("image")
-  .alias("i")
-  .option(
-    "-t, --template-file [templateFile]",
-    "Path to template",
-    "template.yaml"
+    "-c, --ci-mode",
+    "Disable interactivity",
+    false
   )
   .option(
     "-o, --output-path [outputPath]",
-    "Output path",
-    `./`
+    "Output file",
+    `${path.join(tempDirectory, "cfn-diagram")}`
   )
   .description("Generates a vis.js diagram from a CloudFormation template")
   .action(async (cmd) => {
+    ciMode = cmd.ciMode;
     const template = getTemplate(cmd);
-    await Vis.renderTemplate(template.template, template.isJson, `${path.join(tempDirectory, "cfn-diagram")}`, "image", cmd.outputPath);
+    await Vis.renderTemplate(template.template, template.isJson, cmd.outputPath, ciMode);
   });
-program
+
+  program
   .command("generate")
   .alias("g")
   .option(
     "-t, --template-file [templateFile]",
     "Path to template",
     "template.yaml"
-  )
+  )  
   .option("-o, --output-file [outputFile]", "Output file", "template.drawio")
   .description("[Deprected] Same as draw.io. Kept for backward compatability")
   .action(async (cmd) => {
+    console.log("Command is deprecated and will be removed. Please use `cfn-dia draw.io` instead.")
     await generate(cmd);
   });
 
@@ -98,6 +97,11 @@ async function generate(cmd) {
   let edgeMode = { answer: "On" };
   let actionChoice = {};
   console.log("Writing diagram to ./template.drawio");
+
+  if (ciMode) {
+    return;
+  }
+
   console.log("Press CTRL+C to exit");
   while (true) {
     filterConfig.resourceNamesToInclude = resourceNames.answer;