ominfra 0.0.0.dev445__py3-none-any.whl → 0.0.0.dev483__py3-none-any.whl

ominfra/clouds/aws/models/services/rds.py

@@ -242,6 +242,9 @@ class ReplicaMode(_enum.Enum):
     MOUNTED = 'mounted'
 
 
+SensitiveString = _ta.NewType('SensitiveString', str)
+
+
 @_dc.dataclass(frozen=True, kw_only=True)
 class SnapshotQuotaExceededFault(
     _base.Shape,
@@ -277,6 +280,97 @@ class TenantDatabaseQuotaExceededFault(
     pass
 
 
+class UpgradeRolloutOrder(_enum.Enum):
+    FIRST = 'first'
+    SECOND = 'second'
+    LAST = 'last'
+
+
+@_dc.dataclass(frozen=True, kw_only=True)
+class VpcEncryptionControlViolationException(
+    _base.Shape,
+    shape_name='VpcEncryptionControlViolationException',
+):
+    pass
+
+
+@_dc.dataclass(frozen=True, kw_only=True)
+class AdditionalStorageVolume(
+    _base.Shape,
+    shape_name='AdditionalStorageVolume',
+):
+    volume_name: str = _dc.field(metadata=_base.field_metadata(
+        member_name='VolumeName',
+        shape_name='String',
+    ))
+
+    allocated_storage: IntegerOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='AllocatedStorage',
+        shape_name='IntegerOptional',
+    ))
+
+    io_p_s: IntegerOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='IOPS',
+        shape_name='IntegerOptional',
+    ))
+
+    max_allocated_storage: IntegerOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='MaxAllocatedStorage',
+        shape_name='IntegerOptional',
+    ))
+
+    storage_throughput: IntegerOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='StorageThroughput',
+        shape_name='IntegerOptional',
+    ))
+
+    storage_type: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='StorageType',
+        shape_name='String',
+    ))
+
+
+@_dc.dataclass(frozen=True, kw_only=True)
+class AdditionalStorageVolumeOutput(
+    _base.Shape,
+    shape_name='AdditionalStorageVolumeOutput',
+):
+    volume_name: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='VolumeName',
+        shape_name='String',
+    ))
+
+    storage_volume_status: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='StorageVolumeStatus',
+        shape_name='String',
+    ))
+
+    allocated_storage: int | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='AllocatedStorage',
+        shape_name='Integer',
+    ))
+
+    io_p_s: IntegerOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='IOPS',
+        shape_name='IntegerOptional',
+    ))
+
+    max_allocated_storage: IntegerOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='MaxAllocatedStorage',
+        shape_name='IntegerOptional',
+    ))
+
+    storage_throughput: IntegerOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='StorageThroughput',
+        shape_name='IntegerOptional',
+    ))
+
+    storage_type: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='StorageType',
+        shape_name='String',
+    ))
+
+
 @_dc.dataclass(frozen=True, kw_only=True)
 class AvailabilityZone(
     _base.Shape,
@@ -582,6 +676,10 @@ class VpcSecurityGroupMembership(
     ))
 
 
+AdditionalStorageVolumesList: _ta.TypeAlias = _ta.Sequence[AdditionalStorageVolume]
+
+AdditionalStorageVolumesOutputList: _ta.TypeAlias = _ta.Sequence[AdditionalStorageVolumeOutput]
+
 DBInstanceAutomatedBackupsReplicationList: _ta.TypeAlias = _ta.Sequence[DBInstanceAutomatedBackupsReplication]
 
 DBInstanceRoles: _ta.TypeAlias = _ta.Sequence[DBInstanceRole]
@@ -740,9 +838,9 @@ class CreateDBInstanceMessage(
         shape_name='String',
     ))
 
-    master_user_password: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+    master_user_password: SensitiveString | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='MasterUserPassword',
-        shape_name='String',
+        shape_name='SensitiveString',
     ))
 
     db_security_groups: DBSecurityGroupNameList | None = _dc.field(default=None, metadata=_base.field_metadata(
@@ -817,6 +915,11 @@ class CreateDBInstanceMessage(
         shape_name='IntegerOptional',
     ))
 
+    storage_throughput: IntegerOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='StorageThroughput',
+        shape_name='IntegerOptional',
+    ))
+
     option_group_name: str | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='OptionGroupName',
         shape_name='String',
@@ -858,9 +961,9 @@ class CreateDBInstanceMessage(
         shape_name='String',
     ))
 
