ominfra 0.0.0.dev207__py3-none-any.whl → 0.0.0.dev209__py3-none-any.whl

ominfra/clouds/aws/models/gen/cli.py

@@ -4,6 +4,7 @@ import os.path
 import sys
 import typing as ta
 
+from omlish import check
 from omlish import lang
 from omlish import marshal as msh
 from omlish.argparse import all as ap
@@ -30,14 +31,17 @@ class Cli(ap.Cli):
     ) -> str:
         service_model = ModelGen.load_service_model(service_name)
 
+        shape_names_seq = check.unique(shape_names or ())
+        operation_names_seq = check.unique(operation_names or ())
+
         bmg = ModelGen(
             service_model,
             shape_names=ModelGen.get_referenced_shape_names(
                 service_model,
-                shape_names=shape_names or (),
-                operation_names=operation_names or (),
+                shape_names=shape_names_seq,
+                operation_names=operation_names_seq,
             ),
-            operation_names=operation_names or (),
+            operation_names=operation_names_seq,
         )
 
         return bmg.gen_module()

ominfra/clouds/aws/models/gen/gen.py

@@ -6,6 +6,7 @@ TODO:
 import builtins
 import dataclasses as dc
 import io
+import keyword
 import typing as ta
 
 from omlish import check
@@ -182,7 +183,7 @@ class ModelGen:
             pass
 
         if name in self._shape_names:
-            name = self.sanitize_class_name(name)
+            name = self.sanitize_global_name(name, upper=True)
             if not unquoted_names:
                 return f"'{name}'"
             else:
@@ -249,10 +250,17 @@ class ModelGen:
 
     #
 
-    def sanitize_class_name(self, n: str) -> str:
+    def sanitize_local_name(self, n: str) -> str:
+        if n in keyword.kwlist:
+            n += '_'
+        return n
+
+    def sanitize_global_name(self, n: str, *, upper: bool = False) -> str:
         if hasattr(builtins, n):
             n += '_'
-        return n[0].upper() + n[1:]
+        if upper:
+            n = n[0].upper() + n[1:]
+        return n
 
     #
 
@@ -292,7 +300,7 @@ class ModelGen:
     ) -> ShapeSrc:
         shape: botocore.model.Shape = self._service_model.shape_for(name)
 
-        san_name = self.sanitize_class_name(shape.name)
+        san_name = self.sanitize_global_name(shape.name, upper=True)
 
         if isinstance(shape, botocore.model.StructureShape):
             lines: list[str] = []
@@ -315,7 +323,7 @@ class ModelGen:
             for i, (mn, ms) in enumerate(shape.members.items()):
                 if i:
                     lines.append('')
-                fn = self.demangle_name(mn)
+                fn = self.sanitize_local_name(self.demangle_name(mn))
                 mds = [
                     f'member_name={mn!r}',
                 ]

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

@@ -90,10 +90,14 @@ class CapacityReservationPreference(_enum.Enum):
     NONE = 'none'
 
 
+CarrierGatewayId = _ta.NewType('CarrierGatewayId', str)
+
 CoipPoolId = _ta.NewType('CoipPoolId', str)
 
 CoreCount = _ta.NewType('CoreCount', int)
 
+CoreNetworkArn = _ta.NewType('CoreNetworkArn', str)
+
 CpuManufacturerName = _ta.NewType('CpuManufacturerName', str)
 
 CurrentGenerationFlag = _ta.NewType('CurrentGenerationFlag', bool)
