Merge ed09a76c5a into b595157bd0

.gitignore

@@ -30,4 +30,4 @@ website/package-lock.json
 # Ignore .swp files
 .swp
 *.whl
-dist/
+dist/

config.py

@@ -203,12 +203,21 @@ ALIASES = {
         "database": {
             "DatabaseMigrationService": "DMS",
             "DocumentdbMongodbCompatibility": "DocumentDB",
-            "DynamodbDax": "DAX",
+            "DocumentdbElasticClusters": "DocumentDBElasticClusters",
+            "Documentdb": "DocDB",
+            "DynamodbAmazonDynamodbAccelerator": "DAX",
+            "DynamodbDax": "DynamodbDAX",
             "DynamodbGlobalSecondaryIndex": "DynamodbGSI",
             "Database": "DB",
             "Dynamodb": "DDB",
             "Elasticache": "ElastiCache",
+            "ElasticacheForValkey": "ElastiCacheForValkey",
+            "Keyspaces": "Cassandra",
+            "KeyspacesManagedApacheCassandraService": "KeyspacesCassandra",
+            "Memorydb": "MemoryDB",
+            "OracleDatabaseAtAWS": "OracleDB",
             "QuantumLedgerDatabaseQldb": "QLDB",
+            "RDSProxyInstance": "RDSProxy",
         },
         "devtools": {
             "CommandLineInterface": "CLI",

diagrams/aws/database.py

@@ -8,14 +8,78 @@ class _Database(_AWS):
     _icon_dir = "resources/aws/database"
 
 
+class AuroraAmazonAuroraInstanceAlternate(_Database):
+    _icon = "aurora-amazon-aurora-instance-alternate.png"
+
+
+class AuroraAmazonRDSInstanceAlternate(_Database):
+    _icon = "aurora-amazon-rds-instance-alternate.png"
+
+
+class AuroraAmazonRDSInstance(_Database):
+    _icon = "aurora-amazon-rds-instance.png"
+
+
 class AuroraInstance(_Database):
     _icon = "aurora-instance.png"
 
 
+class AuroraMariadbInstanceAlternate(_Database):
+    _icon = "aurora-mariadb-instance-alternate.png"
+
+
+class AuroraMariadbInstance(_Database):
+    _icon = "aurora-mariadb-instance.png"
+
+
+class AuroraMysqlInstanceAlternate(_Database):
+    _icon = "aurora-mysql-instance-alternate.png"
+
+
+class AuroraMysqlInstance(_Database):
+    _icon = "aurora-mysql-instance.png"
+
+
+class AuroraOracleInstanceAlternate(_Database):
+    _icon = "aurora-oracle-instance-alternate.png"
+
+
+class AuroraOracleInstance(_Database):
+    _icon = "aurora-oracle-instance.png"
+
+
+class AuroraPiopsInstance(_Database):
+    _icon = "aurora-piops-instance.png"
+
+
+class AuroraPostgresqlInstanceAlternate(_Database):
+    _icon = "aurora-postgresql-instance-alternate.png"
+
+
+class AuroraPostgresqlInstance(_Database):
+    _icon = "aurora-postgresql-instance.png"
+
+
+class AuroraSqlServerInstanceAlternate(_Database):
+    _icon = "aurora-sql-server-instance-alternate.png"
+
+
+class AuroraSqlServerInstance(_Database):
+    _icon = "aurora-sql-server-instance.png"
+
+
+class AuroraTrustedLanguageExtensionsForPostgresql(_Database):
+    _icon = "aurora-trusted-language-extensions-for-postgresql.png"
+
+
 class Aurora(_Database):
     _icon = "aurora.png"
 
 
+class DatabaseMigrationServiceDatabaseMigrationWorkflowOrJob(_Database):
+    _icon = "database-migration-service-database-migration-workflow-or-job.png"
+
+
 class DatabaseMigrationServiceDatabaseMigrationWorkflow(_Database):
     _icon = "database-migration-service-database-migration-workflow.png"
 
@@ -28,10 +92,22 @@ class Database(_Database):
     _icon = "database.png"
 
 
+class DocumentdbElasticClusters(_Database):
+    _icon = "documentdb-elastic-clusters.png"
+
+
 class DocumentdbMongodbCompatibility(_Database):
     _icon = "documentdb-mongodb-compatibility.png"
 
 
+class Documentdb(_Database):
+    _icon = "documentdb.png"
+
+
+class DynamodbAmazonDynamodbAccelerator(_Database):
+    _icon = "dynamodb-amazon-dynamodb-accelerator.png"
+
+
 class DynamodbAttribute(_Database):
     _icon = "dynamodb-attribute.png"
 
@@ -56,6 +132,18 @@ class DynamodbItems(_Database):
     _icon = "dynamodb-items.png"
 
 
+class DynamodbStandardAccessTableClass(_Database):
+    _icon = "dynamodb-standard-access-table-class.png"
+
+
+class DynamodbStandardInfrequentAccessTableClass(_Database):
+    _icon = "dynamodb-standard-infrequent-access-table-class.png"
+
+
+class DynamodbStream(_Database):
+    _icon = "dynamodb-stream.png"
+
+
 class DynamodbStreams(_Database):
     _icon = "dynamodb-streams.png"
 
@@ -80,6 +168,10 @@ class ElasticacheForRedis(_Database):
     _icon = "elasticache-for-redis.png"
 
 
+class ElasticacheForValkey(_Database):
+    _icon = "elasticache-for-valkey.png"
+
+
 class Elasticache(_Database):
     _icon = "elasticache.png"
 
@@ -88,14 +180,30 @@ class KeyspacesManagedApacheCassandraService(_Database):
     _icon = "keyspaces-managed-apache-cassandra-service.png"
 
 
+class Keyspaces(_Database):
+    _icon = "keyspaces.png"
+
+
+class Memorydb(_Database):
+    _icon = "memorydb.png"
+
+
 class Neptune(_Database):
     _icon = "neptune.png"
 
 
+class OracleDatabaseAtAWS(_Database):
+    _icon = "oracle-database-at-aws.png"
+
+
 class QuantumLedgerDatabaseQldb(_Database):
     _icon = "quantum-ledger-database-qldb.png"
 
 
+class RDSBlueGreenDeployments(_Database):
+    _icon = "rds-blue-green-deployments.png"
+
+
 class RDSInstance(_Database):
     _icon = "rds-instance.png"
 
@@ -104,6 +212,14 @@ class RDSMariadbInstance(_Database):
     _icon = "rds-mariadb-instance.png"
 
 
+class RDSMultiAzDbCluster(_Database):
+    _icon = "rds-multi-az-db-cluster.png"
+
+
+class RDSMultiAz(_Database):
+    _icon = "rds-multi-az.png"
+
+
 class RDSMysqlInstance(_Database):
     _icon = "rds-mysql-instance.png"
 
@@ -112,6 +228,10 @@ class RDSOnVmware(_Database):
     _icon = "rds-on-vmware.png"
 
 
+class RDSOptimizedWrites(_Database):
+    _icon = "rds-optimized-writes.png"
+
+
 class RDSOracleInstance(_Database):
     _icon = "rds-oracle-instance.png"
 
@@ -120,10 +240,22 @@ class RDSPostgresqlInstance(_Database):
     _icon = "rds-postgresql-instance.png"
 
 
+class RDSProxyInstanceAlternate(_Database):
+    _icon = "rds-proxy-instance-alternate.png"
+
+
+class RDSProxyInstance(_Database):
+    _icon = "rds-proxy-instance.png"
+
+
 class RDSSqlServerInstance(_Database):
     _icon = "rds-sql-server-instance.png"
 
 
+class RDSTrustedLanguageExtensionsForPostgresql(_Database):
+    _icon = "rds-trusted-language-extensions-for-postgresql.png"
+
+
 class RDS(_Database):
     _icon = "rds.png"
 
@@ -148,9 +280,18 @@ class Timestream(_Database):
 
 DMS = DatabaseMigrationService
 DocumentDB = DocumentdbMongodbCompatibility
-DAX = DynamodbDax
+DocumentDBElasticClusters = DocumentdbElasticClusters
+DocDB = Documentdb
+DAX = DynamodbAmazonDynamodbAccelerator
+DynamodbDAX = DynamodbDax
 DynamodbGSI = DynamodbGlobalSecondaryIndex
 DB = Database
 DDB = Dynamodb
 ElastiCache = Elasticache
+ElastiCacheForValkey = ElasticacheForValkey
+Cassandra = Keyspaces
+KeyspacesCassandra = KeyspacesManagedApacheCassandraService
+MemoryDB = Memorydb
+OracleDB = OracleDatabaseAtAWS
 QLDB = QuantumLedgerDatabaseQldb
+RDSProxy = RDSProxyInstance

docs/nodes/aws.md

@@ -287,12 +287,60 @@ Node classes list of the aws provider.
 ## aws.database
 
 
+<img width="30" src="/img/resources/aws/database/aurora-amazon-aurora-instance-alternate.png" alt="AuroraAmazonAuroraInstanceAlternate" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.AuroraAmazonAuroraInstanceAlternate**
+
+<img width="30" src="/img/resources/aws/database/aurora-amazon-rds-instance-alternate.png" alt="AuroraAmazonRDSInstanceAlternate" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.AuroraAmazonRDSInstanceAlternate**
+
+<img width="30" src="/img/resources/aws/database/aurora-amazon-rds-instance.png" alt="AuroraAmazonRDSInstance" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.AuroraAmazonRDSInstance**
+
 <img width="30" src="/img/resources/aws/database/aurora-instance.png" alt="AuroraInstance" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.AuroraInstance**
 
+<img width="30" src="/img/resources/aws/database/aurora-mariadb-instance-alternate.png" alt="AuroraMariadbInstanceAlternate" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.AuroraMariadbInstanceAlternate**
+
+<img width="30" src="/img/resources/aws/database/aurora-mariadb-instance.png" alt="AuroraMariadbInstance" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.AuroraMariadbInstance**
+
+<img width="30" src="/img/resources/aws/database/aurora-mysql-instance-alternate.png" alt="AuroraMysqlInstanceAlternate" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.AuroraMysqlInstanceAlternate**
+
+<img width="30" src="/img/resources/aws/database/aurora-mysql-instance.png" alt="AuroraMysqlInstance" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.AuroraMysqlInstance**
+
+<img width="30" src="/img/resources/aws/database/aurora-oracle-instance-alternate.png" alt="AuroraOracleInstanceAlternate" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.AuroraOracleInstanceAlternate**
+
+<img width="30" src="/img/resources/aws/database/aurora-oracle-instance.png" alt="AuroraOracleInstance" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.AuroraOracleInstance**
+
+<img width="30" src="/img/resources/aws/database/aurora-piops-instance.png" alt="AuroraPiopsInstance" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.AuroraPiopsInstance**
+
+<img width="30" src="/img/resources/aws/database/aurora-postgresql-instance-alternate.png" alt="AuroraPostgresqlInstanceAlternate" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.AuroraPostgresqlInstanceAlternate**
+
+<img width="30" src="/img/resources/aws/database/aurora-postgresql-instance.png" alt="AuroraPostgresqlInstance" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.AuroraPostgresqlInstance**
+
+<img width="30" src="/img/resources/aws/database/aurora-sql-server-instance-alternate.png" alt="AuroraSqlServerInstanceAlternate" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.AuroraSqlServerInstanceAlternate**
+
+<img width="30" src="/img/resources/aws/database/aurora-sql-server-instance.png" alt="AuroraSqlServerInstance" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.AuroraSqlServerInstance**
+
+<img width="30" src="/img/resources/aws/database/aurora-trusted-language-extensions-for-postgresql.png" alt="AuroraTrustedLanguageExtensionsForPostgresql" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.AuroraTrustedLanguageExtensionsForPostgresql**
+
 <img width="30" src="/img/resources/aws/database/aurora.png" alt="Aurora" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.Aurora**
 
+<img width="30" src="/img/resources/aws/database/database-migration-service-database-migration-workflow-or-job.png" alt="DatabaseMigrationServiceDatabaseMigrationWorkflowOrJob" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.DatabaseMigrationServiceDatabaseMigrationWorkflowOrJob**
+
 <img width="30" src="/img/resources/aws/database/database-migration-service-database-migration-workflow.png" alt="DatabaseMigrationServiceDatabaseMigrationWorkflow" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.DatabaseMigrationServiceDatabaseMigrationWorkflow**
 
@@ -302,9 +350,18 @@ Node classes list of the aws provider.
 <img width="30" src="/img/resources/aws/database/database.png" alt="Database" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.Database**, **DB** (alias)
 
+<img width="30" src="/img/resources/aws/database/documentdb-elastic-clusters.png" alt="DocumentdbElasticClusters" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.DocumentdbElasticClusters**, **DocumentDBElasticClusters** (alias)
+
 <img width="30" src="/img/resources/aws/database/documentdb-mongodb-compatibility.png" alt="DocumentdbMongodbCompatibility" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.DocumentdbMongodbCompatibility**, **DocumentDB** (alias)
 
+<img width="30" src="/img/resources/aws/database/documentdb.png" alt="Documentdb" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.Documentdb**, **DocDB** (alias)
+
+<img width="30" src="/img/resources/aws/database/dynamodb-amazon-dynamodb-accelerator.png" alt="DynamodbAmazonDynamodbAccelerator" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.DynamodbAmazonDynamodbAccelerator**, **DAX** (alias)
+
 <img width="30" src="/img/resources/aws/database/dynamodb-attribute.png" alt="DynamodbAttribute" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.DynamodbAttribute**
 
@@ -312,7 +369,7 @@ Node classes list of the aws provider.
 **diagrams.aws.database.DynamodbAttributes**
 
 <img width="30" src="/img/resources/aws/database/dynamodb-dax.png" alt="DynamodbDax" style="float: left; padding-right: 5px;" >
-**diagrams.aws.database.DynamodbDax**, **DAX** (alias)
+**diagrams.aws.database.DynamodbDax**, **DynamodbDAX** (alias)
 
 <img width="30" src="/img/resources/aws/database/dynamodb-global-secondary-index.png" alt="DynamodbGlobalSecondaryIndex" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.DynamodbGlobalSecondaryIndex**, **DynamodbGSI** (alias)
@@ -323,6 +380,15 @@ Node classes list of the aws provider.
 <img width="30" src="/img/resources/aws/database/dynamodb-items.png" alt="DynamodbItems" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.DynamodbItems**
 
+<img width="30" src="/img/resources/aws/database/dynamodb-standard-access-table-class.png" alt="DynamodbStandardAccessTableClass" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.DynamodbStandardAccessTableClass**
+
+<img width="30" src="/img/resources/aws/database/dynamodb-standard-infrequent-access-table-class.png" alt="DynamodbStandardInfrequentAccessTableClass" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.DynamodbStandardInfrequentAccessTableClass**
+
+<img width="30" src="/img/resources/aws/database/dynamodb-stream.png" alt="DynamodbStream" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.DynamodbStream**
+
 <img width="30" src="/img/resources/aws/database/dynamodb-streams.png" alt="DynamodbStreams" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.DynamodbStreams**
 
@@ -341,39 +407,72 @@ Node classes list of the aws provider.
 <img width="30" src="/img/resources/aws/database/elasticache-for-redis.png" alt="ElasticacheForRedis" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.ElasticacheForRedis**
 
+<img width="30" src="/img/resources/aws/database/elasticache-for-valkey.png" alt="ElasticacheForValkey" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.ElasticacheForValkey**, **ElastiCacheForValkey** (alias)
+
 <img width="30" src="/img/resources/aws/database/elasticache.png" alt="Elasticache" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.Elasticache**, **ElastiCache** (alias)
 
 <img width="30" src="/img/resources/aws/database/keyspaces-managed-apache-cassandra-service.png" alt="KeyspacesManagedApacheCassandraService" style="float: left; padding-right: 5px;" >
-**diagrams.aws.database.KeyspacesManagedApacheCassandraService**
+**diagrams.aws.database.KeyspacesManagedApacheCassandraService**, **KeyspacesCassandra** (alias)
+
+<img width="30" src="/img/resources/aws/database/keyspaces.png" alt="Keyspaces" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.Keyspaces**, **Cassandra** (alias)
+
+<img width="30" src="/img/resources/aws/database/memorydb.png" alt="Memorydb" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.Memorydb**, **MemoryDB** (alias)
 
 <img width="30" src="/img/resources/aws/database/neptune.png" alt="Neptune" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.Neptune**
 
+<img width="30" src="/img/resources/aws/database/oracle-database-at-aws.png" alt="OracleDatabaseAtAWS" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.OracleDatabaseAtAWS**, **OracleDB** (alias)
+
 <img width="30" src="/img/resources/aws/database/quantum-ledger-database-qldb.png" alt="QuantumLedgerDatabaseQldb" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.QuantumLedgerDatabaseQldb**, **QLDB** (alias)
 
+<img width="30" src="/img/resources/aws/database/rds-blue-green-deployments.png" alt="RDSBlueGreenDeployments" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.RDSBlueGreenDeployments**
+
 <img width="30" src="/img/resources/aws/database/rds-instance.png" alt="RDSInstance" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.RDSInstance**
 
 <img width="30" src="/img/resources/aws/database/rds-mariadb-instance.png" alt="RDSMariadbInstance" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.RDSMariadbInstance**
 
+<img width="30" src="/img/resources/aws/database/rds-multi-az-db-cluster.png" alt="RDSMultiAzDbCluster" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.RDSMultiAzDbCluster**
+
+<img width="30" src="/img/resources/aws/database/rds-multi-az.png" alt="RDSMultiAz" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.RDSMultiAz**
+
 <img width="30" src="/img/resources/aws/database/rds-mysql-instance.png" alt="RDSMysqlInstance" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.RDSMysqlInstance**
 
 <img width="30" src="/img/resources/aws/database/rds-on-vmware.png" alt="RDSOnVmware" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.RDSOnVmware**
 
+<img width="30" src="/img/resources/aws/database/rds-optimized-writes.png" alt="RDSOptimizedWrites" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.RDSOptimizedWrites**
+
 <img width="30" src="/img/resources/aws/database/rds-oracle-instance.png" alt="RDSOracleInstance" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.RDSOracleInstance**
 
 <img width="30" src="/img/resources/aws/database/rds-postgresql-instance.png" alt="RDSPostgresqlInstance" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.RDSPostgresqlInstance**
 
+<img width="30" src="/img/resources/aws/database/rds-proxy-instance-alternate.png" alt="RDSProxyInstanceAlternate" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.RDSProxyInstanceAlternate**
+
+<img width="30" src="/img/resources/aws/database/rds-proxy-instance.png" alt="RDSProxyInstance" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.RDSProxyInstance**, **RDSProxy** (alias)
+
 <img width="30" src="/img/resources/aws/database/rds-sql-server-instance.png" alt="RDSSqlServerInstance" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.RDSSqlServerInstance**
 
+<img width="30" src="/img/resources/aws/database/rds-trusted-language-extensions-for-postgresql.png" alt="RDSTrustedLanguageExtensionsForPostgresql" style="float: left; padding-right: 5px;" >
+**diagrams.aws.database.RDSTrustedLanguageExtensionsForPostgresql**
+
 <img width="30" src="/img/resources/aws/database/rds.png" alt="RDS" style="float: left; padding-right: 5px;" >
 **diagrams.aws.database.RDS**