-    tde_credential_password: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+    tde_credential_password: SensitiveString | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='TdeCredentialPassword',
-        shape_name='String',
+        shape_name='SensitiveString',
     ))
 
     storage_encrypted: BooleanOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
@@ -981,8 +1084,8 @@ class CreateDBInstanceMessage(
         shape_name='BooleanOptional',
     ))
 
-    custom_iam_instance_profile: str | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='CustomIamInstanceProfile',
+    network_type: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='NetworkType',
         shape_name='String',
     ))
 
@@ -991,14 +1094,19 @@ class CreateDBInstanceMessage(
         shape_name='String',
     ))
 
-    network_type: str | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='NetworkType',
+    custom_iam_instance_profile: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='CustomIamInstanceProfile',
         shape_name='String',
     ))
 
-    storage_throughput: IntegerOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='StorageThroughput',
-        shape_name='IntegerOptional',
+    db_system_id: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='DBSystemId',
+        shape_name='String',
+    ))
+
+    ca_certificate_identifier: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='CACertificateIdentifier',
+        shape_name='String',
     ))
 
     manage_master_user_password: BooleanOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
@@ -1011,14 +1119,9 @@ class CreateDBInstanceMessage(
         shape_name='String',
     ))
 
-    ca_certificate_identifier: str | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='CACertificateIdentifier',
-        shape_name='String',
-    ))
-
-    db_system_id: str | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='DBSystemId',
-        shape_name='String',
+    multi_tenant: BooleanOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='MultiTenant',
+        shape_name='BooleanOptional',
     ))
 
     dedicated_log_volume: BooleanOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
@@ -1026,11 +1129,6 @@ class CreateDBInstanceMessage(
         shape_name='BooleanOptional',
     ))
 
-    multi_tenant: BooleanOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='MultiTenant',
-        shape_name='BooleanOptional',
-    ))
-
     engine_lifecycle_support: str | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='EngineLifecycleSupport',
         shape_name='String',
@@ -1041,6 +1139,12 @@ class CreateDBInstanceMessage(
         shape_name='MasterUserAuthenticationType',
     ))
 
+    additional_storage_volumes: AdditionalStorageVolumesList | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='AdditionalStorageVolumes',
+        value_type=_base.ListValueType(AdditionalStorageVolume),
+        shape_name='AdditionalStorageVolumesList',
+    ))
+
 
 DomainMembershipList: _ta.TypeAlias = _ta.Sequence[DomainMembership]
 
@@ -1062,9 +1166,9 @@ class PendingModifiedValues(
         shape_name='IntegerOptional',
     ))
 
-    master_user_password: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+    master_user_password: SensitiveString | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='MasterUserPassword',
-        shape_name='String',
+        shape_name='SensitiveString',
     ))
 
     port: IntegerOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
@@ -1097,6 +1201,11 @@ class PendingModifiedValues(
         shape_name='IntegerOptional',
     ))
 
+    storage_throughput: IntegerOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='StorageThroughput',
+        shape_name='IntegerOptional',
+    ))
+
     db_instance_identifier: str | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='DBInstanceIdentifier',
         shape_name='String',
@@ -1128,11 +1237,6 @@ class PendingModifiedValues(
         shape_name='ProcessorFeatureList',
     ))
 
-    iam_database_authentication_enabled: BooleanOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='IAMDatabaseAuthenticationEnabled',
-        shape_name='BooleanOptional',
-    ))
-
     automation_mode: AutomationMode | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='AutomationMode',
         shape_name='AutomationMode',
@@ -1143,14 +1247,14 @@ class PendingModifiedValues(
         shape_name='TStamp',
     ))
 
-    storage_throughput: IntegerOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='StorageThroughput',
-        shape_name='IntegerOptional',
+    multi_tenant: BooleanOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='MultiTenant',
+        shape_name='BooleanOptional',
     ))
 
-    engine: str | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='Engine',
-        shape_name='String',
+    iam_database_authentication_enabled: BooleanOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='IAMDatabaseAuthenticationEnabled',
+        shape_name='BooleanOptional',
     ))
 
     dedicated_log_volume: BooleanOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
@@ -1158,9 +1262,15 @@ class PendingModifiedValues(
         shape_name='BooleanOptional',
     ))
 
-    multi_tenant: BooleanOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='MultiTenant',
-        shape_name='BooleanOptional',
+    engine: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='Engine',
+        shape_name='String',
+    ))
+
+    additional_storage_volumes: AdditionalStorageVolumesList | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='AdditionalStorageVolumes',
+        value_type=_base.ListValueType(AdditionalStorageVolume),
+        shape_name='AdditionalStorageVolumesList',
     ))
 
 
