diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 000000000..175472ea4 --- /dev/null +++ b/.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 diff --git a/README.md b/README.md index 60a51d5ed..253b79872 100644 --- a/README.md +++ b/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) diff --git a/config.py b/config.py index e5bba3a26..e208cb1bd 100644 --- a/config.py +++ b/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", diff --git a/diagrams/aws/ar.py b/diagrams/aws/ar.py new file mode 100644 index 000000000..d5a42b9b4 --- /dev/null +++ b/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 diff --git a/diagrams/aws/blockchain.py b/diagrams/aws/blockchain.py new file mode 100644 index 000000000..908847785 --- /dev/null +++ b/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 diff --git a/diagrams/aws/business.py b/diagrams/aws/business.py new file mode 100644 index 000000000..7063abc50 --- /dev/null +++ b/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 diff --git a/diagrams/aws/cost.py b/diagrams/aws/cost.py new file mode 100644 index 000000000..ced6de0f5 --- /dev/null +++ b/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 diff --git a/diagrams/aws/enablement.py b/diagrams/aws/enablement.py new file mode 100644 index 000000000..ace1f0df1 --- /dev/null +++ b/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 diff --git a/diagrams/aws/enduser.py b/diagrams/aws/enduser.py new file mode 100644 index 000000000..c55364c25 --- /dev/null +++ b/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 diff --git a/diagrams/aws/iot.py b/diagrams/aws/iot.py index 4e30beda1..e005a3b4a 100644 --- a/diagrams/aws/iot.py +++ b/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" diff --git a/diagrams/aws/mobile.py b/diagrams/aws/mobile.py new file mode 100644 index 000000000..315899e5d --- /dev/null +++ b/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 diff --git a/diagrams/aws/quantum.py b/diagrams/aws/quantum.py new file mode 100644 index 000000000..7135bcbe5 --- /dev/null +++ b/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 diff --git a/diagrams/aws/satellite.py b/diagrams/aws/satellite.py new file mode 100644 index 000000000..bf44411e5 --- /dev/null +++ b/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 diff --git a/diagrams/elastic/elasticsearch.py b/diagrams/elastic/elasticsearch.py index a903a42b6..dad072bab 100644 --- a/diagrams/elastic/elasticsearch.py +++ b/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" diff --git a/diagrams/generic/device.py b/diagrams/generic/device.py new file mode 100644 index 000000000..29745b8e1 --- /dev/null +++ b/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 diff --git a/diagrams/generic/os.py b/diagrams/generic/os.py new file mode 100644 index 000000000..695f29545 --- /dev/null +++ b/diagrams/generic/os.py @@ -0,0 +1,39 @@ +# This module is automatically generated by autogen.sh. DO NOT EDIT. + +from . import _Generic + + +class _Os(_Generic): + _type = "os" + _icon_dir = "resources/generic/os" + + +class Android(_Os): + _icon = "android.png" + + +class Centos(_Os): + _icon = "centos.png" + + +class IOS(_Os): + _icon = "ios.png" + + +class LinuxGeneral(_Os): + _icon = "linux-general.png" + + +class Suse(_Os): + _icon = "suse.png" + + +class Ubuntu(_Os): + _icon = "ubuntu.png" + + +class Windows(_Os): + _icon = "windows.png" + + +# Aliases diff --git a/diagrams/generic/virtualization.py b/diagrams/generic/virtualization.py new file mode 100644 index 000000000..0695fd010 --- /dev/null +++ b/diagrams/generic/virtualization.py @@ -0,0 +1,23 @@ +# This module is automatically generated by autogen.sh. DO NOT EDIT. + +from . import _Generic + + +class _Virtualization(_Generic): + _type = "virtualization" + _icon_dir = "resources/generic/virtualization" + + +class Virtualbox(_Virtualization): + _icon = "virtualbox.png" + + +class Vmware(_Virtualization): + _icon = "vmware.png" + + +class XEN(_Virtualization): + _icon = "xen.png" + + +# Aliases diff --git a/diagrams/k8s/ecosystem.py b/diagrams/k8s/ecosystem.py new file mode 100644 index 000000000..2e8a91f28 --- /dev/null +++ b/diagrams/k8s/ecosystem.py @@ -0,0 +1,23 @@ +# This module is automatically generated by autogen.sh. DO NOT EDIT. + +from . import _K8S + + +class _Ecosystem(_K8S): + _type = "ecosystem" + _icon_dir = "resources/k8s/ecosystem" + + +class Helm(_Ecosystem): + _icon = "helm.png" + + +class Krew(_Ecosystem): + _icon = "krew.png" + + +class Kustomize(_Ecosystem): + _icon = "kustomize.png" + + +# Aliases diff --git a/diagrams/onprem/analytics.py b/diagrams/onprem/analytics.py index ff553089d..0a58ae52f 100644 --- a/diagrams/onprem/analytics.py +++ b/diagrams/onprem/analytics.py @@ -12,6 +12,10 @@ class Beam(_Analytics): _icon = "beam.png" +class Dbt(_Analytics): + _icon = "dbt.png" + + class Flink(_Analytics): _icon = "flink.png" @@ -32,6 +36,10 @@ class Norikra(_Analytics): _icon = "norikra.png" +class Singer(_Analytics): + _icon = "singer.png" + + class Spark(_Analytics): _icon = "spark.png" diff --git a/diagrams/saas/analytics.py b/diagrams/saas/analytics.py new file mode 100644 index 000000000..8ab11611f --- /dev/null +++ b/diagrams/saas/analytics.py @@ -0,0 +1,15 @@ +# This module is automatically generated by autogen.sh. DO NOT EDIT. + +from . import _Saas + + +class _Analytics(_Saas): + _type = "analytics" + _icon_dir = "resources/saas/analytics" + + +class Stitch(_Analytics): + _icon = "stitch.png" + + +# Aliases diff --git a/docs/nodes/aws.md b/docs/nodes/aws.md index ef5bdec2d..5b9b16ecd 100644 --- a/docs/nodes/aws.md +++ b/docs/nodes/aws.md @@ -31,6 +31,21 @@ Node classes list of aws provider. - **diagrams.aws.analytics.RedshiftDenseStorageNode** - **diagrams.aws.analytics.Redshift** +## aws.ar + +- **diagrams.aws.ar.Sumerian** + +## aws.blockchain + +- **diagrams.aws.blockchain.ManagedBlockchain** +- **diagrams.aws.blockchain.QuantumLedgerDatabaseQldb**, **QLDB** (alias) + +## aws.business + +- **diagrams.aws.business.AlexaForBusiness**, **A4B** (alias) +- **diagrams.aws.business.Chime** +- **diagrams.aws.business.Workmail** + ## aws.compute - **diagrams.aws.compute.ApplicationAutoScaling**, **AutoScaling** (alias) @@ -55,6 +70,14 @@ Node classes list of aws provider. - **diagrams.aws.compute.ThinkboxXmesh** - **diagrams.aws.compute.VmwareCloudOnAWS** +## aws.cost + +- **diagrams.aws.cost.Budgets** +- **diagrams.aws.cost.CostAndUsageReport** +- **diagrams.aws.cost.CostExplorer** +- **diagrams.aws.cost.ReservedInstanceReporting** +- **diagrams.aws.cost.SavingsPlans** + ## aws.database - **diagrams.aws.database.Aurora** @@ -87,6 +110,20 @@ Node classes list of aws provider. - **diagrams.aws.devtools.ToolsAndSdks** - **diagrams.aws.devtools.XRay** +## aws.enablement + +- **diagrams.aws.enablement.Iq** +- **diagrams.aws.enablement.ManagedServices** +- **diagrams.aws.enablement.ProfessionalServices** +- **diagrams.aws.enablement.Support** + +## aws.enduser + +- **diagrams.aws.enduser.Appstream20** +- **diagrams.aws.enduser.Workdocs** +- **diagrams.aws.enduser.Worklink** +- **diagrams.aws.enduser.Workspaces** + ## aws.engagement - **diagrams.aws.engagement.Connect** @@ -127,6 +164,7 @@ Node classes list of aws provider. - **diagrams.aws.iot.Freertos**, **FreeRTOS** (alias) - **diagrams.aws.iot.InternetOfThings** - **diagrams.aws.iot.Iot1Click** +- **diagrams.aws.iot.IotAction** - **diagrams.aws.iot.IotAlexaEcho** - **diagrams.aws.iot.IotAlexaSkill** - **diagrams.aws.iot.IotAnalytics** @@ -137,10 +175,16 @@ Node classes list of aws provider. - **diagrams.aws.iot.IotDeviceDefender** - **diagrams.aws.iot.IotDeviceManagement** - **diagrams.aws.iot.IotEvents** +- **diagrams.aws.iot.IotGreengrassConnector** - **diagrams.aws.iot.IotGreengrass** - **diagrams.aws.iot.IotHardwareBoard**, **IotBoard** (alias) +- **diagrams.aws.iot.IotHttp** +- **diagrams.aws.iot.IotHttp2** - **diagrams.aws.iot.IotJobs** +- **diagrams.aws.iot.IotLambda** - **diagrams.aws.iot.IotMqtt** +- **diagrams.aws.iot.IotPolicyEmergency** +- **diagrams.aws.iot.IotPolicy** - **diagrams.aws.iot.IotRule** - **diagrams.aws.iot.IotShadow** - **diagrams.aws.iot.IotSitewise** @@ -218,6 +262,15 @@ Node classes list of aws provider. - **diagrams.aws.ml.Transcribe** - **diagrams.aws.ml.Translate** +## aws.mobile + +- **diagrams.aws.mobile.Amplify** +- **diagrams.aws.mobile.APIGatewayEndpoint** +- **diagrams.aws.mobile.APIGateway** +- **diagrams.aws.mobile.Appsync** +- **diagrams.aws.mobile.DeviceFarm** +- **diagrams.aws.mobile.Pinpoint** + ## aws.network - **diagrams.aws.network.APIGateway** @@ -244,12 +297,20 @@ Node classes list of aws provider. - **diagrams.aws.network.VPCRouter** - **diagrams.aws.network.VPC** +## aws.quantum + +- **diagrams.aws.quantum.Braket** + ## aws.robotics - **diagrams.aws.robotics.RobomakerSimulator** - **diagrams.aws.robotics.Robomaker** - **diagrams.aws.robotics.Robotics** +## aws.satellite + +- **diagrams.aws.satellite.GroundStation** + ## aws.security - **diagrams.aws.security.Artifact** diff --git a/docs/nodes/elastic.md b/docs/nodes/elastic.md index ce5d3c7a8..cbe659323 100644 --- a/docs/nodes/elastic.md +++ b/docs/nodes/elastic.md @@ -8,6 +8,7 @@ Node classes list of elastic provider. ## elastic.elasticsearch - **diagrams.elastic.elasticsearch.Alerting** +- **diagrams.elastic.elasticsearch.Beats** - **diagrams.elastic.elasticsearch.Elasticsearch** - **diagrams.elastic.elasticsearch.Kibana** - **diagrams.elastic.elasticsearch.Logstash**, **LogStash** (alias) diff --git a/docs/nodes/generic.md b/docs/nodes/generic.md index af11a0db3..ce9a5f2d7 100644 --- a/docs/nodes/generic.md +++ b/docs/nodes/generic.md @@ -13,6 +13,11 @@ Node classes list of generic provider. - **diagrams.generic.compute.Rack** +## generic.device + +- **diagrams.generic.device.Mobile** +- **diagrams.generic.device.Tablet** + ## generic.network - **diagrams.generic.network.Firewall** @@ -20,6 +25,16 @@ Node classes list of generic provider. - **diagrams.generic.network.Switch** - **diagrams.generic.network.VPN** +## generic.os + +- **diagrams.generic.os.Android** +- **diagrams.generic.os.Centos** +- **diagrams.generic.os.IOS** +- **diagrams.generic.os.LinuxGeneral** +- **diagrams.generic.os.Suse** +- **diagrams.generic.os.Ubuntu** +- **diagrams.generic.os.Windows** + ## generic.place - **diagrams.generic.place.Datacenter** @@ -27,3 +42,9 @@ Node classes list of generic provider. ## generic.storage - **diagrams.generic.storage.Storage** + +## generic.virtualization + +- **diagrams.generic.virtualization.Virtualbox** +- **diagrams.generic.virtualization.Vmware** +- **diagrams.generic.virtualization.XEN** diff --git a/docs/nodes/k8s.md b/docs/nodes/k8s.md index d52584d0a..ef6879fd6 100644 --- a/docs/nodes/k8s.md +++ b/docs/nodes/k8s.md @@ -30,6 +30,12 @@ Node classes list of k8s provider. - **diagrams.k8s.controlplane.Kubelet** - **diagrams.k8s.controlplane.Sched**, **Scheduler** (alias) +## k8s.ecosystem + +- **diagrams.k8s.ecosystem.Helm** +- **diagrams.k8s.ecosystem.Krew** +- **diagrams.k8s.ecosystem.Kustomize** + ## k8s.group - **diagrams.k8s.group.NS**, **Namespace** (alias) diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md index b065ba78a..f70f7a0aa 100644 --- a/docs/nodes/onprem.md +++ b/docs/nodes/onprem.md @@ -8,11 +8,13 @@ Node classes list of onprem provider. ## onprem.analytics - **diagrams.onprem.analytics.Beam** +- **diagrams.onprem.analytics.Dbt** - **diagrams.onprem.analytics.Flink** - **diagrams.onprem.analytics.Hadoop** - **diagrams.onprem.analytics.Hive** - **diagrams.onprem.analytics.Metabase** - **diagrams.onprem.analytics.Norikra** +- **diagrams.onprem.analytics.Singer** - **diagrams.onprem.analytics.Spark** - **diagrams.onprem.analytics.Storm** - **diagrams.onprem.analytics.Tableau** diff --git a/docs/nodes/saas.md b/docs/nodes/saas.md index 71de66da7..236dd8b41 100644 --- a/docs/nodes/saas.md +++ b/docs/nodes/saas.md @@ -9,6 +9,10 @@ Node classes list of saas provider. - **diagrams.saas.alerting.Opsgenie** +## saas.analytics + +- **diagrams.saas.analytics.Stitch** + ## saas.chat - **diagrams.saas.chat.Slack** diff --git a/resources/aws/ar/sumerian.png b/resources/aws/ar/sumerian.png new file mode 100644 index 000000000..c46492bdc Binary files /dev/null and b/resources/aws/ar/sumerian.png differ diff --git a/resources/aws/blockchain/managed-blockchain.png b/resources/aws/blockchain/managed-blockchain.png new file mode 100644 index 000000000..35f63d740 Binary files /dev/null and b/resources/aws/blockchain/managed-blockchain.png differ diff --git a/resources/aws/blockchain/quantum-ledger-database-qldb.png b/resources/aws/blockchain/quantum-ledger-database-qldb.png new file mode 100644 index 000000000..f2c69044a Binary files /dev/null and b/resources/aws/blockchain/quantum-ledger-database-qldb.png differ diff --git a/resources/aws/business/alexa-for-business.png b/resources/aws/business/alexa-for-business.png new file mode 100644 index 000000000..ae7377cb3 Binary files /dev/null and b/resources/aws/business/alexa-for-business.png differ diff --git a/resources/aws/business/chime.png b/resources/aws/business/chime.png new file mode 100644 index 000000000..fb3f92acc Binary files /dev/null and b/resources/aws/business/chime.png differ diff --git a/resources/aws/business/workmail.png b/resources/aws/business/workmail.png new file mode 100644 index 000000000..480829301 Binary files /dev/null and b/resources/aws/business/workmail.png differ diff --git a/resources/aws/cost/budgets.png b/resources/aws/cost/budgets.png new file mode 100644 index 000000000..0ccebea76 Binary files /dev/null and b/resources/aws/cost/budgets.png differ diff --git a/resources/aws/cost/cost-and-usage-report.png b/resources/aws/cost/cost-and-usage-report.png new file mode 100644 index 000000000..651fef9f6 Binary files /dev/null and b/resources/aws/cost/cost-and-usage-report.png differ diff --git a/resources/aws/cost/cost-explorer.png b/resources/aws/cost/cost-explorer.png new file mode 100644 index 000000000..5bb28c4ea Binary files /dev/null and b/resources/aws/cost/cost-explorer.png differ diff --git a/resources/aws/cost/reserved-instance-reporting.png b/resources/aws/cost/reserved-instance-reporting.png new file mode 100644 index 000000000..f0add1cc8 Binary files /dev/null and b/resources/aws/cost/reserved-instance-reporting.png differ diff --git a/resources/aws/cost/savings-plans.png b/resources/aws/cost/savings-plans.png new file mode 100755 index 000000000..28e9cf200 Binary files /dev/null and b/resources/aws/cost/savings-plans.png differ diff --git a/resources/aws/enablement/iq.png b/resources/aws/enablement/iq.png new file mode 100755 index 000000000..bc594ea4d Binary files /dev/null and b/resources/aws/enablement/iq.png differ diff --git a/resources/aws/enablement/managed-services.png b/resources/aws/enablement/managed-services.png new file mode 100755 index 000000000..0024249c3 Binary files /dev/null and b/resources/aws/enablement/managed-services.png differ diff --git a/resources/aws/enablement/professional-services.png b/resources/aws/enablement/professional-services.png new file mode 100755 index 000000000..0ba4e099f Binary files /dev/null and b/resources/aws/enablement/professional-services.png differ diff --git a/resources/aws/enablement/support.png b/resources/aws/enablement/support.png new file mode 100755 index 000000000..aecefb5b9 Binary files /dev/null and b/resources/aws/enablement/support.png differ diff --git a/resources/aws/enduser/appstream-2-0.png b/resources/aws/enduser/appstream-2-0.png new file mode 100644 index 000000000..80f1e71fc Binary files /dev/null and b/resources/aws/enduser/appstream-2-0.png differ diff --git a/resources/aws/enduser/workdocs.png b/resources/aws/enduser/workdocs.png new file mode 100644 index 000000000..747754645 Binary files /dev/null and b/resources/aws/enduser/workdocs.png differ diff --git a/resources/aws/enduser/worklink.png b/resources/aws/enduser/worklink.png new file mode 100644 index 000000000..d00ad814f Binary files /dev/null and b/resources/aws/enduser/worklink.png differ diff --git a/resources/aws/enduser/workspaces.png b/resources/aws/enduser/workspaces.png new file mode 100644 index 000000000..21865ac70 Binary files /dev/null and b/resources/aws/enduser/workspaces.png differ diff --git a/resources/aws/iot/iot-action.png b/resources/aws/iot/iot-action.png new file mode 100644 index 000000000..dace7dc90 Binary files /dev/null and b/resources/aws/iot/iot-action.png differ diff --git a/resources/aws/iot/iot-greengrass-connector.png b/resources/aws/iot/iot-greengrass-connector.png new file mode 100644 index 000000000..e3e56e524 Binary files /dev/null and b/resources/aws/iot/iot-greengrass-connector.png differ diff --git a/resources/aws/iot/iot-http.png b/resources/aws/iot/iot-http.png new file mode 100644 index 000000000..0592af7dd Binary files /dev/null and b/resources/aws/iot/iot-http.png differ diff --git a/resources/aws/iot/iot-http2.png b/resources/aws/iot/iot-http2.png new file mode 100644 index 000000000..bfee7e88e Binary files /dev/null and b/resources/aws/iot/iot-http2.png differ diff --git a/resources/aws/iot/iot-lambda.png b/resources/aws/iot/iot-lambda.png new file mode 100644 index 000000000..6ff938bcd Binary files /dev/null and b/resources/aws/iot/iot-lambda.png differ diff --git a/resources/aws/iot/iot-policy-emergency.png b/resources/aws/iot/iot-policy-emergency.png new file mode 100644 index 000000000..ac08ece82 Binary files /dev/null and b/resources/aws/iot/iot-policy-emergency.png differ diff --git a/resources/aws/iot/iot-policy.png b/resources/aws/iot/iot-policy.png new file mode 100644 index 000000000..846e21cf4 Binary files /dev/null and b/resources/aws/iot/iot-policy.png differ diff --git a/resources/aws/mobile/amplify.png b/resources/aws/mobile/amplify.png new file mode 100644 index 000000000..8b22c3268 Binary files /dev/null and b/resources/aws/mobile/amplify.png differ diff --git a/resources/aws/mobile/api-gateway-endpoint.png b/resources/aws/mobile/api-gateway-endpoint.png new file mode 100644 index 000000000..2c0d46870 Binary files /dev/null and b/resources/aws/mobile/api-gateway-endpoint.png differ diff --git a/resources/aws/mobile/api-gateway.png b/resources/aws/mobile/api-gateway.png new file mode 100644 index 000000000..30be8c32c Binary files /dev/null and b/resources/aws/mobile/api-gateway.png differ diff --git a/resources/aws/mobile/appsync.png b/resources/aws/mobile/appsync.png new file mode 100644 index 000000000..74a9064b3 Binary files /dev/null and b/resources/aws/mobile/appsync.png differ diff --git a/resources/aws/mobile/device-farm.png b/resources/aws/mobile/device-farm.png new file mode 100644 index 000000000..3d72c411d Binary files /dev/null and b/resources/aws/mobile/device-farm.png differ diff --git a/resources/aws/mobile/pinpoint.png b/resources/aws/mobile/pinpoint.png new file mode 100644 index 000000000..73588dad6 Binary files /dev/null and b/resources/aws/mobile/pinpoint.png differ diff --git a/resources/aws/quantum/braket.png b/resources/aws/quantum/braket.png new file mode 100644 index 000000000..b216f9b16 Binary files /dev/null and b/resources/aws/quantum/braket.png differ diff --git a/resources/aws/satellite/ground-station.png b/resources/aws/satellite/ground-station.png new file mode 100644 index 000000000..693565b71 Binary files /dev/null and b/resources/aws/satellite/ground-station.png differ diff --git a/resources/elastic/elasticsearch/beats.png b/resources/elastic/elasticsearch/beats.png new file mode 100644 index 000000000..78d80b27d Binary files /dev/null and b/resources/elastic/elasticsearch/beats.png differ diff --git a/resources/generic/device/mobile.png b/resources/generic/device/mobile.png new file mode 100644 index 000000000..75d942da8 Binary files /dev/null and b/resources/generic/device/mobile.png differ diff --git a/resources/generic/device/tablet.png b/resources/generic/device/tablet.png new file mode 100644 index 000000000..fd3bff4ff Binary files /dev/null and b/resources/generic/device/tablet.png differ diff --git a/resources/generic/os/android.png b/resources/generic/os/android.png new file mode 100644 index 000000000..72eab86ff Binary files /dev/null and b/resources/generic/os/android.png differ diff --git a/resources/generic/os/centos.png b/resources/generic/os/centos.png new file mode 100644 index 000000000..483eb9923 Binary files /dev/null and b/resources/generic/os/centos.png differ diff --git a/resources/generic/os/ios.png b/resources/generic/os/ios.png new file mode 100644 index 000000000..f3d4e34e4 Binary files /dev/null and b/resources/generic/os/ios.png differ diff --git a/resources/generic/os/linux-general.png b/resources/generic/os/linux-general.png new file mode 100644 index 000000000..1e1a874d5 Binary files /dev/null and b/resources/generic/os/linux-general.png differ diff --git a/resources/generic/os/suse.png b/resources/generic/os/suse.png new file mode 100644 index 000000000..3b9553c64 Binary files /dev/null and b/resources/generic/os/suse.png differ diff --git a/resources/generic/os/ubuntu.png b/resources/generic/os/ubuntu.png new file mode 100644 index 000000000..d1caf5eeb Binary files /dev/null and b/resources/generic/os/ubuntu.png differ diff --git a/resources/generic/os/windows.png b/resources/generic/os/windows.png new file mode 100644 index 000000000..2ded497d0 Binary files /dev/null and b/resources/generic/os/windows.png differ diff --git a/resources/generic/virtualization/virtualbox.png b/resources/generic/virtualization/virtualbox.png new file mode 100644 index 000000000..aefdbff07 Binary files /dev/null and b/resources/generic/virtualization/virtualbox.png differ diff --git a/resources/generic/virtualization/vmware.png b/resources/generic/virtualization/vmware.png new file mode 100644 index 000000000..189129c15 Binary files /dev/null and b/resources/generic/virtualization/vmware.png differ diff --git a/resources/generic/virtualization/xen.png b/resources/generic/virtualization/xen.png new file mode 100644 index 000000000..71655e1ad Binary files /dev/null and b/resources/generic/virtualization/xen.png differ diff --git a/resources/k8s/ecosystem/helm.png b/resources/k8s/ecosystem/helm.png new file mode 100644 index 000000000..355f40cf7 Binary files /dev/null and b/resources/k8s/ecosystem/helm.png differ diff --git a/resources/k8s/ecosystem/krew.png b/resources/k8s/ecosystem/krew.png new file mode 100644 index 000000000..913a24f79 Binary files /dev/null and b/resources/k8s/ecosystem/krew.png differ diff --git a/resources/k8s/ecosystem/kustomize.png b/resources/k8s/ecosystem/kustomize.png new file mode 100644 index 000000000..845c1270f Binary files /dev/null and b/resources/k8s/ecosystem/kustomize.png differ diff --git a/resources/onprem/analytics/dbt.png b/resources/onprem/analytics/dbt.png new file mode 100644 index 000000000..5e221ab24 Binary files /dev/null and b/resources/onprem/analytics/dbt.png differ diff --git a/resources/onprem/analytics/singer.png b/resources/onprem/analytics/singer.png new file mode 100644 index 000000000..4577d249b Binary files /dev/null and b/resources/onprem/analytics/singer.png differ diff --git a/resources/saas/analytics/stitch.png b/resources/saas/analytics/stitch.png new file mode 100644 index 000000000..7c9e65783 Binary files /dev/null and b/resources/saas/analytics/stitch.png differ diff --git a/scripts/generate.py b/scripts/generate.py index fedee589a..f1568d246 100644 --- a/scripts/generate.py +++ b/scripts/generate.py @@ -7,7 +7,7 @@ import config as cfg from . import app_root_dir, doc_root_dir, resource_dir, template_dir -_usage = "Usage: generate.py " +_usage = "Usage: generate.py " def load_tmpl(tmpl: str) -> Template: diff --git a/scripts/resource.py b/scripts/resource.py index 20aee58e7..9941f6e65 100644 --- a/scripts/resource.py +++ b/scripts/resource.py @@ -24,6 +24,8 @@ def cleaner_onprem(f): def cleaner_aws(f): f = f.replace("_", "-") f = f.replace("@4x", "") + f = f.replace("@5x", "") + f = f.replace("2.0", "2-0") f = f.replace("-light-bg4x", "") f = f.replace("-light-bg", "") for p in cfg.FILE_PREFIXES["aws"]: @@ -94,9 +96,11 @@ def cleaner_oci(f): def cleaner_programming(f): return f.lower() + def cleaner_generic(f): return f.lower() + def cleaner_saas(f): return f.lower() diff --git a/website/i18n/en.json b/website/i18n/en.json index 2c1e8562b..e18f4e073 100644 --- a/website/i18n/en.json +++ b/website/i18n/en.json @@ -41,6 +41,9 @@ "nodes/gcp": { "title": "GCP" }, + "nodes/generic": { + "title": "Generic" + }, "nodes/k8s": { "title": "K8S" }, diff --git a/website/package-lock.json b/website/package-lock.json index 06c2ede3d..6afc1b336 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -9090,9 +9090,9 @@ } }, "websocket-extensions": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", "dev": true }, "whatwg-url": { diff --git a/website/yarn.lock b/website/yarn.lock index ff053cbc3..d1c68bd67 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -906,11 +906,6 @@ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8" integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw== -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - accepts@~1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" @@ -999,11 +994,6 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== - arch@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e" @@ -1016,14 +1006,6 @@ archive-type@^4.0.0: dependencies: file-type "^4.2.0" -are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - argparse@^1.0.10, argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -1567,11 +1549,6 @@ chokidar@^2.0.4: optionalDependencies: fsevents "^1.2.7" -chownr@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" - integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== - class-utils@^0.3.5: version "0.3.6" resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" @@ -1624,11 +1601,6 @@ coa@^2.0.2: chalk "^2.4.1" q "^1.1.2" -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - coffee-script@^1.12.4: version "1.12.7" resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53" @@ -1746,11 +1718,6 @@ config-chain@^1.1.11: ini "^1.3.4" proto-list "~1.2.1" -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - console-stream@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/console-stream/-/console-stream-0.1.1.tgz#a095fe07b20465955f2fafd28b5d72bccd949d44" @@ -2024,7 +1991,7 @@ debug@4.1.0: dependencies: ms "^2.1.1" -debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2108,11 +2075,6 @@ decompress@^4.0.0, decompress@^4.2.0: pify "^2.3.0" strip-dirs "^2.0.0" -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - deep-is@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -2157,11 +2119,6 @@ delegate@^3.1.2: resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166" integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw== -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -2172,11 +2129,6 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detect-port-alt@1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275" @@ -2909,13 +2861,6 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-minipass@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" - integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== - dependencies: - minipass "^2.6.0" - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -2934,20 +2879,6 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - gaze@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" @@ -3224,11 +3155,6 @@ has-to-string-tag-x@^1.2.0: dependencies: has-symbol-support-x "^1.4.1" -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -3350,7 +3276,7 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3362,13 +3288,6 @@ ieee754@^1.1.4: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== -ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== - dependencies: - minimatch "^3.0.4" - ignore@^3.3.5: version "3.3.10" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" @@ -3469,7 +3388,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@^1.3.4, ini@^1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -3645,13 +3564,6 @@ is-finite@^1.0.0: resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" @@ -4395,21 +4307,6 @@ minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" - integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - -minizlib@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" - integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== - dependencies: - minipass "^2.9.0" - mixin-deep@^1.1.3, mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -4418,7 +4315,7 @@ mixin-deep@^1.1.3, mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: +mkdirp@^0.5.1, mkdirp@~0.5.1: version "0.5.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512" integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw== @@ -4467,15 +4364,6 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -needle@^2.2.1: - version "2.3.3" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117" - integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -4491,22 +4379,6 @@ node-modules-regexp@^1.0.0: resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-releases@^1.1.29, node-releases@^1.1.52: version "1.1.52" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9" @@ -4514,14 +4386,6 @@ node-releases@^1.1.29, node-releases@^1.1.52: dependencies: semver "^6.3.0" -nopt@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" - integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== - dependencies: - abbrev "1" - osenv "^0.1.4" - normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -4563,13 +4427,6 @@ normalize-url@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== -npm-bundled@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" - integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== - dependencies: - npm-normalize-package-bin "^1.0.1" - npm-conf@^1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" @@ -4578,20 +4435,6 @@ npm-conf@^1.1.0: config-chain "^1.1.11" pify "^3.0.0" -npm-normalize-package-bin@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" - integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== - -npm-packlist@^1.1.6: - version "1.4.8" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" - integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - npm-normalize-package-bin "^1.0.1" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -4599,16 +4442,6 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npmlog@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - nth-check@^1.0.2, nth-check@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" @@ -4621,11 +4454,6 @@ num2fraction@^1.2.2: resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" @@ -4748,24 +4576,11 @@ os-filter-obj@^2.0.0: dependencies: arch "^2.1.0" -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= - -os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: +os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - p-cancelable@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa" @@ -5448,16 +5263,6 @@ raw-body@~1.1.0: bytes "1" string_decoder "0.10" -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - react-dev-utils@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-9.1.0.tgz#3ad2bb8848a32319d760d0a84c56c14bdaae5e81" @@ -5535,7 +5340,7 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -5766,7 +5571,7 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@^2.5.4, rimraf@^2.6.1: +rimraf@^2.5.4: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -5895,11 +5700,6 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - set-getter@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.0.tgz#d769c182c9d5a51f409145f2fba82e5e86e80376" @@ -6162,16 +5962,7 @@ string-template@~0.2.1: resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0= -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2", string-width@^2.1.0: +string-width@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -6221,7 +6012,7 @@ strip-ansi@5.2.0, strip-ansi@^5.1.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^3.0.0, strip-ansi@^3.0.1: +strip-ansi@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= @@ -6266,11 +6057,6 @@ strip-indent@^1.0.1: dependencies: get-stdin "^4.0.1" -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - strip-outer@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631" @@ -6350,19 +6136,6 @@ tar-stream@^1.5.2: to-buffer "^1.1.1" xtend "^4.0.0" -tar@^4.4.2: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== - dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" - tcp-port-used@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tcp-port-used/-/tcp-port-used-1.0.1.tgz#46061078e2d38c73979a2c2c12b5a674e6689d70" @@ -6743,9 +6516,9 @@ websocket-driver@>=0.5.1: websocket-extensions ">=0.1.1" websocket-extensions@>=0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" - integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg== + version "0.1.4" + resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== whatwg-url@^7.0.0: version "7.1.0" @@ -6763,13 +6536,6 @@ which@^1.2.9, which@^1.3.1: dependencies: isexe "^2.0.0" -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== - dependencies: - string-width "^1.0.2 || 2" - wordwrap@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" @@ -6809,11 +6575,6 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" - integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== - yamljs@^0.2.1: version "0.2.10" resolved "https://registry.yarnpkg.com/yamljs/-/yamljs-0.2.10.tgz#481cc7c25ca73af59f591f0c96e3ce56c757a40f"