@@ -108,6 +112,8 @@ DescribeInternetGatewaysMaxResults = _ta.NewType('DescribeInternetGatewaysMaxRes
 
 DescribeNetworkInterfacesMaxResults = _ta.NewType('DescribeNetworkInterfacesMaxResults', int)
 
+DescribeRouteTablesMaxResults = _ta.NewType('DescribeRouteTablesMaxResults', int)
+
 DescribeSecurityGroupsMaxResults = _ta.NewType('DescribeSecurityGroupsMaxResults', int)
 
 DescribeSubnetsMaxResults = _ta.NewType('DescribeSubnetsMaxResults', int)
@@ -154,6 +160,8 @@ class EbsOptimizedSupport(_enum.Enum):
 
 EfaSupportedFlag = _ta.NewType('EfaSupportedFlag', bool)
 
+EgressOnlyInternetGatewayId = _ta.NewType('EgressOnlyInternetGatewayId', str)
+
 ElasticGpuId = _ta.NewType('ElasticGpuId', str)
 
 ElasticInferenceAcceleratorCount = _ta.NewType('ElasticInferenceAcceleratorCount', int)
@@ -1233,6 +1241,8 @@ class KeyType(_enum.Enum):
 
 LaunchTemplateId = _ta.NewType('LaunchTemplateId', str)
 
+LocalGatewayId = _ta.NewType('LocalGatewayId', str)
+
 
 class MarketType(_enum.Enum):
     SPOT = 'spot'
@@ -1273,6 +1283,8 @@ class MonitoringState(_enum.Enum):
     PENDING = 'pending'
 
 
+NatGatewayId = _ta.NewType('NatGatewayId', str)
+
 NetworkCardIndex = _ta.NewType('NetworkCardIndex', int)
 
 NetworkInterfaceId = _ta.NewType('NetworkInterfaceId', str)
@@ -1357,6 +1369,8 @@ class PlatformValues(_enum.Enum):
     WINDOWS = 'Windows'
 
 
+PrefixListResourceId = _ta.NewType('PrefixListResourceId', str)
+
 ProcessorSustainedClockSpeed = _ta.NewType('ProcessorSustainedClockSpeed', float)
 
 
@@ -1465,6 +1479,30 @@ class RootDeviceType(_enum.Enum):
     INSTANCE_STORE = 'instance-store'
 
 
+RouteGatewayId = _ta.NewType('RouteGatewayId', str)
+
+
+class RouteOrigin(_enum.Enum):
+    CREATE_ROUTE_TABLE = 'CreateRouteTable'
+    CREATE_ROUTE = 'CreateRoute'
+    ENABLE_VGW_ROUTE_PROPAGATION = 'EnableVgwRoutePropagation'
+
+
+class RouteState(_enum.Enum):
+    ACTIVE = 'active'
+    BLACKHOLE = 'blackhole'
+
+
+class RouteTableAssociationStateCode(_enum.Enum):
+    ASSOCIATING = 'associating'
+    ASSOCIATED = 'associated'
+    DISASSOCIATING = 'disassociating'
+    DISASSOCIATED = 'disassociated'
+    FAILED = 'failed'
+
+
+RouteTableId = _ta.NewType('RouteTableId', str)
+
 RunInstancesUserData = _ta.NewType('RunInstancesUserData', str)
 
 SecurityGroupId = _ta.NewType('SecurityGroupId', str)
@@ -1527,6 +1565,9 @@ class TpmSupportValues(_enum.Enum):
     V2_0 = 'v2.0'
 
 
+TransitGatewayId = _ta.NewType('TransitGatewayId', str)
+
+
 class UsageClassType(_enum.Enum):
     SPOT = 'spot'
     ON_DEMAND = 'on-demand'
@@ -1560,8 +1601,12 @@ class VpcCidrBlockStateCode(_enum.Enum):
     FAILED = 'failed'
 
 
+VpcEndpointId = _ta.NewType('VpcEndpointId', str)
+
 VpcId = _ta.NewType('VpcId', str)
 
+VpcPeeringConnectionId = _ta.NewType('VpcPeeringConnectionId', str)
+
 
 class VpcState(_enum.Enum):
     PENDING = 'pending'
@@ -1851,6 +1896,138 @@ class CpuOptionsRequest(
     ))
 
 
