fluidattacks_integrates_dal 2.2.0__tar.gz → 2.3.0__tar.gz

{fluidattacks_integrates_dal-2.2.0 → fluidattacks_integrates_dal-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fluidattacks_integrates_dal
-Version: 2.2.0
+Version: 2.3.0
 Summary: ASM Synchronous Data Access Layer
 Author-email: Engineering Team <development@fluidattacks.com>
 Requires-Python: >=3.11
@@ -8,4 +8,5 @@ Classifier: License :: OSI Approved :: MIT License
 Requires-Dist: boto3 >=1.40.53, <2.0.0
 Requires-Dist: click >=8.1.7, <9.0.0
 Requires-Dist: fa-purity >=2.5.2, <3.0.0
+Requires-Dist: fluidattacks-etl-utils >=5.1.0, <6.0.0
 Requires-Dist: fluidattacks-utils-logger >=3.0.0, <4.0.0

{fluidattacks_integrates_dal-2.2.0 → fluidattacks_integrates_dal-2.3.0}/build/default.nix

@@ -1,4 +1,10 @@
-{ nixpkgs, builders, scripts, src, }: {
+{
+  nixpkgs,
+  builders,
+  scripts,
+  src,
+}:
+{
   inherit src;
   root_path = "observes/common/integrates-dal";
   module_name = "fluidattacks_integrates_dal";

{fluidattacks_integrates_dal-2.2.0 → fluidattacks_integrates_dal-2.3.0}/flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1754487366,
-        "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
+        "lastModified": 1762810396,
+        "narHash": "sha256-dxFVgQPG+R72dkhXTtqUm7KpxElw3u6E+YlQ2WaDgt8=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
+        "rev": "0bdadb1b265fb4143a75bd1ec7d8c915898a9923",
         "type": "github"
       },
       "original": {
@@ -20,26 +20,11 @@
     },
     "nix_filter": {
       "locked": {
-        "lastModified": 1731533336,
-        "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
+        "lastModified": 1757882181,
+        "narHash": "sha256-+cCxYIh2UNalTz364p+QYmWHs0P+6wDhiWR4jDIKQIU=",
         "owner": "numtide",
         "repo": "nix-filter",
-        "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "type": "github"
-      }
-    },
-    "nix_filter_2": {
-      "locked": {
-        "lastModified": 1731533336,
-        "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
+        "rev": "59c44d1909c72441144b93cf0f054be7fe764de5",
         "type": "github"
       },
       "original": {
@@ -50,26 +35,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1736441877,
-        "narHash": "sha256-m3+PhBFkDwqo9lBplG4AyMW8P4/KcioJRS1UG8N7okM=",
+        "lastModified": 1758690382,
+        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ce3899414dab3297cf025bfa356dc2da426feefd",
+        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1753579242,
-        "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=",
+        "lastModified": 1761765539,
+        "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e",
+        "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
         "type": "github"
       },
       "original": {
@@ -96,11 +82,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1758690382,
-        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
+        "lastModified": 1761373498,
+        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
+        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
         "type": "github"
       },
       "original": {
@@ -110,29 +96,28 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_flake": {
       "locked": {
-        "lastModified": 1761373498,
-        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
+        "lastModified": 1762812764,
+        "narHash": "sha256-MNqrovkO8AEQeYQK7e3X2GDx2H8vfDIxV4K/VEaIjjo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
+        "rev": "400156fe527ab6b54cf6f70cca2c8385548a29c4",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_flake": {
+    "nixpkgs_flake_2": {
       "locked": {
-        "lastModified": 1756313514,
-        "narHash": "sha256-3Xbak0pXR8ziNv1ghHyJ5a5Ti2kt/LWq6hKZVJTvjBs=",
+        "lastModified": 1761668286,
+        "narHash": "sha256-YN/cm/hbm7pi7lMZCsNhu6jlBUi4wUirrIlyOMpbjKU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "181464235b2daff8725773fef43ffc9d6b02e1c2",
+        "rev": "1fdb9eb10eff581a40ce2e9511c4ed517eac0c3f",
         "type": "github"
       },
       "original": {
@@ -145,52 +130,33 @@
       "inputs": {
         "nix_filter": "nix_filter",
         "nixpkgs_flake": "nixpkgs_flake",
-        "pynix_flake": "pynix_flake",
         "pyproject-build-systems": "pyproject-build-systems",
         "pyproject-nix": "pyproject-nix_2",
+        "pythonix_flake": "pythonix_flake",
         "shell-helpers": "shell-helpers",
         "uv2nix": "uv2nix_2"
       },
       "locked": {
         "dir": "observes/common/std_flake_2",
-        "lastModified": 1761684858,
-        "narHash": "sha256-gybMRO/MSOPXQjI//u2UKfvs8pD0sACqL2Kjp+xR4rI=",
+        "lastModified": 1770672786,
+        "narHash": "sha256-W4qMpuS/Zg9P/PooFDsqW7EzjF3A+ITsxKbp1SWdARI=",
         "ref": "refs/heads/trunk",
-        "rev": "c5053864bb838edbe226d74a650d901c0270843b",
+        "rev": "ad927cc6545df64a7d622696a43bcee225b9867b",
         "shallow": true,
         "type": "git",
         "url": "ssh://git@gitlab.com/fluidattacks/universe"
       },
       "original": {
         "dir": "observes/common/std_flake_2",
-        "rev": "c5053864bb838edbe226d74a650d901c0270843b",
+        "rev": "ad927cc6545df64a7d622696a43bcee225b9867b",
         "shallow": true,
         "type": "git",
         "url": "ssh://git@gitlab.com/fluidattacks/universe"
       }
     },
-    "pynix_flake": {
-      "inputs": {
-        "nix_filter": "nix_filter_2",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1758642502,
-        "narHash": "sha256-PD/bQMz2dqZSkydHyvRh+jS/0qoV8SdcIVs6sassteQ=",
-        "owner": "dmurciaatfluid",
-        "repo": "python_nix_builder",
-        "rev": "809aafe2e1995e72c15378d099bf251b78f04a20",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "dmurciaatfluid",
-        "repo": "python_nix_builder",
-        "type": "gitlab"
-      }
-    },
     "pyproject-build-systems": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "pyproject-nix": "pyproject-nix",
         "uv2nix": "uv2nix"
       },
@@ -232,7 +198,7 @@
     },
     "pyproject-nix_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1762427963,
@@ -270,6 +236,28 @@
         "type": "github"
       }
     },
+    "pythonix_flake": {
+      "inputs": {
+        "nixpkgs_flake": "nixpkgs_flake_2"
+      },
+      "locked": {
+        "dir": "observes/common/pythonix_mirror",
+        "lastModified": 1767370831,
+        "narHash": "sha256-VR86TSrJsNHQq31Ksga+1dvsrkv9u1pKa0MKuKYeIAc=",
+        "ref": "refs/heads/trunk",
+        "rev": "0678f8ff3bfe02cfe23bc819bfa739c53bd6e4b6",
+        "shallow": true,
+        "type": "git",
+        "url": "ssh://git@gitlab.com/fluidattacks/universe"
+      },
+      "original": {
+        "dir": "observes/common/pythonix_mirror",
+        "rev": "0678f8ff3bfe02cfe23bc819bfa739c53bd6e4b6",
+        "shallow": true,
+        "type": "git",
+        "url": "ssh://git@gitlab.com/fluidattacks/universe"
+      }
+    },
     "root": {
       "inputs": {
         "observes_flake_builder": "observes_flake_builder"
@@ -285,19 +273,20 @@
       },
       "locked": {
         "dir": "common/utils/shell-helpers",
-        "lastModified": 1752896460,
-        "narHash": "sha256-AsyTatXMx839cGsF6knwTrDZHk3Eue2QD3eSP7bkmpg=",
-        "owner": "fluidattacks",
-        "repo": "universe",
-        "rev": "27749d2c3a2b018eb010a322e5e1352f993c9e86",
-        "type": "github"
+        "lastModified": 1762806066,
+        "narHash": "sha256-Wz99Fl7SpPU1NkTHJ36XOo6DjOEAMXCw3ThRABOS2Hs=",
+        "ref": "refs/heads/trunk",
+        "rev": "d73cfdc7ae9e7f547e22a4481d4c2ccce38b26a8",
+        "shallow": true,
+        "type": "git",
+        "url": "ssh://git@gitlab.com/fluidattacks/universe"
       },
       "original": {
         "dir": "common/utils/shell-helpers",
-        "owner": "fluidattacks",
-        "repo": "universe",
-        "rev": "27749d2c3a2b018eb010a322e5e1352f993c9e86",
-        "type": "github"
+        "rev": "d73cfdc7ae9e7f547e22a4481d4c2ccce38b26a8",
+        "shallow": true,
+        "type": "git",
+        "url": "ssh://git@gitlab.com/fluidattacks/universe"
       }
     },
     "uv2nix": {
@@ -329,7 +318,7 @@
     },
     "uv2nix_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "pyproject-nix": "pyproject-nix_3"
       },
       "locked": {

fluidattacks_integrates_dal-2.3.0/flake.nix

@@ -0,0 +1,29 @@
+{
+  description = "Common Integrates-dal";
+
+  inputs = {
+    observes_flake_builder = {
+      url = "git+ssh://git@gitlab.com/fluidattacks/universe?shallow=1&rev=ad927cc6545df64a7d622696a43bcee225b9867b&dir=observes/common/std_flake_2";
+    };
+  };
+
+  outputs =
+    { self, ... }@inputs:
+    let
+      build_args =
+        {
+          system,
+          python_version,
+          nixpkgs,
+          builders,
+          scripts,
+        }:
+        import ./build {
+          inherit nixpkgs builders scripts;
+          src = import ./build/filter.nix nixpkgs.nix-filter self;
+        };
+    in
+    {
+      packages = inputs.observes_flake_builder.outputs.build build_args;
+    };
+}

{fluidattacks_integrates_dal-2.2.0 → fluidattacks_integrates_dal-2.3.0}/fluidattacks_integrates_dal/__init__.py

@@ -6,6 +6,6 @@ from ._logger import (
     set_logger,
 )
 
-__version__ = "2.2.0"
+__version__ = "2.3.0"
 
 Unsafe.compute(set_logger(__name__, __version__))

{fluidattacks_integrates_dal-2.2.0 → fluidattacks_integrates_dal-2.3.0}/fluidattacks_integrates_dal/_cli.py

@@ -31,19 +31,23 @@ LOG = logging.getLogger(__name__)
 @click.command(help="Requires AWS authentication (retrieved from the environment)")
 def list_all_groups() -> NoReturn:
     clients = new_session().bind(
-        lambda s: new_client(s)
-        .map(new_org_client)
-        .bind(lambda o: new_resource(s).map(new_group_client).map(lambda g: (o, g))),
+        lambda s: (
+            new_client(s)
+            .map(new_org_client)
+            .bind(lambda o: new_resource(s).map(new_group_client).map(lambda g: (o, g)))
+        ),
     )
     cmd: Cmd[None] = clients.bind(
-        lambda t: list_groups.list_all_groups(t[0], t[1])
-        .map(lambda gs: "\n".join(g.name for g in gs))
-        .bind(
-            lambda s: Cmd.wrap_impure(
-                lambda: sys.stdout.write(s + "\n"),  # type: ignore[misc]
-            ).map(
-                lambda _: None,  # type: ignore[misc]
-            ),
+        lambda t: (
+            list_groups.list_all_groups(t[0], t[1])
+            .map(lambda gs: "\n".join(g.name for g in gs))
+            .bind(
+                lambda s: Cmd.wrap_impure(
+                    lambda: sys.stdout.write(s + "\n"),  # type: ignore[misc]
+                ).map(
+                    lambda _: None,  # type: ignore[misc]
+                ),
+            )
         ),
     )
     cmd.compute()

{fluidattacks_integrates_dal-2.2.0 → fluidattacks_integrates_dal-2.3.0}/fluidattacks_integrates_dal/client.py

@@ -6,12 +6,14 @@ from dataclasses import (
 )
 
 from fa_purity import (
+    FrozenList,
     Stream,
 )
 
 from .core import (
     GroupId,
     OrganizationId,
+    OutOfScopeRoot,
 )
 
 
@@ -23,3 +25,8 @@ class OrgsClient:
 @dataclass(frozen=True)
 class GroupsClient:
     get_groups: Callable[[OrganizationId], Stream[GroupId]]
+
+
+@dataclass(frozen=True)
+class OutOfScopeRootsClient:
+    get_roots: Callable[[OrganizationId], Stream[FrozenList[OutOfScopeRoot]]]

{fluidattacks_integrates_dal-2.2.0 → fluidattacks_integrates_dal-2.3.0}/fluidattacks_integrates_dal/clients/__init__.py

@@ -5,6 +5,7 @@ from fa_purity import (
 from fluidattacks_integrates_dal.client import (
     GroupsClient,
     OrgsClient,
+    OutOfScopeRootsClient,
 )
 from fluidattacks_integrates_dal.utils import (
     new_client,
@@ -18,6 +19,9 @@ from .group import (
 from .organization import (
     new_client as _new_org_client,
 )
+from .out_of_scope import (
+    new_client as _new_out_of_scope_client,
+)
 
 
 def new_group_client() -> Cmd[GroupsClient]:
@@ -26,3 +30,7 @@ def new_group_client() -> Cmd[GroupsClient]:
 
 def new_org_client() -> Cmd[OrgsClient]:
     return new_session().bind(new_client).map(_new_org_client)
+
+
+def new_out_of_scope_client() -> Cmd[OutOfScopeRootsClient]:
+    return new_session().bind(new_resource).map(_new_out_of_scope_client)

{fluidattacks_integrates_dal-2.2.0 → fluidattacks_integrates_dal-2.3.0}/fluidattacks_integrates_dal/clients/group/__init__.py

@@ -134,17 +134,19 @@ def _get_groups(table: Table, org: OrganizationId) -> Stream[GroupId]:
     return (
         PureIterFactory.infinite_gen(
             lambda wp: wp.bind(
-                lambda p: _get_groups_page(table, org, p.last_index).map(_union.inl)
-                if p and p.last_index
-                else Cmd.wrap_value(None).map(_union.inr),
+                lambda p: (
+                    _get_groups_page(table, org, p.last_index).map(_union.inl)
+                    if p and p.last_index
+                    else Cmd.wrap_value(None).map(_union.inr)
+                ),
             ),
             init.map(_union.inl),
         )
-        .transform(lambda s: StreamFactory.from_commands(s))
-        .transform(lambda s: StreamTransform.until_none(s))
-        .map(lambda x: _to_group(x))
-        .map(lambda x: PureIterFactory.from_list(x))
-        .transform(lambda s: StreamTransform.chain(s))
+        .transform(StreamFactory.from_commands)
+        .transform(StreamTransform.until_none)
+        .map(_to_group)
+        .map(PureIterFactory.from_list)
+        .transform(StreamTransform.chain)
     )
 
 

{fluidattacks_integrates_dal-2.2.0 → fluidattacks_integrates_dal-2.3.0}/fluidattacks_integrates_dal/clients/organization/__init__.py

@@ -106,9 +106,9 @@ def _all_orgs(client: DynamoDBClient) -> Stream[OrganizationId]:
         Unsafe.pure_iter_from_cmd(Cmd.wrap_impure(_new_iter)),  # type: ignore[misc]
     )
     return (
-        data.map(lambda x: _to_items(x))  # type: ignore[misc]
-        .map(lambda x: PureIterFactory.from_list(x))
-        .transform(lambda s: StreamTransform.chain(s))
+        data.map(_to_items)  # type: ignore[misc]
+        .map(PureIterFactory.from_list)
+        .transform(StreamTransform.chain)
     )
 
 

fluidattacks_integrates_dal-2.3.0/fluidattacks_integrates_dal/clients/out_of_scope/__init__.py

@@ -0,0 +1,109 @@
+from __future__ import (
+    annotations,
+)
+
+import logging
+from collections.abc import (
+    Mapping,
+    Sequence,
+)
+from decimal import (
+    Decimal,
+)
+from typing import TYPE_CHECKING
+
+from boto3.dynamodb.conditions import (
+    Key,
+)
+from fa_purity import (
+    Cmd,
+    FrozenList,
+    Maybe,
+    Stream,
+    Unsafe,
+)
+from fa_purity.json import (
+    JsonPrimitiveFactory,
+    JsonPrimitiveUnfolder,
+)
+from fluidattacks_etl_utils.paginate import (
+    cursor_pagination,
+)
+
+from fluidattacks_integrates_dal.client import (
+    OutOfScopeRootsClient,
+)
+from fluidattacks_integrates_dal.core import (
+    OrganizationId,
+    OutOfScopeRoot,
+)
+
+if TYPE_CHECKING:
+    from mypy_boto3_dynamodb import (
+        DynamoDBServiceResource,
+    )
+    from mypy_boto3_dynamodb.service_resource import (
+        Table,
+    )
+LOG = logging.getLogger(__name__)
+_ORGS_TABLE = "integrates_vms"
+_Cursor = Mapping[
+    str,
+    bytes
+    | bytearray
+    | str
+    | int
+    | Decimal
+    | bool
+    | set[int]
+    | set[Decimal]
+    | set[str]
+    | set[bytes]
+    | set[bytearray]
+    | Sequence[object]
+    | Mapping[str, object]
+    | None,
+]
+
+
+def _attr_str(item: Mapping[str, object], key: str) -> str:
+    return (
+        JsonPrimitiveFactory.from_any(item.get(key))
+        .bind(JsonPrimitiveUnfolder.to_str)
+        .alt(Unsafe.raise_exception)
+        .to_union()
+    )
+
+
+def _get_page(
+    table: Table,
+    org: OrganizationId,
+    cursor: Maybe[_Cursor],
+) -> Cmd[tuple[FrozenList[OutOfScopeRoot], Maybe[_Cursor]]]:
+    def _action() -> tuple[FrozenList[OutOfScopeRoot], Maybe[_Cursor]]:
+        # pk holds the org, sk starts with CLONING# per the
+        # organization_out_of_scope_root facet; queried on the main table.
+        condition = Key("pk").eq(f"ORG#{org.uuid}") & Key("sk").begins_with("CLONING#")
+        response = cursor.map(
+            lambda start_key: table.query(
+                KeyConditionExpression=condition,
+                ExclusiveStartKey=start_key,
+            ),
+        ).or_else_call(lambda: table.query(KeyConditionExpression=condition))
+        roots = tuple(
+            OutOfScopeRoot.new(_attr_str(i, "nickname"), _attr_str(i, "status"))
+            .alt(Unsafe.raise_exception)
+            .to_union()
+            for i in response["Items"]
+        )
+        return (roots, Maybe.from_optional(response.get("LastEvaluatedKey")))
+
+    return Cmd.wrap_impure(_action)
+
+
+def _get_roots(table: Table, org: OrganizationId) -> Stream[FrozenList[OutOfScopeRoot]]:
+    return cursor_pagination(lambda cursor: _get_page(table, org, cursor))
+
+
+def new_client(resource: DynamoDBServiceResource) -> OutOfScopeRootsClient:
+    return OutOfScopeRootsClient(lambda o: _get_roots(resource.Table(_ORGS_TABLE), o))

{fluidattacks_integrates_dal-2.2.0 → fluidattacks_integrates_dal-2.3.0}/fluidattacks_integrates_dal/core.py

@@ -54,3 +54,17 @@ class OrganizationId:
             return Result.failure(err, OrganizationId).alt(cast_exception)
 
         return Result.success(OrganizationId(_Private(), _name, _uuid), Exception)
+
+
+@dataclass(frozen=True)
+class OutOfScopeRoot:
+    _private: _Private = field(repr=False, hash=False, compare=False)
+    nickname: str
+    status: str
+
+    @staticmethod
+    def new(nickname: str, status: str) -> ResultE[OutOfScopeRoot]:
+        if not nickname:
+            err = ValueError("Out-of-scope root nickname is empty")
+            return Result.failure(err, OutOfScopeRoot).alt(cast_exception)
+        return Result.success(OutOfScopeRoot(_Private(), nickname, status), Exception)

{fluidattacks_integrates_dal-2.2.0 → fluidattacks_integrates_dal-2.3.0}/fluidattacks_integrates_dal/utils.py

@@ -19,7 +19,7 @@ if TYPE_CHECKING:
 def new_session() -> Cmd[Session]:
     # This impure procedure gets inputs (credentials) through the environment
     # e.g. AWS_DEFAULT_REGION
-    return Cmd.wrap_impure(lambda: Session())
+    return Cmd.wrap_impure(Session)
 
 
 def new_resource(session: Session) -> Cmd[DynamoDBServiceResource]:

{fluidattacks_integrates_dal-2.2.0 → fluidattacks_integrates_dal-2.3.0}/pyproject.toml

@@ -11,6 +11,7 @@ dependencies = [
     "boto3 >=1.40.53, <2.0.0",
     "click >=8.1.7, <9.0.0",
     "fa-purity >=2.5.2, <3.0.0",
+    "fluidattacks-etl-utils >=5.1.0, <6.0.0",
     "fluidattacks-utils-logger >=3.0.0, <4.0.0",
 ]
 description = "ASM Synchronous Data Access Layer"
@@ -27,10 +28,14 @@ build-backend = "flit_core.buildapi"
 dev = [
     "arch-lint >=5.0.0, <6.0.0",
     "mypy >=1.18.2, <2.0.0",
-    "pytest >=8.4.2, <9.0.0",
+    "pytest >=9.0.3, <10.0.0",
     "pytest-cov >=7.0.0, <8.0.0",
     "ruff >=0.14.1, <1.0.0",
     "botocore-stubs >=1.40.53, <2.0.0",
     "boto3-stubs >=1.40.53, <2.0.0",
     "mypy-boto3-dynamodb >=1.40.40, <2.0.0",
 ]
+
+[tool.uv]
+exclude-newer = "7 days"
+exclude-newer-package = { fluidattacks-core = "2099-01-01", fluid-blends = "2099-01-01" }

{fluidattacks_integrates_dal-2.2.0 → fluidattacks_integrates_dal-2.3.0}/ruff.toml

@@ -4,20 +4,23 @@ indent-width = 4
 target-version = "py311"
 
 [lint]
+preview = true
+explicit-preview-rules = true
 select = ["ALL"]
+extend-select = ["PLR1702", "PLR0916"]
 ignore = [
-  "FBT003",  # conflict with the convention of denying kwargs
+  "FBT003", # conflict with the convention of denying kwargs
   "TC001",  # import cycles can be hidden
   "TC002",  # import cycles can be hidden
   "TC003",  # improves performance; technical debt!
   "FLY002", # f-string is not type safe: implicit str conversion can hide codification issues
-  "D203",  # conflict with D211 one must be ignored
-  "D212",  # conflict with D213 one must be ignored
-  "D104",  # missing docs; technical debt!
-  "D103",  # missing docs; technical debt!
-  "D101",  # missing docs; technical debt!
-  "D100",  # missing docs; technical debt!
-  "D102",  # missing docs; technical debt!
+  "D203",   # conflict with D211 one must be ignored
+  "D212",   # conflict with D213 one must be ignored
+  "D104",   # missing docs; technical debt!
+  "D103",   # missing docs; technical debt!
+  "D101",   # missing docs; technical debt!
+  "D100",   # missing docs; technical debt!
+  "D102",   # missing docs; technical debt!
 ]
 fixable = ["I001", "COM812", "RUF022", "D300"]
 unfixable = []
@@ -31,3 +34,12 @@ quote-style = "double"
 indent-style = "space"
 skip-magic-trailing-comma = false
 line-ending = "lf"
+
+[lint.mccabe]
+max-complexity = 8
+
+[lint.pylint]
+max-branches = 8
+max-nested-blocks = 4
+max-statements = 25
+max-bool-expr = 5