Merge remote-tracking branch 'upstream/master' into feature/update-az…

…ure-icons-v18
mingrammer · Nov 12, 2024 · 8a347ff · 8a347ff
2 parents cfeb87f + c2c24c6
commit 8a347ff
Show file tree

Hide file tree

Showing 77 changed files with 439 additions and 410 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can check out the head.
@@ -29,10 +29,10 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       # Override language selection by uncommenting this and choosing your languages
       with:
         languages: python
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,27 +6,31 @@ on:
       - master
     paths:
       - ".github/workflows/test.yml"
+      - "pyproject.toml"
+      - "poetry.lock"
       - "**.py"
   pull_request:
     branches:
       - master
     paths:
       - ".github/workflows/test.yml"
+      - "pyproject.toml"
+      - "poetry.lock"
       - "**.py"
 
 jobs:
   test:
     strategy:
       matrix:
-        python: ["3.9", "3.10", "3.11"]
+        python: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
       - name: Setup Graphviz
-        uses: ts-graphviz/setup-graphviz@v1
+        uses: ts-graphviz/setup-graphviz@v2
       - name: Install poetry
         run: curl -sSL https://install.python-poetry.org | python3 -
       - name: Run all tests

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -394,3 +394,17 @@ The following import changes:
 ### Added
 
 - Support kubernetes diagrams: [3eda1cb](https://github.com/mingrammer/diagrams/commit/3eda1cb6bca8be8a55773d90b93483a8fab3e0f1)
+
+
+## v0.23.5
+
+### Breaking Changes
+
+The following import changes:
+
+#### OCI
+
+| Old import path                                                    | New import path                                               |
+| -------------------------------------------------------------------| --------------------------------------------------------------|
+| `from diagrams.oci.connectivity import CustomerPremiseWhite`       | `from diagrams.oci.connectivity import CustomerPremisesWhite` |
+| `from diagrams.oci.connectivity import CustomerPremises`           | `from diagrams.oci.connectivity import CustomerPremises`      |
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -74,4 +74,4 @@ To be able to develop and run diagrams locally on you Mac device, you should hav
     ./autogen.sh
     ```
 
-7. If the unit tests and the bash script `autogen.sh` is working correctly, then your system is now ready for development.
+7. If the unit tests and the bash script `autogen.sh` is working correctly, then your system is now ready for development.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 
 **Diagram as Code**.
 
-Diagrams lets you draw the cloud system architecture **in Python code**. It was born for **prototyping** a new system architecture design without any design tools. You can also describe or visualize the existing system architecture as well. Diagrams currently supports main major providers including: `AWS`, `Azure`, `GCP`, `Kubernetes`, `Alibaba Cloud`, `Oracle Cloud` etc... It also supports `On-Premise` nodes, `SaaS` and major `Programming` frameworks and languages.
+Diagrams lets you draw the cloud system architecture **in Python code**. It was born for **prototyping** a new system architecture design without any design tools. You can also describe or visualize the existing system architecture as well. Diagrams currently supports main major providers including: `AWS`, `Azure`, `GCP`, `Kubernetes`, `Alibaba Cloud`, `Oracle Cloud` etc... It also supports `On-Premises` nodes, `SaaS` and major `Programming` frameworks and languages.
 
 **Diagram as Code** also allows you to **track** the architecture diagram changes in any **version control** system.
 
@@ -33,7 +33,7 @@ Diagrams lets you draw the cloud system architecture **in Python code**. It was
 ![digital ocean provider](https://img.shields.io/badge/DigitalOcean-0080ff?logo=digitalocean&color=0080ff)
 ![elastic provider](https://img.shields.io/badge/Elastic-orange?logo=elastic&color=005571)
 ![outscale provider](https://img.shields.io/badge/OutScale-orange?color=5f87bf)
-![on premise provider](https://img.shields.io/badge/OnPremise-orange?color=5f87bf)
+![on premises provider](https://img.shields.io/badge/OnPremises-orange?color=5f87bf)
 ![generic provider](https://img.shields.io/badge/Generic-orange?color=5f87bf)
 ![programming provider](https://img.shields.io/badge/Programming-orange?color=5f87bf)
 ![saas provider](https://img.shields.io/badge/SaaS-orange?color=5f87bf)
@@ -64,7 +64,7 @@ You can start with [quick start](https://diagrams.mingrammer.com/docs/getting-st
 
 | Event Processing                                             | Stateful Architecture                                        | Advanced Web Service                                         |
 | ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ |
-| ![event processing](https://diagrams.mingrammer.com/img/event_processing_diagram.png) | ![stateful architecture](https://diagrams.mingrammer.com/img/stateful_architecture_diagram.png) | ![advanced web service with on-premise](https://diagrams.mingrammer.com/img/advanced_web_service_with_on-premise.png) |
+| ![event processing](https://diagrams.mingrammer.com/img/event_processing_diagram.png) | ![stateful architecture](https://diagrams.mingrammer.com/img/stateful_architecture_diagram.png) | ![advanced web service with on-premises](https://diagrams.mingrammer.com/img/advanced_web_service_with_on-premises.png) |
 
 You can find all the examples on the [examples](https://diagrams.mingrammer.com/docs/getting-started/examples) page.
 

diff --git a/config.py b/config.py
@@ -429,7 +429,9 @@
     "programming": {
         "framework": {
             "Fastapi": "FastAPI",
-            "Graphql": "GraphQL"
+            "Graphql": "GraphQL",
+            "Dotnet": "DotNet",
+            "Nextjs": "NextJs"
         },
         "language": {
             "Javascript": "JavaScript",

diff --git a/diagrams/__init__.py b/diagrams/__init__.py
@@ -82,7 +82,7 @@ def __init__(
         filename: str = "",
         direction: str = "LR",
         curvestyle: str = "ortho",
-        outformat: str = "png",
+        outformat: Union[str, list[str]] = "png",
         autolabel: bool = False,
         show: bool = True,
         strict: bool = False,

diff --git a/diagrams/aws/analytics.py b/diagrams/aws/analytics.py
@@ -8,6 +8,10 @@ class _Analytics(_AWS):
     _icon_dir = "resources/aws/analytics"
 
 
+class AmazonOpensearchService(_Analytics):
+    _icon = "amazon-opensearch-service.png"
+
+
 class Analytics(_Analytics):
     _icon = "analytics.png"
 

diff --git 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
@@ -8,6 +8,22 @@ class _Management(_AWS):
     _icon_dir = "resources/aws/management"
 
 
+class AmazonDevopsGuru(_Management):
+    _icon = "amazon-devops-guru.png"
+
+
+class AmazonManagedGrafana(_Management):
+    _icon = "amazon-managed-grafana.png"
+
+
+class AmazonManagedPrometheus(_Management):
+    _icon = "amazon-managed-prometheus.png"
+
+
+class AmazonManagedWorkflowsApacheAirflow(_Management):
+    _icon = "amazon-managed-workflows-apache-airflow.png"
+
+
 class AutoScaling(_Management):
     _icon = "auto-scaling.png"
 
@@ -140,10 +156,18 @@ class PersonalHealthDashboard(_Management):
     _icon = "personal-health-dashboard.png"
 
 
+class Proton(_Management):
+    _icon = "proton.png"
+
+
 class ServiceCatalog(_Management):
     _icon = "service-catalog.png"
 
 
+class SystemsManagerAppConfig(_Management):
+    _icon = "systems-manager-app-config.png"
+
+
 class SystemsManagerAutomation(_Management):
     _icon = "systems-manager-automation.png"
 

diff --git 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/azure/monitor.py b/diagrams/azure/monitor.py
@@ -38,6 +38,8 @@ class DiagnosticsSettings(_Monitor):
 
 class LogAnalyticsWorkspaces(_Monitor):
     _icon = "log-analytics-workspaces.png"
+class Logs(_Monitor):
+    _icon = "logs.png"
 
 
 class Metrics(_Monitor):

diff --git a/diagrams/oci/connectivity.py b/diagrams/oci/connectivity.py
@@ -32,12 +32,12 @@ class CustomerDatacntrWhite(_Connectivity):
     _icon = "customer-datacntr-white.png"
 
 
-class CustomerPremiseWhite(_Connectivity):
-    _icon = "customer-premise-white.png"
+class CustomerPremisesWhite(_Connectivity):
+    _icon = "customer-premises-white.png"
 
 
-class CustomerPremise(_Connectivity):
-    _icon = "customer-premise.png"
+class CustomerPremises(_Connectivity):
+    _icon = "customer-premises.png"
 
 
 class DisconnectedRegionsWhite(_Connectivity):

diff --git a/diagrams/onprem/__init__.py b/diagrams/onprem/__init__.py
@@ -1,5 +1,5 @@
 """
-OnPrem provides a set of general on-premise services.
+OnPrem provides a set of general on-premises services.
 """
 
 from diagrams import Node

diff --git a/diagrams/programming/framework.py b/diagrams/programming/framework.py
@@ -16,10 +16,18 @@ class Backbone(_Framework):
     _icon = "backbone.png"
 
 
+class Camel(_Framework):
+    _icon = "camel.png"
+
+
 class Django(_Framework):
     _icon = "django.png"
 
 
+class Dotnet(_Framework):
+    _icon = "dotnet.png"
+
+
 class Ember(_Framework):
     _icon = "ember.png"
 
@@ -40,6 +48,14 @@ class Graphql(_Framework):
     _icon = "graphql.png"
 
 
+class Hibernate(_Framework):
+    _icon = "hibernate.png"
+
+
+class Jhipster(_Framework):
+   _icon = "jhipster.png"
+
+
 class Laravel(_Framework):
     _icon = "laravel.png"
 
@@ -48,6 +64,10 @@ class Micronaut(_Framework):
     _icon = "micronaut.png"
 
 
+class Nextjs(_Framework):
+    _icon = "nextjs.png"
+
+
 class Quarkus(_Framework):
     _icon = "quarkus.png"
 
@@ -72,6 +92,10 @@ class Svelte(_Framework):
     _icon = "svelte.png"
 
 
+class Vercel(_Framework):
+    _icon = "vercel.png"
+
+
 class Vue(_Framework):
     _icon = "vue.png"
 
@@ -80,3 +104,6 @@ class Vue(_Framework):
 
 FastAPI = Fastapi
 GraphQL = Graphql
+DotNet = Dotnet
+NextJs = Nextjs
+JHipster = Jhipster
diff --git a/diagrams/saas/security.py b/diagrams/saas/security.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Saas
+
+
+class _Security(_Saas):
+    _type = "alerting"
+    _icon_dir = "resources/saas/security"
+
+
+class Sonarqube(_Security):
+    _icon = "sonarqube.png"
+
+
+# Aliases
diff --git a/docs/getting-started/examples.md b/docs/getting-started/examples.md
@@ -170,7 +170,7 @@ with Diagram("Stateful Architecture", show=False):
 
 ![stateful architecture diagram](/img/stateful_architecture_diagram.png)
 
-## Advanced Web Service with On-Premise
+## Advanced Web Service with On-Premises
 
 ```python
 from diagrams import Cluster, Diagram
@@ -183,7 +183,7 @@ from diagrams.onprem.monitoring import Grafana, Prometheus
 from diagrams.onprem.network import Nginx
 from diagrams.onprem.queue import Kafka
 
-with Diagram("Advanced Web Service with On-Premise", show=False):
+with Diagram("Advanced Web Service with On-Premises", show=False):
     ingress = Nginx("ingress")
 
     metrics = Prometheus("metric")

diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
@@ -3,7 +3,7 @@ id: installation
 title: Installation
 ---
 
-**diagrams** requires **Python 3.6** or higher, check your Python version first.
+**diagrams** requires **Python 3.7** or higher, check your Python version first.
 
 **diagrams** uses [Graphviz](https://www.graphviz.org/) to render the diagram, so you need to [install Graphviz](https://graphviz.gitlab.io/download/) to use it.
 

diff --git a/docs/guides/edge.md b/docs/guides/edge.md
@@ -22,7 +22,7 @@ from diagrams.onprem.monitoring import Grafana, Prometheus
 from diagrams.onprem.network import Nginx
 from diagrams.onprem.queue import Kafka
 
-with Diagram(name="Advanced Web Service with On-Premise (colored)", show=False):
+with Diagram(name="Advanced Web Service with On-Premises (colored)", show=False):
     ingress = Nginx("ingress")
 
     metrics = Prometheus("metric")
@@ -66,4 +66,4 @@ with Diagram(name="Advanced Web Service with On-Premise (colored)", show=False):
         >> aggregator
 ```
 
-![advanced web service with on-premise diagram colored](/img/advanced_web_service_with_on-premise_colored.png)
+![advanced web service with on-premises diagram colored](/img/advanced_web_service_with_on-premises_colored.png)
diff --git a/docs/nodes/alibabacloud.md b/docs/nodes/alibabacloud.md
@@ -3,7 +3,7 @@ id: alibabacloud
 title: AlibabaCloud
 ---
 
-Node classes list of alibabacloud provider.
+Node classes list of the alibabacloud provider.
 
 ## alibabacloud.analytics