Merge branch 'master' into feature/tekton-cli

* master:
  chore(deps): bump websocket-extensions from 0.1.3 to 0.1.4 in /website (mingrammer#194)
  Add more analytics tools (mingrammer#195)
  AWS: Added 9 more resource groups (mingrammer#192)
  docs: update badge status
  ci: install graphviz
  ci: install python dependencies
  ci: install poetry with pip
  ci: fix poetry bin path
  ci: fix job file path
  ci: update run test job
  scripts(generate): shorten usage
  ci: add run test job
  refactor: reformat the config.py
  Add: containers tools into programming (mingrammer#188)
  lint: new line spaces
  refactor: use official beats icon
  Add: new component Beats from Elasticstack (mingrammer#153)
  Added more generic icons mingrammer#126 (mingrammer#186)

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>

.github/workflows/test.yml

@@ -0,0 +1,35 @@
+name: Run tests
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - '.github/workflows/test.yml'
+      - '**.py'
+  pull_request:
+    branches:
+      - master
+    paths:
+      - '.github/workflows/test.yml'
+      - '**.py'
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        python: ['3.6', '3.7', '3.8']
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python }}
+      - name: Setup Graphviz
+        uses: ts-graphviz/setup-graphviz@v1
+      - name: Install poetry
+        run: pip install poetry
+      - name: Run all tests
+        run: |
+          poetry install
+          poetry run python -m unittest -v tests/*.py

README.md

@@ -5,7 +5,9 @@
 [![license](https://img.shields.io/badge/license-MIT-blue.svg)](/LICENSE)
 [![pypi version](https://badge.fury.io/py/diagrams.svg)](https://badge.fury.io/py/diagrams)
 ![python version](https://img.shields.io/badge/python-3.6%2C3.7%2C3.8-blue?logo=python)
+![Run tests](https://github.com/mingrammer/diagrams/workflows/Run%20tests/badge.svg?branch=master)
 [![todos](https://badgen.net/https/api.tickgit.com/badgen/github.com/mingrammer/diagrams?label=todos)](https://www.tickgit.com/browse?repo=github.com/mingrammer/diagrams)
+
 ![on premise provider](https://img.shields.io/badge/provider-OnPremise-orange?color=5f87bf)
 ![aws provider](https://img.shields.io/badge/provider-AWS-orange?logo=amazon-aws&color=ff9900)
 ![azure provider](https://img.shields.io/badge/provider-Azure-orange?logo=microsoft-azure&color=0089d6)

config.py

@@ -11,7 +11,9 @@
 DIR_RESOURCE = "resources"
 DIR_TEMPLATE = "templates"
 
-PROVIDERS = ("base", "onprem", "aws", "azure", "gcp", "firebase", "k8s", "alibabacloud", "oci", "programming", "saas", "elastic", "generic")
+PROVIDERS = (
+    "base", "onprem", "aws", "azure", "gcp", "firebase", "k8s", "alibabacloud", "oci", "programming", "saas", "elastic",
+    "generic")
 
 #########################
 #  Resource Processing  #
@@ -62,7 +64,7 @@
     ),
     "oci": ("oci",),
     "elastic": ("apm", "siem", "ece", "eck"),
-    "generic": ("vpn",),
+    "generic": ("vpn", "ios", "xen"),
 }
 
 TITLE_WORDS = {
@@ -130,6 +132,12 @@
         "analytics": {
             "ElasticsearchService": "ES",
         },
+        "business": {
+            "AlexaForBusiness": "A4B"
+        },
+        "blockchain": {
+            "QuantumLedgerDatabaseQldb": "QLDB"
+        },
         "compute": {
             "ApplicationAutoScaling": "AutoScaling",
             "EC2ContainerRegistry": "ECR",

diagrams/aws/ar.py

@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Ar(_AWS):
+    _type = "ar"
+    _icon_dir = "resources/aws/ar"
+
+
+class Sumerian(_Ar):
+    _icon = "sumerian.png"
+
+
+# Aliases

diagrams/aws/blockchain.py

@@ -0,0 +1,21 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Blockchain(_AWS):
+    _type = "blockchain"
+    _icon_dir = "resources/aws/blockchain"
+
+
+class ManagedBlockchain(_Blockchain):
+    _icon = "managed-blockchain.png"
+
+
+class QuantumLedgerDatabaseQldb(_Blockchain):
+    _icon = "quantum-ledger-database-qldb.png"
+
+
+# Aliases
+
+QLDB = QuantumLedgerDatabaseQldb

diagrams/aws/business.py

@@ -0,0 +1,25 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Business(_AWS):
+    _type = "business"
+    _icon_dir = "resources/aws/business"
+
+
+class AlexaForBusiness(_Business):
+    _icon = "alexa-for-business.png"
+
+
+class Chime(_Business):
+    _icon = "chime.png"
+
+
+class Workmail(_Business):
+    _icon = "workmail.png"
+
+
+# Aliases
+
+A4B = AlexaForBusiness

diagrams/aws/cost.py

@@ -0,0 +1,31 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Cost(_AWS):
+    _type = "cost"
+    _icon_dir = "resources/aws/cost"
+
+
+class Budgets(_Cost):
+    _icon = "budgets.png"
+
+
+class CostAndUsageReport(_Cost):
+    _icon = "cost-and-usage-report.png"
+
+
+class CostExplorer(_Cost):
+    _icon = "cost-explorer.png"
+
+
+class ReservedInstanceReporting(_Cost):
+    _icon = "reserved-instance-reporting.png"
+
+
+class SavingsPlans(_Cost):
+    _icon = "savings-plans.png"
+
+
+# Aliases

diagrams/aws/enablement.py

@@ -0,0 +1,27 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Enablement(_AWS):
+    _type = "enablement"
+    _icon_dir = "resources/aws/enablement"
+
+
+class Iq(_Enablement):
+    _icon = "iq.png"
+
+
+class ManagedServices(_Enablement):
+    _icon = "managed-services.png"
+
+
+class ProfessionalServices(_Enablement):
+    _icon = "professional-services.png"
+
+
+class Support(_Enablement):
+    _icon = "support.png"
+
+
+# Aliases

diagrams/aws/enduser.py

@@ -0,0 +1,27 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Enduser(_AWS):
+    _type = "enduser"
+    _icon_dir = "resources/aws/enduser"
+
+
+class Appstream20(_Enduser):
+    _icon = "appstream-2-0.png"
+
+
+class Workdocs(_Enduser):
+    _icon = "workdocs.png"
+
+
+class Worklink(_Enduser):
+    _icon = "worklink.png"
+
+
+class Workspaces(_Enduser):
+    _icon = "workspaces.png"
+
+
+# Aliases

diagrams/aws/iot.py

@@ -20,6 +20,10 @@ class Iot1Click(_Iot):
     _icon = "iot-1-click.png"
 
 
+class IotAction(_Iot):
+    _icon = "iot-action.png"
+
+
 class IotAlexaEcho(_Iot):
     _icon = "iot-alexa-echo.png"
 
@@ -60,6 +64,10 @@ class IotEvents(_Iot):
     _icon = "iot-events.png"
 
 
+class IotGreengrassConnector(_Iot):
+    _icon = "iot-greengrass-connector.png"
+
+
 class IotGreengrass(_Iot):
     _icon = "iot-greengrass.png"
 
@@ -68,14 +76,34 @@ class IotHardwareBoard(_Iot):
     _icon = "iot-hardware-board.png"
 
 
+class IotHttp(_Iot):
+    _icon = "iot-http.png"
+
+
+class IotHttp2(_Iot):
+    _icon = "iot-http2.png"
+
+
 class IotJobs(_Iot):
     _icon = "iot-jobs.png"
 
 
+class IotLambda(_Iot):
+    _icon = "iot-lambda.png"
+
+
 class IotMqtt(_Iot):
     _icon = "iot-mqtt.png"
 
 
+class IotPolicyEmergency(_Iot):
+    _icon = "iot-policy-emergency.png"
+
+
+class IotPolicy(_Iot):
+    _icon = "iot-policy.png"
+
+
 class IotRule(_Iot):
     _icon = "iot-rule.png"
 

diagrams/aws/mobile.py

@@ -0,0 +1,35 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Mobile(_AWS):
+    _type = "mobile"
+    _icon_dir = "resources/aws/mobile"
+
+
+class Amplify(_Mobile):
+    _icon = "amplify.png"
+
+
+class APIGatewayEndpoint(_Mobile):
+    _icon = "api-gateway-endpoint.png"
+
+
+class APIGateway(_Mobile):
+    _icon = "api-gateway.png"
+
+
+class Appsync(_Mobile):
+    _icon = "appsync.png"
+
+
+class DeviceFarm(_Mobile):
+    _icon = "device-farm.png"
+
+
+class Pinpoint(_Mobile):
+    _icon = "pinpoint.png"
+
+
+# Aliases

diagrams/aws/quantum.py

@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Quantum(_AWS):
+    _type = "quantum"
+    _icon_dir = "resources/aws/quantum"
+
+
+class Braket(_Quantum):
+    _icon = "braket.png"
+
+
+# Aliases

diagrams/aws/satellite.py

@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _AWS
+
+
+class _Satellite(_AWS):
+    _type = "satellite"
+    _icon_dir = "resources/aws/satellite"
+
+
+class GroundStation(_Satellite):
+    _icon = "ground-station.png"
+
+
+# Aliases

diagrams/elastic/elasticsearch.py

@@ -12,6 +12,10 @@ class Alerting(_Elasticsearch):
     _icon = "alerting.png"
 
 
+class Beats(_Elasticsearch):
+    _icon = "beats.png"
+
+
 class Elasticsearch(_Elasticsearch):
     _icon = "elasticsearch.png"
 

diagrams/generic/device.py

@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _Generic
+
+
+class _Device(_Generic):
+    _type = "device"
+    _icon_dir = "resources/generic/device"
+
+
+class Mobile(_Device):
+    _icon = "mobile.png"
+
+
+class Tablet(_Device):
+    _icon = "tablet.png"
+
+
+# Aliases