@@ -1262,11 +1372,6 @@ class DBInstance(
         shape_name='String',
     ))
 
-    automatic_restart_time: TStamp | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='AutomaticRestartTime',
-        shape_name='TStamp',
-    ))
-
     master_username: str | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='MasterUsername',
         shape_name='String',
@@ -1335,6 +1440,11 @@ class DBInstance(
         shape_name='String',
     ))
 
+    upgrade_rollout_order: UpgradeRolloutOrder | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='UpgradeRolloutOrder',
+        shape_name='UpgradeRolloutOrder',
+    ))
+
     pending_modified_values: PendingModifiedValues | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='PendingModifiedValues',
         shape_name='PendingModifiedValues',
@@ -1392,6 +1502,11 @@ class DBInstance(
         shape_name='IntegerOptional',
     ))
 
+    storage_throughput: IntegerOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='StorageThroughput',
+        shape_name='IntegerOptional',
+    ))
+
     option_group_memberships: OptionGroupMembershipList | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='OptionGroupMemberships',
         value_type=_base.ListValueType(OptionGroupMembership),
@@ -1569,10 +1684,14 @@ class DBInstance(
         shape_name='TagList',
     ))
 
-    db_instance_automated_backups_replications: DBInstanceAutomatedBackupsReplicationList | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='DBInstanceAutomatedBackupsReplications',
-        value_type=_base.ListValueType(DBInstanceAutomatedBackupsReplication),
-        shape_name='DBInstanceAutomatedBackupsReplicationList',
+    automation_mode: AutomationMode | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='AutomationMode',
+        shape_name='AutomationMode',
+    ))
+
+    resume_full_automation_mode_time: TStamp | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='ResumeFullAutomationModeTime',
+        shape_name='TStamp',
     ))
 
     customer_owned_ip_enabled: BooleanOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
@@ -1580,8 +1699,8 @@ class DBInstance(
         shape_name='BooleanOptional',
     ))
 
-    aws_backup_recovery_point_arn: str | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='AwsBackupRecoveryPointArn',
+    network_type: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='NetworkType',
         shape_name='String',
     ))
 
@@ -1610,19 +1729,15 @@ class DBInstance(
         shape_name='BooleanOptional',
     ))
 
-    automation_mode: AutomationMode | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='AutomationMode',
-        shape_name='AutomationMode',
-    ))
-
-    resume_full_automation_mode_time: TStamp | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='ResumeFullAutomationModeTime',
-        shape_name='TStamp',
+    aws_backup_recovery_point_arn: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='AwsBackupRecoveryPointArn',
+        shape_name='String',
     ))
 
-    custom_iam_instance_profile: str | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='CustomIamInstanceProfile',
-        shape_name='String',
+    db_instance_automated_backups_replications: DBInstanceAutomatedBackupsReplicationList | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='DBInstanceAutomatedBackupsReplications',
+        value_type=_base.ListValueType(DBInstanceAutomatedBackupsReplication),
+        shape_name='DBInstanceAutomatedBackupsReplicationList',
     ))
 
     backup_target: str | None = _dc.field(default=None, metadata=_base.field_metadata(
@@ -1630,8 +1745,13 @@ class DBInstance(
         shape_name='String',
     ))
 
-    network_type: str | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='NetworkType',
+    automatic_restart_time: TStamp | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='AutomaticRestartTime',
+        shape_name='TStamp',
+    ))
+
+    custom_iam_instance_profile: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='CustomIamInstanceProfile',
         shape_name='String',
     ))
 
@@ -1640,9 +1760,9 @@ class DBInstance(
         shape_name='ActivityStreamPolicyStatus',
     ))
 
-    storage_throughput: IntegerOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='StorageThroughput',
-        shape_name='IntegerOptional',
+    certificate_details: CertificateDetails | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='CertificateDetails',
+        shape_name='CertificateDetails',
     ))
 
     db_system_id: str | None = _dc.field(default=None, metadata=_base.field_metadata(
@@ -1655,11 +1775,6 @@ class DBInstance(
         shape_name='MasterUserSecret',
     ))
 
-    certificate_details: CertificateDetails | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='CertificateDetails',
-        shape_name='CertificateDetails',
-    ))
-
     read_replica_source_db_cluster_identifier: str | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='ReadReplicaSourceDBClusterIdentifier',
         shape_name='String',