+@_dc.dataclass(frozen=True)
+class CreateRouteRequest(
+    _base.Shape,
+    shape_name='CreateRouteRequest',
+):
+    destination_prefix_list_id: PrefixListResourceId = _dc.field(metadata=_base.field_metadata(
+        member_name='DestinationPrefixListId',
+        shape_name='PrefixListResourceId',
+    ))
+
+    vpc_endpoint_id: VpcEndpointId = _dc.field(metadata=_base.field_metadata(
+        member_name='VpcEndpointId',
+        shape_name='VpcEndpointId',
+    ))
+
+    transit_gateway_id: TransitGatewayId = _dc.field(metadata=_base.field_metadata(
+        member_name='TransitGatewayId',
+        shape_name='TransitGatewayId',
+    ))
+
+    local_gateway_id: LocalGatewayId = _dc.field(metadata=_base.field_metadata(
+        member_name='LocalGatewayId',
+        shape_name='LocalGatewayId',
+    ))
+
+    carrier_gateway_id: CarrierGatewayId = _dc.field(metadata=_base.field_metadata(
+        member_name='CarrierGatewayId',
+        shape_name='CarrierGatewayId',
+    ))
+
+    core_network_arn: CoreNetworkArn = _dc.field(metadata=_base.field_metadata(
+        member_name='CoreNetworkArn',
+        shape_name='CoreNetworkArn',
+    ))
+
+    dry_run: bool = _dc.field(metadata=_base.field_metadata(
+        member_name='DryRun',
+        serialization_name='dryRun',
+        shape_name='Boolean',
+    ))
+
+    route_table_id: RouteTableId = _dc.field(metadata=_base.field_metadata(
+        member_name='RouteTableId',
+        serialization_name='routeTableId',
+        shape_name='RouteTableId',
+    ))
+
+    destination_cidr_block: str = _dc.field(metadata=_base.field_metadata(
+        member_name='DestinationCidrBlock',
+        serialization_name='destinationCidrBlock',
+        shape_name='String',
+    ))
+
+    gateway_id: RouteGatewayId = _dc.field(metadata=_base.field_metadata(
+        member_name='GatewayId',
+        serialization_name='gatewayId',
+        shape_name='RouteGatewayId',
+    ))
+
+    destination_ipv6_cidr_block: str = _dc.field(metadata=_base.field_metadata(
+        member_name='DestinationIpv6CidrBlock',
+        serialization_name='destinationIpv6CidrBlock',
+        shape_name='String',
+    ))
+
+    egress_only_internet_gateway_id: EgressOnlyInternetGatewayId = _dc.field(metadata=_base.field_metadata(
+        member_name='EgressOnlyInternetGatewayId',
+        serialization_name='egressOnlyInternetGatewayId',
+        shape_name='EgressOnlyInternetGatewayId',
+    ))
+
+    instance_id: InstanceId = _dc.field(metadata=_base.field_metadata(
+        member_name='InstanceId',
+        serialization_name='instanceId',
+        shape_name='InstanceId',
+    ))
+
+    network_interface_id: NetworkInterfaceId = _dc.field(metadata=_base.field_metadata(
+        member_name='NetworkInterfaceId',
+        serialization_name='networkInterfaceId',
+        shape_name='NetworkInterfaceId',
+    ))
+
+    vpc_peering_connection_id: VpcPeeringConnectionId = _dc.field(metadata=_base.field_metadata(
+        member_name='VpcPeeringConnectionId',
+        serialization_name='vpcPeeringConnectionId',
+        shape_name='VpcPeeringConnectionId',
+    ))
+
+    nat_gateway_id: NatGatewayId = _dc.field(metadata=_base.field_metadata(
+        member_name='NatGatewayId',
+        serialization_name='natGatewayId',
+        shape_name='NatGatewayId',
+    ))
+
+
+@_dc.dataclass(frozen=True)
+class CreateRouteResult(
+    _base.Shape,
+    shape_name='CreateRouteResult',
+):
+    return_: bool = _dc.field(metadata=_base.field_metadata(
+        member_name='Return',
+        serialization_name='return',
+        shape_name='Boolean',
+    ))
+
+
+@_dc.dataclass(frozen=True)
+class CreateSecurityGroupResult(
+    _base.Shape,
+    shape_name='CreateSecurityGroupResult',
+):
+    group_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='GroupId',
+        serialization_name='groupId',
+        shape_name='String',
+    ))
+
+    tags: _base.TagList = _dc.field(metadata=_base.field_metadata(
+        member_name='Tags',
+        serialization_name='tagSet',
+        shape_name='TagList',
+    ))
+
+    security_group_arn: str = _dc.field(metadata=_base.field_metadata(
+        member_name='SecurityGroupArn',
+        serialization_name='securityGroupArn',
+        shape_name='String',
+    ))
+
+
 @_dc.dataclass(frozen=True)
 class CreditSpecificationRequest(
     _base.Shape,
@@ -1862,6 +2039,99 @@ class CreditSpecificationRequest(
     ))
 
 
+@_dc.dataclass(frozen=True)
+class DeleteRouteRequest(
+    _base.Shape,
+    shape_name='DeleteRouteRequest',
+):
+    destination_prefix_list_id: PrefixListResourceId = _dc.field(metadata=_base.field_metadata(
+        member_name='DestinationPrefixListId',
+        shape_name='PrefixListResourceId',
+    ))
+
+    dry_run: bool = _dc.field(metadata=_base.field_metadata(
+        member_name='DryRun',
+        serialization_name='dryRun',
+        shape_name='Boolean',
+    ))
+
+    route_table_id: RouteTableId = _dc.field(metadata=_base.field_metadata(
+        member_name='RouteTableId',
+        serialization_name='routeTableId',
+        shape_name='RouteTableId',
+    ))
+
+    destination_cidr_block: str = _dc.field(metadata=_base.field_metadata(
+        member_name='DestinationCidrBlock',
+        serialization_name='destinationCidrBlock',
+        shape_name='String',
+    ))
+
+    destination_ipv6_cidr_block: str = _dc.field(metadata=_base.field_metadata(
+        member_name='DestinationIpv6CidrBlock',
+        serialization_name='destinationIpv6CidrBlock',
+        shape_name='String',
+    ))
+
+
+@_dc.dataclass(frozen=True)
+class DeleteRouteTableRequest(
+    _base.Shape,
+    shape_name='DeleteRouteTableRequest',
+):
+    dry_run: bool = _dc.field(metadata=_base.field_metadata(
+        member_name='DryRun',
+        serialization_name='dryRun',
+        shape_name='Boolean',
+    ))
+
+    route_table_id: RouteTableId = _dc.field(metadata=_base.field_metadata(
+        member_name='RouteTableId',
+        serialization_name='routeTableId',
+        shape_name='RouteTableId',
+    ))
+
+
+@_dc.dataclass(frozen=True)
+class DeleteSecurityGroupRequest(
+    _base.Shape,
+    shape_name='DeleteSecurityGroupRequest',
+):
+    group_id: SecurityGroupId = _dc.field(metadata=_base.field_metadata(
+        member_name='GroupId',
+        shape_name='SecurityGroupId',
+    ))
+
+    group_name: SecurityGroupName = _dc.field(metadata=_base.field_metadata(
+        member_name='GroupName',
+        shape_name='SecurityGroupName',
+    ))
+
+    dry_run: bool = _dc.field(metadata=_base.field_metadata(
+        member_name='DryRun',
+        serialization_name='dryRun',
+        shape_name='Boolean',
+    ))
+
+
+@_dc.dataclass(frozen=True)
+class DeleteSecurityGroupResult(
+    _base.Shape,
+    shape_name='DeleteSecurityGroupResult',
+):
+    return_: bool = _dc.field(metadata=_base.field_metadata(
+        member_name='Return',
+        serialization_name='return',
+        shape_name='Boolean',
+    ))
+
+    group_id: SecurityGroupId = _dc.field(metadata=_base.field_metadata(
+        member_name='GroupId',
+        serialization_name='groupId',
+        shape_name='SecurityGroupId',
+    ))
+
+
 @_dc.dataclass(frozen=True)
 class DiskInfo(
     _base.Shape,
@@ -3068,6 +3338,18 @@ class ProductCode(
     ))
 
 
