ominfra 0.0.0.dev240__tar.gz → 0.0.0.dev241__tar.gz

{ominfra-0.0.0.dev240/ominfra.egg-info → ominfra-0.0.0.dev241}/PKG-INFO

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

{ominfra-0.0.0.dev240 → ominfra-0.0.0.dev241}/ominfra/clouds/aws/models/services/ec2.py

@@ -1609,6 +1609,31 @@ class VpcCidrBlockStateCode(_enum.Enum):
     FAILED = 'failed'
 
 
+class VpcEncryptionControlExclusionState(_enum.Enum):
+    ENABLING = 'enabling'
+    ENABLED = 'enabled'
+    DISABLING = 'disabling'
+    DISABLED = 'disabled'
+
+
+VpcEncryptionControlId = _ta.NewType('VpcEncryptionControlId', str)
+
+
+class VpcEncryptionControlMode(_enum.Enum):
+    MONITOR = 'monitor'
+    ENFORCE = 'enforce'
+
+
+class VpcEncryptionControlState(_enum.Enum):
+    ENFORCE_IN_PROGRESS = 'enforce-in-progress'
+    MONITOR_IN_PROGRESS = 'monitor-in-progress'
+    ENFORCE_FAILED = 'enforce-failed'
+    MONITOR_FAILED = 'monitor-failed'
+    DELETING = 'deleting'
+    DELETED = 'deleted'
+    AVAILABLE = 'available'
+
+
 VpcEndpointId = _ta.NewType('VpcEndpointId', str)
 
 VpcId = _ta.NewType('VpcId', str)
@@ -3675,6 +3700,24 @@ class VpcCidrBlockState(
     ))
 
 
+@_dc.dataclass(frozen=True, kw_only=True)
+class VpcEncryptionControlExclusion(
+    _base.Shape,
+    shape_name='VpcEncryptionControlExclusion',
+):
+    state: VpcEncryptionControlExclusionState | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='State',
+        serialization_name='state',
+        shape_name='VpcEncryptionControlExclusionState',
+    ))
+
+    state_message: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='StateMessage',
+        serialization_name='stateMessage',
+        shape_name='String',
+    ))
+
+
 VpcIdStringList: _ta.TypeAlias = _ta.Sequence[VpcId]
 
 AddressList: _ta.TypeAlias = _ta.Sequence[Address]
@@ -4500,6 +4543,42 @@ class VpcCidrBlockAssociation(
     ))
 
 
+@_dc.dataclass(frozen=True, kw_only=True)
+class VpcEncryptionControlExclusions(
+    _base.Shape,
+    shape_name='VpcEncryptionControlExclusions',
+):
+    internet_gateway: VpcEncryptionControlExclusion | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='InternetGateway',
+        serialization_name='internetGateway',
+        shape_name='VpcEncryptionControlExclusion',
+    ))
+
+    egress_only_internet_gateway: VpcEncryptionControlExclusion | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='EgressOnlyInternetGateway',
+        serialization_name='egressOnlyInternetGateway',
+        shape_name='VpcEncryptionControlExclusion',
+    ))
+
+    nat_gateway: VpcEncryptionControlExclusion | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='NatGateway',
+        serialization_name='natGateway',
+        shape_name='VpcEncryptionControlExclusion',
+    ))
+
+    virtual_private_gateway: VpcEncryptionControlExclusion | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='VirtualPrivateGateway',
+        serialization_name='virtualPrivateGateway',
+        shape_name='VpcEncryptionControlExclusion',
+    ))
+
+    vpc_peering: VpcEncryptionControlExclusion | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='VpcPeering',
+        serialization_name='vpcPeering',
+        shape_name='VpcEncryptionControlExclusion',
+    ))
+
+
 @_dc.dataclass(frozen=True, kw_only=True)
 class VpcIpv6CidrBlockAssociation(
     _base.Shape,
@@ -5139,6 +5218,56 @@ SubnetIpv6CidrBlockAssociationSet: _ta.TypeAlias = _ta.Sequence[SubnetIpv6CidrBl
 
 VpcCidrBlockAssociationSet: _ta.TypeAlias = _ta.Sequence[VpcCidrBlockAssociation]
 
+
+@_dc.dataclass(frozen=True, kw_only=True)
+class VpcEncryptionControl(
+    _base.Shape,
+    shape_name='VpcEncryptionControl',
+):
+    vpc_id: VpcId | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='VpcId',
+        serialization_name='vpcId',
+        shape_name='VpcId',
+    ))
+
+    vpc_encryption_control_id: VpcEncryptionControlId | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='VpcEncryptionControlId',
+        serialization_name='vpcEncryptionControlId',
+        shape_name='VpcEncryptionControlId',
+    ))
+
+    mode: VpcEncryptionControlMode | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='Mode',
+        serialization_name='mode',
+        shape_name='VpcEncryptionControlMode',
+    ))
+
+    state: VpcEncryptionControlState | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='State',
+        serialization_name='state',
+        shape_name='VpcEncryptionControlState',
+    ))
+
+    state_message: str | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='StateMessage',
+        serialization_name='stateMessage',
+        shape_name='String',
+    ))
+
+    resource_exclusions: VpcEncryptionControlExclusions | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='ResourceExclusions',
+        serialization_name='resourceExclusions',
+        shape_name='VpcEncryptionControlExclusions',
+    ))
+
+    tags: _base.TagList | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='Tags',
+        serialization_name='tagSet',
+        value_type=_base.ListValueType(_base.Tag),
+        shape_name='TagList',
+    ))
+
+
 VpcIpv6CidrBlockAssociationSet: _ta.TypeAlias = _ta.Sequence[VpcIpv6CidrBlockAssociation]
 
 
