fix(cdk-graph-plugin-diagram): cap svg size at 10k

aws · Mar 8, 2023 · 33ecda3 · 33ecda3
1 parent fc0a36a
commit 33ecda3
Show file tree

Hide file tree

Showing 26 changed files with 633 additions and 15 deletions.
diff --git a/packages/cdk-graph-plugin-diagram/src/internal/utils/svg.ts b/packages/cdk-graph-plugin-diagram/src/internal/utils/svg.ts
@@ -42,7 +42,8 @@ export async function convertSvgImageDefsFromSvgToPng(
     const png = sharp(
       AwsArchitecture.resolveAssetPath(
         AwsArchitecture.formatAssetPath(assetKey, "png")
-      )
+      ),
+      { limitInputPixels: false }
     );
     const pngBuffer = await png
       .resize({
@@ -66,7 +67,7 @@ export async function convertSvg(
   outputFile: string
 ): Promise<void> {
   const resolvedSvg = await convertSvgImageDefsFromSvgToPng(svgString);
-  await sharp(Buffer.from(resolvedSvg))
+  await sharp(Buffer.from(resolvedSvg), { limitInputPixels: false })
     .trim({ background: "transparent" })
     .toFile(outputFile);
 }
@@ -275,7 +276,7 @@ export function reconcileViewBox(svg: svgson.INode): string {
   };
 
   // Max allowed by sharp: https://github.com/lovell/sharp/blob/2c465282699432299c478ba00ab825e07d9bdab0/src/pipeline.cc#L288
-  const MAX_SVG = 32760; // 32767 is max, but leaving a small buffer
+  const MAX_SVG = 10000; // 32767 is max width & height in sharp, but capping at 10k for perf and downscale huge diagrams
 
   if (scaledViewBox.width && scaledViewBox.width > MAX_SVG) {
     const downscale = MAX_SVG / scaledViewBox.width;

diff --git a/...s/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/config/compact.png b/...s/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/config/compact.png
diff --git a/...s/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/config/default.png b/...s/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/config/default.png
diff --git a/...graph-plugin-diagram/test/graphviz/__image_snapshots__/config/focus-nohoist.png b/...graph-plugin-diagram/test/graphviz/__image_snapshots__/config/focus-nohoist.png
diff --git a/...s/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/config/verbose.png b/...s/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/config/verbose.png
diff --git a/...s/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/dot/all-stages.png b/...s/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/dot/all-stages.png
diff --git a/...es/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/dot/dev-stage.png b/...es/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/dot/dev-stage.png
diff --git a/.../cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/dot/multi-stack.png b/.../cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/dot/multi-stack.png
diff --git a/...s/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/dot/prod-stage.png b/...s/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/dot/prod-stage.png
diff --git a/...cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/dot/single-stack.png b/...cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/dot/single-stack.png
diff --git a/...gin-diagram/test/graphviz/__image_snapshots__/filter/filter-cfntype-exclude.png b/...gin-diagram/test/graphviz/__image_snapshots__/filter/filter-cfntype-exclude.png
diff --git a/...gin-diagram/test/graphviz/__image_snapshots__/filter/filter-cfntype-include.png b/...gin-diagram/test/graphviz/__image_snapshots__/filter/filter-cfntype-include.png
diff --git a/...in-diagram/test/graphviz/__image_snapshots__/filter/filter-nodetype-exclude.png b/...in-diagram/test/graphviz/__image_snapshots__/filter/filter-nodetype-exclude.png
diff --git a/...in-diagram/test/graphviz/__image_snapshots__/filter/filter-nodetype-include.png b/...in-diagram/test/graphviz/__image_snapshots__/filter/filter-nodetype-include.png
diff --git a/...ph-plugin-diagram/test/graphviz/__image_snapshots__/filter/filter-uncluster.png b/...ph-plugin-diagram/test/graphviz/__image_snapshots__/filter/filter-uncluster.png
diff --git a/...ugin-diagram/test/graphviz/__image_snapshots__/pdk-integ/pdk-integ-pipeline.png b/...ugin-diagram/test/graphviz/__image_snapshots__/pdk-integ/pdk-integ-pipeline.png
diff --git a/...-graph-plugin-diagram/test/graphviz/__image_snapshots__/theme/dark-services.png b/...-graph-plugin-diagram/test/graphviz/__image_snapshots__/theme/dark-services.png
diff --git a/...k-graph-plugin-diagram/test/graphviz/__image_snapshots__/theme/dark-verbose.png b/...k-graph-plugin-diagram/test/graphviz/__image_snapshots__/theme/dark-verbose.png
diff --git a/packages/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/theme/dark.png b/packages/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/theme/dark.png
diff --git a/...graph-plugin-diagram/test/graphviz/__image_snapshots__/theme/light-services.png b/...graph-plugin-diagram/test/graphviz/__image_snapshots__/theme/light-services.png
diff --git a/...-graph-plugin-diagram/test/graphviz/__image_snapshots__/theme/light-verbose.png b/...-graph-plugin-diagram/test/graphviz/__image_snapshots__/theme/light-verbose.png
diff --git a/...ages/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/theme/light.png b/...ages/cdk-graph-plugin-diagram/test/graphviz/__image_snapshots__/theme/light.png
diff --git a/packages/cdk-graph-plugin-diagram/test/graphviz/__snapshots__/config.test.ts.snap b/packages/cdk-graph-plugin-diagram/test/graphviz/__snapshots__/config.test.ts.snap