@@ -1670,6 +1785,11 @@ class DBInstance(
         shape_name='String',
     ))
 
+    multi_tenant: BooleanOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='MultiTenant',
+        shape_name='BooleanOptional',
+    ))
+
     dedicated_log_volume: bool | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='DedicatedLogVolume',
         shape_name='Boolean',
@@ -1680,16 +1800,22 @@ class DBInstance(
         shape_name='BooleanOptional',
     ))
 
-    multi_tenant: BooleanOptional | None = _dc.field(default=None, metadata=_base.field_metadata(
-        member_name='MultiTenant',
-        shape_name='BooleanOptional',
-    ))
-
     engine_lifecycle_support: str | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='EngineLifecycleSupport',
         shape_name='String',
     ))
 
+    additional_storage_volumes: AdditionalStorageVolumesOutputList | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='AdditionalStorageVolumes',
+        value_type=_base.ListValueType(AdditionalStorageVolumeOutput),
+        shape_name='AdditionalStorageVolumesOutputList',
+    ))
+
+    storage_volume_status: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='StorageVolumeStatus',
+        shape_name='String',
+    ))
+
 
 @_dc.dataclass(frozen=True, kw_only=True)
 class CreateDBInstanceResult(
@@ -1767,6 +1893,8 @@ class DBInstanceMessage(
 
 
 ALL_SHAPES: frozenset[type[_base.Shape]] = frozenset([
+    AdditionalStorageVolume,
+    AdditionalStorageVolumeOutput,
     AuthorizationNotFoundFault,
     AvailabilityZone,
     BackupPolicyNotFoundFault,
@@ -1825,6 +1953,7 @@ ALL_SHAPES: frozenset[type[_base.Shape]] = frozenset([
     StorageTypeNotSupportedFault,
     Subnet,
     TenantDatabaseQuotaExceededFault,
+    VpcEncryptionControlViolationException,
     VpcSecurityGroupMembership,
 ])
 
@@ -1859,6 +1988,7 @@ CREATE_DB_INSTANCE = _base.Operation(
         StorageQuotaExceededFault,
         StorageTypeNotSupportedFault,
         TenantDatabaseQuotaExceededFault,
+        VpcEncryptionControlViolationException,
     ],
 )
 
@@ -1872,6 +2002,7 @@ DELETE_DB_INSTANCE = _base.Operation(
         DBSnapshotAlreadyExistsFault,
         InvalidDBClusterStateFault,
         InvalidDBInstanceStateFault,
+        KMSKeyNotAccessibleFault,
         SnapshotQuotaExceededFault,
     ],
 )
@@ -1892,6 +2023,7 @@ REBOOT_DB_INSTANCE = _base.Operation(
     errors=[
         DBInstanceNotFoundFault,
         InvalidDBInstanceStateFault,
+        KMSKeyNotAccessibleFault,
     ],
 )
 
@@ -1911,6 +2043,7 @@ START_DB_INSTANCE = _base.Operation(
         InvalidSubnet,
         InvalidVPCNetworkStateFault,
         KMSKeyNotAccessibleFault,
+        VpcEncryptionControlViolationException,
     ],
 )
 

ominfra/clouds/aws/models/services/s3.py

@@ -224,6 +224,7 @@ class ObjectStorageClass(_enum.Enum):
     SNOW = 'SNOW'
     EXPRESS_ONEZONE = 'EXPRESS_ONEZONE'
     FSX_OPENZFS = 'FSX_OPENZFS'
+    FSX_ONTAP = 'FSX_ONTAP'
 
 
 ObjectVersionId = _ta.NewType('ObjectVersionId', str)
@@ -312,6 +313,7 @@ class StorageClass(_enum.Enum):
     SNOW = 'SNOW'
     EXPRESS_ONEZONE = 'EXPRESS_ONEZONE'
     FSX_OPENZFS = 'FSX_OPENZFS'
+    FSX_ONTAP = 'FSX_ONTAP'
 
 
 TagCount = _ta.NewType('TagCount', int)

ominfra/manage/main.py

@@ -8,7 +8,6 @@ import asyncio
 import dataclasses as dc
 import json
 import os.path
-import sys
 import typing as ta
 
 from omdev.home.paths import get_home_paths
@@ -150,7 +149,7 @@ class MainCli(ArgparseCli):
 
 
 def _main() -> None:
-    sys.exit(asyncio.run(MainCli().async_cli_run()))
+    raise SystemExit(asyncio.run(MainCli().async_cli_run()))
 
 
 if __name__ == '__main__':