@@ -6478,6 +6607,12 @@ class Vpc(
         shape_name='Boolean',
     ))
 
+    encryption_control: VpcEncryptionControl | None = _dc.field(default=None, metadata=_base.field_metadata(
+        member_name='EncryptionControl',
+        serialization_name='encryptionControl',
+        shape_name='VpcEncryptionControl',
+    ))
+
     tags: _base.TagList | None = _dc.field(default=None, metadata=_base.field_metadata(
         member_name='Tags',
         serialization_name='tagSet',
@@ -7805,6 +7940,9 @@ ALL_SHAPES: frozenset[type[_base.Shape]] = frozenset([
     Vpc,
     VpcCidrBlockAssociation,
     VpcCidrBlockState,
+    VpcEncryptionControl,
+    VpcEncryptionControlExclusion,
+    VpcEncryptionControlExclusions,
     VpcIpv6CidrBlockAssociation,
 ])
 

{ominfra-0.0.0.dev240 → ominfra-0.0.0.dev241}/ominfra/scripts/manage.py

@@ -6100,14 +6100,6 @@ _INJECTION_INSPECTION_CACHE: ta.MutableMapping[ta.Any, _InjectionInspection] = w
 
 def _do_injection_inspect(obj: ta.Any) -> _InjectionInspection:
     tgt = obj
-    if isinstance(tgt, type) and tgt.__init__ is not object.__init__:  # type: ignore[misc]
-        # Python 3.8's inspect.signature can't handle subclasses overriding __new__, always generating *args/**kwargs.
-        #  - https://bugs.python.org/issue40897
-        #  - https://github.com/python/cpython/commit/df7c62980d15acd3125dfbd81546dad359f7add7
-        tgt = tgt.__init__  # type: ignore[misc]
-        has_generic_base = True
-    else:
-        has_generic_base = False
 
     # inspect.signature(eval_str=True) was added in 3.10 and we have to support 3.8, so we have to get_type_hints to
     # eval str annotations *in addition to* getting the signature for parameter information.
@@ -6115,23 +6107,40 @@ def _do_injection_inspect(obj: ta.Any) -> _InjectionInspection:
     has_partial = False
     while True:
         if isinstance(uw, functools.partial):
-            has_partial = True
             uw = uw.func
+            has_partial = True
         else:
             if (uw2 := inspect.unwrap(uw)) is uw:
                 break
             uw = uw2
 
-    if has_generic_base and has_partial:
+    has_args_offset = False
+
+    if isinstance(tgt, type) and tgt.__new__ is not object.__new__:
+        # Python 3.8's inspect.signature can't handle subclasses overriding __new__, always generating *args/**kwargs.
+        #  - https://bugs.python.org/issue40897
+        #  - https://github.com/python/cpython/commit/df7c62980d15acd3125dfbd81546dad359f7add7
+        tgt = tgt.__init__  # type: ignore[misc]
+        has_args_offset = True
+
+    if tgt in (object.__init__, object.__new__):
+        # inspect strips self for types but not the underlying methods.
+        def dummy(self):
+            pass
+        tgt = dummy
+        has_args_offset = True
+
+    if has_partial and has_args_offset:
+        # TODO: unwrap partials masking parameters like modern python
         raise InjectorError(
-            'Injector inspection does not currently support both a typing.Generic base and a functools.partial: '
+            'Injector inspection does not currently support both an args offset and a functools.partial: '
             f'{obj}',
         )
 
     return _InjectionInspection(
         inspect.signature(tgt),
         ta.get_type_hints(uw),
-        1 if has_generic_base else 0,
+        1 if has_args_offset else 0,
     )
 
 

{ominfra-0.0.0.dev240 → ominfra-0.0.0.dev241}/ominfra/scripts/supervisor.py

@@ -4942,14 +4942,6 @@ _INJECTION_INSPECTION_CACHE: ta.MutableMapping[ta.Any, _InjectionInspection] = w
 
 def _do_injection_inspect(obj: ta.Any) -> _InjectionInspection:
     tgt = obj
-    if isinstance(tgt, type) and tgt.__init__ is not object.__init__:  # type: ignore[misc]
-        # Python 3.8's inspect.signature can't handle subclasses overriding __new__, always generating *args/**kwargs.
-        #  - https://bugs.python.org/issue40897
-        #  - https://github.com/python/cpython/commit/df7c62980d15acd3125dfbd81546dad359f7add7
-        tgt = tgt.__init__  # type: ignore[misc]
-        has_generic_base = True
-    else:
-        has_generic_base = False
 
     # inspect.signature(eval_str=True) was added in 3.10 and we have to support 3.8, so we have to get_type_hints to
     # eval str annotations *in addition to* getting the signature for parameter information.
@@ -4957,23 +4949,40 @@ def _do_injection_inspect(obj: ta.Any) -> _InjectionInspection:
     has_partial = False
     while True:
         if isinstance(uw, functools.partial):
-            has_partial = True
             uw = uw.func
+            has_partial = True
         else:
             if (uw2 := inspect.unwrap(uw)) is uw:
                 break
             uw = uw2
 
-    if has_generic_base and has_partial:
+    has_args_offset = False
+
+    if isinstance(tgt, type) and tgt.__new__ is not object.__new__:
+        # Python 3.8's inspect.signature can't handle subclasses overriding __new__, always generating *args/**kwargs.
+        #  - https://bugs.python.org/issue40897
+        #  - https://github.com/python/cpython/commit/df7c62980d15acd3125dfbd81546dad359f7add7
+        tgt = tgt.__init__  # type: ignore[misc]
+        has_args_offset = True
+
+    if tgt in (object.__init__, object.__new__):
+        # inspect strips self for types but not the underlying methods.
+        def dummy(self):
+            pass
+        tgt = dummy
+        has_args_offset = True
+
+    if has_partial and has_args_offset:
+        # TODO: unwrap partials masking parameters like modern python
         raise InjectorError(
-            'Injector inspection does not currently support both a typing.Generic base and a functools.partial: '
+            'Injector inspection does not currently support both an args offset and a functools.partial: '
             f'{obj}',
         )
 
     return _InjectionInspection(
         inspect.signature(tgt),
         ta.get_type_hints(uw),
-        1 if has_generic_base else 0,
+        1 if has_args_offset else 0,
     )
 
 

{ominfra-0.0.0.dev240 → ominfra-0.0.0.dev241/ominfra.egg-info}/PKG-INFO

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

{ominfra-0.0.0.dev240 → ominfra-0.0.0.dev241}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev240
-omlish==0.0.0.dev240
+omdev==0.0.0.dev241
+omlish==0.0.0.dev241
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev240 → ominfra-0.0.0.dev241}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev240'
+version = '0.0.0.dev241'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev240',
-    'omlish == 0.0.0.dev240',
+    'omdev == 0.0.0.dev241',
+    'omlish == 0.0.0.dev241',
 ]
 
 [project.optional-dependencies]