🚀 feature: support aws group resources

README_MAIN.md

@@ -32,7 +32,8 @@ pdm add <your-path>/diagrams-ext/dist/diagrams-0.23.5a0-py3-none-any.whl
   - ~~<https://github.com/mingrammer/diagrams/pull/439>~~
   - ~~<https://github.com/mingrammer/diagrams/pull/438>~~
 - [ ] overlapping cluster: <https://github.com/mingrammer/diagrams/issues/852>
-- [ ] edge attr: <https://github.com/mingrammer/diagrams/issues/560>
+- [x] edge attr: just input the attr as a string `**attrs: Dict`
+  - ~~<https://github.com/mingrammer/diagrams/issues/560>~~
 
 - [ ] read tfstate and generate graph
   - <https://github.com/cycloidio/inframap>

diagrams/aws/general.py

@@ -104,6 +104,64 @@ class Users(_General):
     _icon = "users.png"
 
 
+class Cloud(_General):
+    _icon = "aws-cloud.png"
+
+
+class Account(_General):
+    _icon = "aws-account.png"
+
+
+class Region(_General):
+    _icon = "region.png"
+
+
 # Aliases
 
 OfficeBuilding = GenericOfficeBuilding
+
+# Cluster
+
+from diagrams import Cluster
+
+
+class ClusterCloud(Cluster):
+    _icon_node = Cloud
+    _graph_attr = {
+        "bgcolor": "white",
+        "pencolor": "#F78E04",
+    }
+
+    def __init__(
+        self,
+        label: str = "cloud",
+        direction: str = "LR",
+    ):
+        super().__init__(label, direction, icon_node=self._icon_node, graph_attr=self._graph_attr)
+
+
+class ClusterAccount(Cluster):
+    _icon_node = Account
+    _graph_attr = {
+        "bgcolor": "white",
+        "pencolor": "#CD2264",
+    }
+
+    def __init__(
+        self,
+        label: str = "account",
+        direction: str = "LR",
+    ):
+        super().__init__(label, direction, icon_node=self._icon_node, graph_attr=self._graph_attr)
+
+
+class ClusterRegion(Cluster):
+    _icon_node = Region
+    _graph_attr = {"bgcolor": "white", "pencolor": "#147EBA", "style": "rounded,dashed"}
+
+    def __init__(
+        self,
+        label: str = "region",
+        direction: str = "LR",
+    ):
+        super().__init__(label, direction, icon_node=self._icon_node, graph_attr=self._graph_attr)

diagrams/aws/network.py

@@ -100,6 +100,14 @@ class PublicSubnet(_Network):
     _icon = "public-subnet.png"
 
 
+class SecureSubnet(_Network):
+    _icon = "secure-subnet.png"
+
+
+class IntraSubnet(_Network):
+    _icon = "intra-subnet.png"
+
+
 class Route53HostedZone(_Network):
     _icon = "route-53-hosted-zone.png"
 
@@ -168,3 +176,81 @@ class VpnGateway(_Network):
 CLB = ElbClassicLoadBalancer
 NLB = ElbNetworkLoadBalancer
 GAX = GlobalAccelerator
+
+# Cluster
+
+from diagrams import Cluster
+
+class ClusterVPC(Cluster):
+    _icon_node = VPC
+    _graph_attr = {
+        "bgcolor": "white",
+        "pencolor": "#8C4FFF",
+    }
+
+    def __init__(
+        self,
+        label: str = "vpc",
+        direction: str = "LR",
+    ):
+        super().__init__(label, direction, icon_node=self._icon_node, graph_attr=self._graph_attr)
+
+
+class ClusterPublicSubnet(Cluster):
+    _icon_node = PublicSubnet
+    _graph_attr = {
+        "bgcolor": "#F2F6E8",
+        "pencolor": "#7AA116",
+    }
+
+    def __init__(
+        self,
+        label: str = "public",
+        direction: str = "LR",
+    ):
+        super().__init__(label, direction, icon_node=self._icon_node, graph_attr=self._graph_attr)
+
+
+class ClusterPrivateSubnet(Cluster):
+    _icon_node = PrivateSubnet
+    _graph_attr = {
+        "bgcolor": "#E6F6F7",
+        "pencolor": "#00A4A6",
+    }
+
+    def __init__(
+        self,
+        label: str = "private",
+        direction: str = "LR",
+    ):
+        super().__init__(label, direction, icon_node=self._icon_node, graph_attr=self._graph_attr)
+
+
+class ClusterSecureSubnet(Cluster):
+    _icon_node = SecureSubnet
+    _graph_attr = {
+        "bgcolor": "#F8CECC",
+        "pencolor": "#B85450",
+    }
+
+    def __init__(
+        self,
+        label: str = "secure",
+        direction: str = "LR",
+    ):
+        super().__init__(label, direction, icon_node=self._icon_node, graph_attr=self._graph_attr)
+
+
+class ClusterIntraSubnet(Cluster):
+    _icon_node = IntraSubnet
+    _graph_attr = {
+        "bgcolor": "#FFE6CC",
+        "pencolor": "#D79B00",
+    }
+
+    def __init__(
+        self,
+        label: str = "intra",
+        direction: str = "LR",
+    ):
+        super().__init__(label, direction, icon_node=self._icon_node, graph_attr=self._graph_attr)