+@_dc.dataclass(frozen=True)
+class PropagatingVgw(
+    _base.Shape,
+    shape_name='PropagatingVgw',
+):
+    gateway_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='GatewayId',
+        serialization_name='gatewayId',
+        shape_name='String',
+    ))
+
+
 PublicIpStringList: _ta.TypeAlias = _ta.Sequence[str]
 
 RequestInstanceTypeList: _ta.TypeAlias = _ta.Sequence[InstanceType]
@@ -3075,6 +3357,129 @@ RequestInstanceTypeList: _ta.TypeAlias = _ta.Sequence[InstanceType]
 RootDeviceTypeList: _ta.TypeAlias = _ta.Sequence[RootDeviceType]
 
 
+@_dc.dataclass(frozen=True)
+class Route(
+    _base.Shape,
+    shape_name='Route',
+):
+    destination_cidr_block: str = _dc.field(metadata=_base.field_metadata(
+        member_name='DestinationCidrBlock',
+        serialization_name='destinationCidrBlock',
+        shape_name='String',
+    ))
+
+    destination_ipv6_cidr_block: str = _dc.field(metadata=_base.field_metadata(
+        member_name='DestinationIpv6CidrBlock',
+        serialization_name='destinationIpv6CidrBlock',
+        shape_name='String',
+    ))
+
+    destination_prefix_list_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='DestinationPrefixListId',
+        serialization_name='destinationPrefixListId',
+        shape_name='String',
+    ))
+
+    egress_only_internet_gateway_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='EgressOnlyInternetGatewayId',
+        serialization_name='egressOnlyInternetGatewayId',
+        shape_name='String',
+    ))
+
+    gateway_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='GatewayId',
+        serialization_name='gatewayId',
+        shape_name='String',
+    ))
+
+    instance_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='InstanceId',
+        serialization_name='instanceId',
+        shape_name='String',
+    ))
+
+    instance_owner_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='InstanceOwnerId',
+        serialization_name='instanceOwnerId',
+        shape_name='String',
+    ))
+
+    nat_gateway_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='NatGatewayId',
+        serialization_name='natGatewayId',
+        shape_name='String',
+    ))
+
+    transit_gateway_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='TransitGatewayId',
+        serialization_name='transitGatewayId',
+        shape_name='String',
+    ))
+
+    local_gateway_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='LocalGatewayId',
+        serialization_name='localGatewayId',
+        shape_name='String',
+    ))
+
+    carrier_gateway_id: CarrierGatewayId = _dc.field(metadata=_base.field_metadata(
+        member_name='CarrierGatewayId',
+        serialization_name='carrierGatewayId',
+        shape_name='CarrierGatewayId',
+    ))
+
+    network_interface_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='NetworkInterfaceId',
+        serialization_name='networkInterfaceId',
+        shape_name='String',
+    ))
+
+    origin: RouteOrigin = _dc.field(metadata=_base.field_metadata(
+        member_name='Origin',
+        serialization_name='origin',
+        shape_name='RouteOrigin',
+    ))
+
+    state: RouteState = _dc.field(metadata=_base.field_metadata(
+        member_name='State',
+        serialization_name='state',
+        shape_name='RouteState',
+    ))
+
+    vpc_peering_connection_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='VpcPeeringConnectionId',
+        serialization_name='vpcPeeringConnectionId',
+        shape_name='String',
+    ))
+
+    core_network_arn: CoreNetworkArn = _dc.field(metadata=_base.field_metadata(
+        member_name='CoreNetworkArn',
+        serialization_name='coreNetworkArn',
+        shape_name='CoreNetworkArn',
+    ))
+
+
+@_dc.dataclass(frozen=True)
+class RouteTableAssociationState(
+    _base.Shape,
+    shape_name='RouteTableAssociationState',
+):
+    state: RouteTableAssociationStateCode = _dc.field(metadata=_base.field_metadata(
+        member_name='State',
+        serialization_name='state',
+        shape_name='RouteTableAssociationStateCode',
+    ))
+
+    status_message: str = _dc.field(metadata=_base.field_metadata(
+        member_name='StatusMessage',
+        serialization_name='statusMessage',
+        shape_name='String',
+    ))
+
+
+RouteTableIdStringList: _ta.TypeAlias = _ta.Sequence[RouteTableId]
+
+
 @_dc.dataclass(frozen=True)
 class RunInstancesMonitoringEnabled(
     _base.Shape,
@@ -3833,6 +4238,8 @@ class ProcessorInfo(
 
 ProductCodeList: _ta.TypeAlias = _ta.Sequence[ProductCode]
 
+PropagatingVgwList: _ta.TypeAlias = _ta.Sequence[PropagatingVgw]
+
 
 @_dc.dataclass(frozen=True)
 class RebootInstancesRequest(
@@ -3852,6 +4259,51 @@ class RebootInstancesRequest(
     ))
 
 
+RouteList: _ta.TypeAlias = _ta.Sequence[Route]
+
+
+@_dc.dataclass(frozen=True)
+class RouteTableAssociation(
+    _base.Shape,
+    shape_name='RouteTableAssociation',
+):
+    main: bool = _dc.field(metadata=_base.field_metadata(
+        member_name='Main',
+        serialization_name='main',
+        shape_name='Boolean',
+    ))
+
+    route_table_association_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='RouteTableAssociationId',
+        serialization_name='routeTableAssociationId',
+        shape_name='String',
+    ))
+
+    route_table_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='RouteTableId',
+        serialization_name='routeTableId',
+        shape_name='String',
+    ))
+
+    subnet_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='SubnetId',
+        serialization_name='subnetId',
+        shape_name='String',
+    ))
+
+    gateway_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='GatewayId',
+        serialization_name='gatewayId',
+        shape_name='String',
+    ))
+
+    association_state: RouteTableAssociationState = _dc.field(metadata=_base.field_metadata(
+        member_name='AssociationState',
+        serialization_name='associationState',
+        shape_name='RouteTableAssociationState',
+    ))
+
+
 @_dc.dataclass(frozen=True)
 class StartInstancesRequest(
     _base.Shape,
@@ -4078,6 +4530,69 @@ BlockDeviceMappingList: _ta.TypeAlias = _ta.Sequence[BlockDeviceMapping]
 BlockDeviceMappingRequestList: _ta.TypeAlias = _ta.Sequence[BlockDeviceMapping]
 
 
+@_dc.dataclass(frozen=True)
+class CreateRouteTableRequest(
+    _base.Shape,
+    shape_name='CreateRouteTableRequest',
+):
+    tag_specifications: TagSpecificationList = _dc.field(metadata=_base.field_metadata(
+        member_name='TagSpecifications',
+        serialization_name='TagSpecification',
+        shape_name='TagSpecificationList',
+    ))
+
+    client_token: str = _dc.field(metadata=_base.field_metadata(
+        member_name='ClientToken',
+        shape_name='String',
+    ))
+
+    dry_run: bool = _dc.field(metadata=_base.field_metadata(
+        member_name='DryRun',
+        serialization_name='dryRun',
+        shape_name='Boolean',
+    ))
+
+    vpc_id: VpcId = _dc.field(metadata=_base.field_metadata(
+        member_name='VpcId',
+        serialization_name='vpcId',
+        shape_name='VpcId',
+    ))
+
+
+@_dc.dataclass(frozen=True)
+class CreateSecurityGroupRequest(
+    _base.Shape,
+    shape_name='CreateSecurityGroupRequest',
+):
+    description: str = _dc.field(metadata=_base.field_metadata(
+        member_name='Description',
+        serialization_name='GroupDescription',
+        shape_name='String',
+    ))
+
+    group_name: str = _dc.field(metadata=_base.field_metadata(
+        member_name='GroupName',
+        shape_name='String',
+    ))
+
+    vpc_id: VpcId = _dc.field(metadata=_base.field_metadata(
+        member_name='VpcId',
+        shape_name='VpcId',
+    ))
+
+    tag_specifications: TagSpecificationList = _dc.field(metadata=_base.field_metadata(
+        member_name='TagSpecifications',
+        serialization_name='TagSpecification',
+        shape_name='TagSpecificationList',
+    ))
+
+    dry_run: bool = _dc.field(metadata=_base.field_metadata(
+        member_name='DryRun',
+        serialization_name='dryRun',
+        shape_name='Boolean',
+    ))
+
+
 @_dc.dataclass(frozen=True)
 class DescribeAddressesResult(
     _base.Shape,
@@ -4577,6 +5092,8 @@ NetworkInterfacePrivateIpAddressList: _ta.TypeAlias = _ta.Sequence[NetworkInterf
 
 NeuronDeviceInfoList: _ta.TypeAlias = _ta.Sequence[NeuronDeviceInfo]
 
+RouteTableAssociationList: _ta.TypeAlias = _ta.Sequence[RouteTableAssociation]
+
 SubnetIpv6CidrBlockAssociationSet: _ta.TypeAlias = _ta.Sequence[SubnetIpv6CidrBlockAssociation]
 
 VpcCidrBlockAssociationSet: _ta.TypeAlias = _ta.Sequence[VpcCidrBlockAssociation]
@@ -4842,6 +5359,40 @@ class DescribeNetworkInterfacesRequest(
     ))
 
 
+@_dc.dataclass(frozen=True)
+class DescribeRouteTablesRequest(
+    _base.Shape,
+    shape_name='DescribeRouteTablesRequest',
+):
+    next_token: str = _dc.field(metadata=_base.field_metadata(
+        member_name='NextToken',
+        shape_name='String',
+    ))
+
+    max_results: DescribeRouteTablesMaxResults = _dc.field(metadata=_base.field_metadata(
+        member_name='MaxResults',
+        shape_name='DescribeRouteTablesMaxResults',
+    ))
+
+    dry_run: bool = _dc.field(metadata=_base.field_metadata(
+        member_name='DryRun',
+        serialization_name='dryRun',
+        shape_name='Boolean',
+    ))
+
+    route_table_ids: RouteTableIdStringList = _dc.field(metadata=_base.field_metadata(
+        member_name='RouteTableIds',
+        serialization_name='RouteTableId',
+        shape_name='RouteTableIdStringList',
+    ))
+
+    filters: FilterList = _dc.field(metadata=_base.field_metadata(
+        member_name='Filters',
+        serialization_name='Filter',
+        shape_name='FilterList',
+    ))
+
+
 @_dc.dataclass(frozen=True)
 class DescribeSecurityGroupsRequest(
     _base.Shape,
@@ -5572,6 +6123,54 @@ class NeuronInfo(
     ))
 
 
+@_dc.dataclass(frozen=True)
+class RouteTable(
+    _base.Shape,
+    shape_name='RouteTable',
+):
+    associations: RouteTableAssociationList = _dc.field(metadata=_base.field_metadata(
+        member_name='Associations',
+        serialization_name='associationSet',
+        shape_name='RouteTableAssociationList',
+    ))
+
+    propagating_vgws: PropagatingVgwList = _dc.field(metadata=_base.field_metadata(
+        member_name='PropagatingVgws',
+        serialization_name='propagatingVgwSet',
+        shape_name='PropagatingVgwList',
+    ))
+
+    route_table_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='RouteTableId',
+        serialization_name='routeTableId',
+        shape_name='String',
+    ))
+
+    routes: RouteList = _dc.field(metadata=_base.field_metadata(
+        member_name='Routes',
+        serialization_name='routeSet',
+        shape_name='RouteList',
+    ))
+
+    tags: _base.TagList = _dc.field(metadata=_base.field_metadata(
+        member_name='Tags',
+        serialization_name='tagSet',
+        shape_name='TagList',
+    ))
+
+    vpc_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='VpcId',
+        serialization_name='vpcId',
+        shape_name='String',
+    ))
+
+    owner_id: str = _dc.field(metadata=_base.field_metadata(
+        member_name='OwnerId',
+        serialization_name='ownerId',
+        shape_name='String',
+    ))
+
+
 @_dc.dataclass(frozen=True)
 class StartInstancesResult(
     _base.Shape,
@@ -5818,6 +6417,24 @@ class Vpc(
     ))
 
 
