feat(cdk-graph): further improve graph filtering and diagrams

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

Hide file tree

Showing 32 changed files with 200 additions and 2,752 deletions.
diff --git a/packages/cdk-graph-plugin-diagram/src/internal/graphviz/theme/index.ts b/packages/cdk-graph-plugin-diagram/src/internal/graphviz/theme/index.ts
@@ -118,7 +118,7 @@ const DEFAULT_RENDERING: IGraphThemeRenderingInternal = {
   resourceIconMin: GraphThemeRenderingIconTarget.DATA,
   resourceIconMax: GraphThemeRenderingIconTarget.CATEGORY,
   cfnResourceIconMin: GraphThemeRenderingIconTarget.DATA,
-  cfnResourceIconMax: GraphThemeRenderingIconTarget.GENERAL,
+  cfnResourceIconMax: GraphThemeRenderingIconTarget.SERVICE,
 } as const;
 
 /** GraphTheme definition */

diff --git a/packages/cdk-graph-plugin-diagram/src/internal/utils/resource-images.ts b/packages/cdk-graph-plugin-diagram/src/internal/utils/resource-images.ts
@@ -8,10 +8,16 @@ import { GraphTheme, GraphThemeRenderingIconTarget } from "../graphviz/theme";
 export function resolveCfnResourceImage(
   node: Graph.CfnResourceNode
 ): string | undefined {
+  let min = GraphTheme.instance.rendering.resourceIconMin;
+  let max = GraphTheme.instance.rendering.resourceIconMax;
+  // lower max to general when wrapped cfn resource is rendered as wrapper will show service icon
+  if (node.resource?.isWrapper) {
+    min = GraphThemeRenderingIconTarget.SERVICE;
+  }
   return _resolveResourceLikeImage(
     node,
-    GraphTheme.instance.rendering.cfnResourceIconMin,
-    GraphTheme.instance.rendering.cfnResourceIconMax,
+    min,
+    max,
     GraphTheme.instance.awsTheme?.id
   );
 }

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/...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