diff --git a/diagrams/aws/analytics.py b/diagrams/aws/analytics.py
index d37377d9..883dda91 100644
--- a/diagrams/aws/analytics.py
+++ b/diagrams/aws/analytics.py
@@ -104,6 +104,10 @@ class ManagedStreamingForKafka(_Analytics):
_icon = "managed-streaming-for-kafka.png"
+class Opensearch(_Analytics):
+ _icon = "opensearch.png"
+
+
class Quicksight(_Analytics):
_icon = "quicksight.png"
diff --git a/diagrams/aws/devtools.py b/diagrams/aws/devtools.py
index 0f674ddb..d6458e5a 100644
--- a/diagrams/aws/devtools.py
+++ b/diagrams/aws/devtools.py
@@ -20,6 +20,10 @@ class Cloud9(_Devtools):
_icon = "cloud9.png"
+class Codeartifact(_Devtools):
+ _icon = "codeartifact.png"
+
+
class Codebuild(_Devtools):
_icon = "codebuild.png"
diff --git a/diagrams/aws/management.py b/diagrams/aws/management.py
index 82ab7b9b..641ab241 100644
--- a/diagrams/aws/management.py
+++ b/diagrams/aws/management.py
@@ -84,6 +84,10 @@ class ControlTower(_Management):
_icon = "control-tower.png"
+class DevopsGuru(_Management):
+ _icon = "devops-guru.png"
+
+
class LicenseManager(_Management):
_icon = "license-manager.png"
@@ -152,6 +156,10 @@ class PersonalHealthDashboard(_Management):
_icon = "personal-health-dashboard.png"
+class Proton(_Management):
+ _icon = "proton.png"
+
+
class ServiceCatalog(_Management):
_icon = "service-catalog.png"
diff --git a/diagrams/aws/network.py b/diagrams/aws/network.py
index aa389f99..e9291a5e 100644
--- a/diagrams/aws/network.py
+++ b/diagrams/aws/network.py
@@ -84,6 +84,10 @@ class NATGateway(_Network):
_icon = "nat-gateway.png"
+class NetworkFirewall(_Network):
+ _icon = "network-firewall.png"
+
+
class NetworkingAndContentDelivery(_Network):
_icon = "networking-and-content-delivery.png"
diff --git a/diagrams/c4/__init__.py b/diagrams/c4/__init__.py
index 90ce7a92..f53a65bc 100644
--- a/diagrams/c4/__init__.py
+++ b/diagrams/c4/__init__.py
@@ -1,6 +1,7 @@
"""
A set of nodes and edges to visualize software architecture using the C4 model.
"""
+
import html
import textwrap
from diagrams import Cluster, Node, Edge
diff --git a/docs/nodes/aws.md b/docs/nodes/aws.md
index 1196ef66..c073599d 100644
--- a/docs/nodes/aws.md
+++ b/docs/nodes/aws.md
@@ -80,6 +80,9 @@ Node classes list of the aws provider.
**diagrams.aws.analytics.ManagedStreamingForKafka**
+
+**diagrams.aws.analytics.Opensearch**
+
**diagrams.aws.analytics.Quicksight**
@@ -389,6 +392,9 @@ Node classes list of the aws provider.
**diagrams.aws.devtools.Cloud9**
+
+**diagrams.aws.devtools.Codeartifact**
+
**diagrams.aws.devtools.Codebuild**
@@ -857,6 +863,9 @@ Node classes list of the aws provider.
**diagrams.aws.management.ControlTower**
+
+**diagrams.aws.management.DevopsGuru**
+
**diagrams.aws.management.LicenseManager**
@@ -908,6 +917,9 @@ Node classes list of the aws provider.
**diagrams.aws.management.PersonalHealthDashboard**
+
+**diagrams.aws.management.Proton**
+
**diagrams.aws.management.ServiceCatalog**
@@ -1217,6 +1229,9 @@ Node classes list of the aws provider.
**diagrams.aws.network.NATGateway**
+
+**diagrams.aws.network.NetworkFirewall**
+
**diagrams.aws.network.NetworkingAndContentDelivery**
diff --git a/resources/aws/analytics/opensearch.png b/resources/aws/analytics/opensearch.png
new file mode 100644
index 00000000..e1d5a6a7
Binary files /dev/null and b/resources/aws/analytics/opensearch.png differ
diff --git a/resources/aws/devtools/codeartifact.png b/resources/aws/devtools/codeartifact.png
new file mode 100644
index 00000000..7c4f3f49
Binary files /dev/null and b/resources/aws/devtools/codeartifact.png differ
diff --git a/resources/aws/management/devops-guru.png b/resources/aws/management/devops-guru.png
new file mode 100644
index 00000000..f9129c19
Binary files /dev/null and b/resources/aws/management/devops-guru.png differ
diff --git a/resources/aws/management/proton.png b/resources/aws/management/proton.png
new file mode 100644
index 00000000..063a164b
Binary files /dev/null and b/resources/aws/management/proton.png differ
diff --git a/resources/aws/network/network-firewall.png b/resources/aws/network/network-firewall.png
new file mode 100644
index 00000000..7535c287
Binary files /dev/null and b/resources/aws/network/network-firewall.png differ
diff --git a/website/static/img/resources/aws/analytics/opensearch.png b/website/static/img/resources/aws/analytics/opensearch.png
new file mode 100644
index 00000000..e1d5a6a7
Binary files /dev/null and b/website/static/img/resources/aws/analytics/opensearch.png differ
diff --git a/website/static/img/resources/aws/devtools/codeartifact.png b/website/static/img/resources/aws/devtools/codeartifact.png
new file mode 100644
index 00000000..7c4f3f49
Binary files /dev/null and b/website/static/img/resources/aws/devtools/codeartifact.png differ
diff --git a/website/static/img/resources/aws/management/devops-guru.png b/website/static/img/resources/aws/management/devops-guru.png
new file mode 100644
index 00000000..f9129c19
Binary files /dev/null and b/website/static/img/resources/aws/management/devops-guru.png differ
diff --git a/website/static/img/resources/aws/management/proton.png b/website/static/img/resources/aws/management/proton.png
new file mode 100644
index 00000000..063a164b
Binary files /dev/null and b/website/static/img/resources/aws/management/proton.png differ
diff --git a/website/static/img/resources/aws/network/network-firewall.png b/website/static/img/resources/aws/network/network-firewall.png
new file mode 100644
index 00000000..7535c287
Binary files /dev/null and b/website/static/img/resources/aws/network/network-firewall.png differ