+@_dc.dataclass(frozen=True)
+class CreateRouteTableResult(
+    _base.Shape,
+    shape_name='CreateRouteTableResult',
+):
+    route_table: RouteTable = _dc.field(metadata=_base.field_metadata(
+        member_name='RouteTable',
+        serialization_name='routeTable',
+        shape_name='RouteTable',
+    ))
+
+    client_token: str = _dc.field(metadata=_base.field_metadata(
+        member_name='ClientToken',
+        serialization_name='clientToken',
+        shape_name='String',
+    ))
+
+
 @_dc.dataclass(frozen=True)
 class DescribeInternetGatewaysResult(
     _base.Shape,
@@ -6029,6 +6646,8 @@ class InstanceTypeInfo(
 
 NetworkInterfaceList: _ta.TypeAlias = _ta.Sequence[NetworkInterface]
 
+RouteTableList: _ta.TypeAlias = _ta.Sequence[RouteTable]
+
 
 @_dc.dataclass(frozen=True)
 class RunInstancesRequest(
@@ -6368,6 +6987,24 @@ class DescribeNetworkInterfacesResult(
     ))
 
 
+@_dc.dataclass(frozen=True)
+class DescribeRouteTablesResult(
+    _base.Shape,
+    shape_name='DescribeRouteTablesResult',
+):
+    route_tables: RouteTableList = _dc.field(metadata=_base.field_metadata(
+        member_name='RouteTables',
+        serialization_name='routeTableSet',
+        shape_name='RouteTableList',
+    ))
+
+    next_token: str = _dc.field(metadata=_base.field_metadata(
+        member_name='NextToken',
+        serialization_name='nextToken',
+        shape_name='String',
+    ))
+
+
 @_dc.dataclass(frozen=True)
 class DescribeSubnetsResult(
     _base.Shape,
@@ -6880,7 +7517,17 @@ ALL_SHAPES: frozenset[type[_base.Shape]] = frozenset([
     ConnectionTrackingSpecificationResponse,
     CpuOptions,
     CpuOptionsRequest,
+    CreateRouteRequest,
+    CreateRouteResult,
+    CreateRouteTableRequest,
+    CreateRouteTableResult,
+    CreateSecurityGroupRequest,
+    CreateSecurityGroupResult,
     CreditSpecificationRequest,
+    DeleteRouteRequest,
+    DeleteRouteTableRequest,
+    DeleteSecurityGroupRequest,
+    DeleteSecurityGroupResult,
     DescribeAddressesRequest,
     DescribeAddressesResult,
     DescribeImagesRequest,
@@ -6895,6 +7542,8 @@ ALL_SHAPES: frozenset[type[_base.Shape]] = frozenset([
     DescribeKeyPairsResult,
     DescribeNetworkInterfacesRequest,
     DescribeNetworkInterfacesResult,
+    DescribeRouteTablesRequest,
+    DescribeRouteTablesResult,
     DescribeSecurityGroupsRequest,
     DescribeSecurityGroupsResult,
     DescribeSubnetsRequest,
@@ -6995,8 +7644,13 @@ ALL_SHAPES: frozenset[type[_base.Shape]] = frozenset([
     PrivateIpAddressSpecification,
     ProcessorInfo,
     ProductCode,
+    PropagatingVgw,
     RebootInstancesRequest,
     Reservation,
+    Route,
+    RouteTable,
+    RouteTableAssociation,
+    RouteTableAssociationState,
     RunInstancesMonitoringEnabled,
     RunInstancesRequest,
     SecurityGroup,
@@ -7024,6 +7678,40 @@ ALL_SHAPES: frozenset[type[_base.Shape]] = frozenset([
 ##
 
 
+CREATE_ROUTE = _base.Operation(
+    name='CreateRoute',
+    input=CreateRouteRequest,
+    output=CreateRouteResult,
+)
+
+CREATE_ROUTE_TABLE = _base.Operation(
+    name='CreateRouteTable',
+    input=CreateRouteTableRequest,
+    output=CreateRouteTableResult,
+)
+
+CREATE_SECURITY_GROUP = _base.Operation(
+    name='CreateSecurityGroup',
+    input=CreateSecurityGroupRequest,
+    output=CreateSecurityGroupResult,
+)
+
+DELETE_ROUTE = _base.Operation(
+    name='DeleteRoute',
+    input=DeleteRouteRequest,
+)
+
+DELETE_ROUTE_TABLE = _base.Operation(
+    name='DeleteRouteTable',
+    input=DeleteRouteTableRequest,
+)
+
+DELETE_SECURITY_GROUP = _base.Operation(
+    name='DeleteSecurityGroup',
+    input=DeleteSecurityGroupRequest,
+    output=DeleteSecurityGroupResult,
+)
+
 DESCRIBE_ADDRESSES = _base.Operation(
     name='DescribeAddresses',
     input=DescribeAddressesRequest,
@@ -7066,6 +7754,12 @@ DESCRIBE_NETWORK_INTERFACES = _base.Operation(
     output=DescribeNetworkInterfacesResult,
 )
 
+DESCRIBE_ROUTE_TABLES = _base.Operation(
+    name='DescribeRouteTables',
+    input=DescribeRouteTablesRequest,
+    output=DescribeRouteTablesResult,
+)
+
 DESCRIBE_SECURITY_GROUPS = _base.Operation(
     name='DescribeSecurityGroups',
     input=DescribeSecurityGroupsRequest,
@@ -7115,6 +7809,12 @@ TERMINATE_INSTANCES = _base.Operation(
 
 
 ALL_OPERATIONS: frozenset[_base.Operation] = frozenset([
+    CREATE_ROUTE,
+    CREATE_ROUTE_TABLE,
+    CREATE_SECURITY_GROUP,
+    DELETE_ROUTE,
+    DELETE_ROUTE_TABLE,
+    DELETE_SECURITY_GROUP,
     DESCRIBE_ADDRESSES,
     DESCRIBE_IMAGES,
     DESCRIBE_INSTANCES,
@@ -7122,6 +7822,7 @@ ALL_OPERATIONS: frozenset[_base.Operation] = frozenset([
     DESCRIBE_INTERNET_GATEWAYS,
     DESCRIBE_KEY_PAIRS,
     DESCRIBE_NETWORK_INTERFACES,
+    DESCRIBE_ROUTE_TABLES,
     DESCRIBE_SECURITY_GROUPS,
     DESCRIBE_SUBNETS,
     DESCRIBE_VPCS,

ominfra/clouds/aws/models/services/services.toml

@@ -1,5 +1,11 @@
 [services.ec2]
 operations = [
+  'CreateRoute',
+  'CreateRouteTable',
+  'CreateSecurityGroup',
+  'DeleteRoute',
+  'DeleteRouteTable',
+  'DeleteSecurityGroup',
   'DescribeAddresses',
   'DescribeImages',
   'DescribeInstanceTypes',
@@ -7,6 +13,7 @@ operations = [
   'DescribeInternetGateways',
   'DescribeKeyPairs',
   'DescribeNetworkInterfaces',
+  'DescribeRouteTables',
   'DescribeSecurityGroups',
   'DescribeSubnets',
   'DescribeVpcs',

{ominfra-0.0.0.dev207.dist-info → ominfra-0.0.0.dev209.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ominfra
-Version: 0.0.0.dev207
+Version: 0.0.0.dev209
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,9 +12,9 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev207
-Requires-Dist: omlish==0.0.0.dev207
-Requires-Dist: omserv==0.0.0.dev207
+Requires-Dist: omdev==0.0.0.dev209
+Requires-Dist: omlish==0.0.0.dev209
+Requires-Dist: omserv==0.0.0.dev209
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev207.dist-info → ominfra-0.0.0.dev209.dist-info}/RECORD

@@ -27,14 +27,14 @@ ominfra/clouds/aws/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 ominfra/clouds/aws/models/base.py,sha256=s2ffsIGOhRMhMY7awmordfrjWjvZGf5yeJJadt-tjEA,3287
 ominfra/clouds/aws/models/gen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/aws/models/gen/__main__.py,sha256=Jsrv3P7LX2Cg08W7ByZfZ1JQT4lgLDPW1qNAmShFuMk,75
-ominfra/clouds/aws/models/gen/cli.py,sha256=ZFupd0wmZbz_vaq6C1AJpcwgtX_qnZ2XhXIwwBoaE8s,3725
-ominfra/clouds/aws/models/gen/gen.py,sha256=Hhu9KsgI9jejjB6-vZxggrSTwMzQlqN05Xs-axl4o-0,13761
+ominfra/clouds/aws/models/gen/cli.py,sha256=-tsjPPqUvXVqD40grn1Of-2-YF53dvCfISrIRI2AX4s,3869
+ominfra/clouds/aws/models/gen/gen.py,sha256=Z0bKHNbmVqcMdrtUjCWR9Dp5qBtfzP9mgEqcA7uw0ao,14010
 ominfra/clouds/aws/models/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/clouds/aws/models/services/ec2.py,sha256=uh3cDJnuSiuD71fSXnAEJTHaAlWptxzAz_XnDG9O2us,215885
+ominfra/clouds/aws/models/services/ec2.py,sha256=wx1MlOyJSbYNwIWmmklex3JYbvY_teQZ_IfG-xwpztI,236248
 ominfra/clouds/aws/models/services/lambda_.py,sha256=FHxUTZownw_yGfFijPUKM9Ff0_oRNJGNVeSxgIdaCa0,23262
 ominfra/clouds/aws/models/services/rds.py,sha256=FNhaSR6rq3Xzlz16Aqp7e_HfejRrpxsnSJzH-tpUiuA,52509
 ominfra/clouds/aws/models/services/s3.py,sha256=KRKEeRS6cNmOIJm_J3YW5MohhpvLtMhxtD_5di0nfc4,45186
-ominfra/clouds/aws/models/services/services.toml,sha256=_LqMpr_nolLybuxmjbwowD_UMlP8Jc_-RsWPNmxmXrI,713
+ominfra/clouds/aws/models/services/services.toml,sha256=njiWEctmUUrfzZh-aboCNP9BpYBpxGFAVaGvgtv3pMo,866
 ominfra/clouds/gcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/clouds/gcp/auth.py,sha256=rDIiOH5gP3OSIaMC5Lp8yAD4zWuLDEYlFu37mDx5YDA,1360
 ominfra/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -155,9 +155,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=3FnJbgpLw6gInTfhERd1mDy9ijjMUGxkdYVo43Tnxx4,3555
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=4qVg5txsb10EHhvqXXeM6gJ2jx9LbroEnPydDv1uXs0,6176
-ominfra-0.0.0.dev207.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev207.dist-info/METADATA,sha256=7ly59r-D5tfpUT8rcygSYS6cQdmt0ORCmGYvYhMKtyo,767
-ominfra-0.0.0.dev207.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ominfra-0.0.0.dev207.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev207.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev207.dist-info/RECORD,,
+ominfra-0.0.0.dev209.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev209.dist-info/METADATA,sha256=SqQycIG8tpaoacb0KsST3UuoYBcn7bdjI0UoIz2DVLo,767
+ominfra-0.0.0.dev209.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ominfra-0.0.0.dev209.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev209.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev209.dist-info/RECORD,,