fluidattacks_core_models 14.5.0__tar.gz → 14.7.0__tar.gz

{fluidattacks_core_models-14.5.0 → fluidattacks_core_models-14.7.0}/.gitignore

@@ -1,7 +1,7 @@
 dist/
 dist-*/
 *.zip
-.tflint.d
+/utils/terraform-modules/**/.terraform.lock.hcl
 /.cargo-cache
 target/
 .direnv/

{fluidattacks_core_models-14.5.0 → fluidattacks_core_models-14.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: fluidattacks_core_models
-Version: 14.5.0
+Version: 14.7.0
 Summary: Fluid Attacks Core Models Library
 Author-email: Development <development@fluidattacks.com>
 License: MPL-2.0

{fluidattacks_core_models-14.5.0 → fluidattacks_core_models-14.7.0}/fluidattacks_core/models/scanners/__init__.py

@@ -37,6 +37,7 @@ from fluidattacks_core.models.scanners.sspm_config import (
     AzureDevopsPat,
     GithubApp,
     GithubPat,
+    N8nApiKey,
     SspmConfig,
 )
 
@@ -60,6 +61,7 @@ __all__ = [
     "GithubApp",
     "GithubPat",
     "LocalesEnum",
+    "N8nApiKey",
     "OutputConfig",
     "OutputFormat",
     "ResolvesConfig",

{fluidattacks_core_models-14.5.0 → fluidattacks_core_models-14.7.0}/fluidattacks_core/models/scanners/sspm_config.py

@@ -41,7 +41,20 @@ class AzureDevopsPat(BaseModel):
         return resolve_env_var(v, info)
 
 
+class N8nApiKey(BaseModel):
+    model_config = {"extra": "forbid"}
+    base_url: str
+    api_key: str = Field(repr=False)
+    environment_id: str | None = None
+
+    @field_validator("api_key", mode="before")
+    @classmethod
+    def _resolve_credentials(cls, v: object, info: LoaderValidationInfo) -> object:
+        return resolve_env_var(v, info)
+
+
 class SspmConfig(BaseModel):
     model_config = {"extra": "forbid"}
     github_credentials: list[GithubPat | GithubApp] = []
     azure_devops_credentials: list[AzureDevopsPat] = []
+    n8n_credentials: list[N8nApiKey] = []

{fluidattacks_core_models-14.5.0 → fluidattacks_core_models-14.7.0}/fluidattacks_core/models/state_machines/types.py

@@ -15,6 +15,7 @@ TCloningTrigger = Literal[
     "update_git_root_mutation",
     "execute_machine_flow",
     "sync_git_root_mutation",
+    "sync_git_roots_mutation",
     "update_group_mutation",
     "update_group_managed_mutation",
     "reattack",

{fluidattacks_core_models-14.5.0 → fluidattacks_core_models-14.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fluidattacks_core_models"
-version = "14.5.0"
+version = "14.7.0"
 description = "Fluid Attacks Core Models Library"
 authors = [{ name = "Development", email = "development@fluidattacks.com" }]
 license = { text = "MPL-2.0" }

fluidattacks_core_models-14.7.0/tests/test_sspm_config.py

@@ -0,0 +1,84 @@
+import pytest
+from pydantic import ValidationError
+
+from fluidattacks_core.models.scanners import AzureDevopsPat, GithubPat, N8nApiKey, SspmConfig
+
+
+def test_azure_devops_credential_resolves_its_token(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setenv("AZURE_TOKEN", "resolved-value")
+    cfg = SspmConfig.model_validate(
+        {
+            "azure_devops_credentials": [
+                {"organization": "acme", "pat_token": "${AZURE_TOKEN}"},
+            ],
+        },
+        context={"resolve_env": True},
+    )
+    assert cfg.azure_devops_credentials == [
+        AzureDevopsPat(organization="acme", pat_token="resolved-value"),  # noqa: S106
+    ]
+
+
+def test_azure_devops_and_github_credentials_stay_independent(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("GH_TOKEN", "gh-value")
+    monkeypatch.setenv("AZ_TOKEN", "az-value")
+    cfg = SspmConfig.model_validate(
+        {
+            "github_credentials": [{"organization": "gh-org", "pat_token": "${GH_TOKEN}"}],
+            "azure_devops_credentials": [{"organization": "az-org", "pat_token": "${AZ_TOKEN}"}],
+        },
+        context={"resolve_env": True},
+    )
+    assert cfg.github_credentials == [
+        GithubPat(organization="gh-org", pat_token="gh-value"),  # noqa: S106
+    ]
+    assert cfg.azure_devops_credentials == [
+        AzureDevopsPat(organization="az-org", pat_token="az-value"),  # noqa: S106
+    ]
+
+
+def test_n8n_credentials_resolve_their_key_and_keep_it_out_of_the_repr(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("N8N_KEY", "resolved-value")
+    cfg = SspmConfig.model_validate(
+        {
+            "n8n_credentials": [
+                {
+                    "base_url": "https://n8n.example.com",
+                    "api_key": "${N8N_KEY}",
+                    "environment_id": "env-1",
+                },
+                {"base_url": "https://n8n.example.com/${N8N_KEY}", "api_key": "${N8N_KEY}"},
+            ],
+        },
+        context={"resolve_env": True},
+    )
+    assert cfg.n8n_credentials == [
+        N8nApiKey(
+            base_url="https://n8n.example.com",
+            api_key="resolved-value",
+            environment_id="env-1",
+        ),
+        N8nApiKey(base_url="https://n8n.example.com/${N8N_KEY}", api_key="resolved-value"),
+    ]
+    assert "resolved-value" not in repr(cfg)
+
+
+@pytest.mark.parametrize(
+    ("credential", "error"),
+    [
+        (
+            {"base_url": "https://n8n.example.com", "api_key": "key", "organization": "acme"},
+            r"n8n_credentials\.0\.organization\n  Extra inputs are not permitted",
+        ),
+        ({"base_url": "https://n8n.example.com"}, r"n8n_credentials\.0\.api_key\n  Field required"),
+        ({"api_key": "key"}, r"n8n_credentials\.0\.base_url\n  Field required"),
+    ],
+    ids=["unknown_key", "no_api_key", "no_base_url"],
+)
+def test_n8n_credential_refuses_what_flags_refuses(credential: dict[str, str], error: str) -> None:
+    with pytest.raises(ValidationError, match=error):
+        SspmConfig.model_validate({"n8n_credentials": [credential]})

{fluidattacks_core_models-14.5.0 → fluidattacks_core_models-14.7.0}/tests/test_state_machines.py

@@ -68,6 +68,21 @@ def test_state_machine_cloning_input_cloning_job_queue() -> None:
     assert dumped["cloningJobQueue"] == "clones_warp"
 
 
+def test_state_machine_cloning_input_bulk_sync_trigger() -> None:
+    with patch("fluidattacks_core.models.state_machines.types.uuid4", return_value=_FIXED_UUID):
+        machine_input = StateMachineCloningInput(
+            group_name="group1",
+            roots=["root1", "root2"],
+            user_email="user@example.com",
+            trigger="sync_git_roots_mutation",
+            execute_sifts=True,
+        )
+        dumped = machine_input.model_dump(by_alias=True, mode="json")
+        machine_name = machine_input.get_machine_name()
+    assert dumped["trigger"] == "sync_git_roots_mutation"
+    assert machine_name == f"group1_sync_git_roots_mutation-{_FIXED_UUID_TIME}"
+
+
 def test_state_machine_execute_scanner_input() -> None:
     with patch("fluidattacks_core.models.state_machines.types.uuid4", return_value=_FIXED_UUID):
         machine_input = StateMachineExecuteScannerInput(

{fluidattacks_core_models-14.5.0 → fluidattacks_core_models-14.7.0}/uv.lock

@@ -187,7 +187,7 @@ wheels = [
 
 [[package]]
 name = "fluidattacks-core-models"
-version = "14.5.0"
+version = "14.7.0"
 source = { editable = "." }
 dependencies = [
     { name = "pydantic" },

fluidattacks_core_models-14.5.0/tests/test_sspm_config.py

@@ -1,38 +0,0 @@
-import pytest
-
-from fluidattacks_core.models.scanners import AzureDevopsPat, GithubPat, SspmConfig
-
-
-def test_azure_devops_credential_resolves_its_token(monkeypatch: pytest.MonkeyPatch) -> None:
-    monkeypatch.setenv("AZURE_TOKEN", "resolved-value")
-    cfg = SspmConfig.model_validate(
-        {
-            "azure_devops_credentials": [
-                {"organization": "acme", "pat_token": "${AZURE_TOKEN}"},
-            ],
-        },
-        context={"resolve_env": True},
-    )
-    assert cfg.azure_devops_credentials == [
-        AzureDevopsPat(organization="acme", pat_token="resolved-value"),  # noqa: S106
-    ]
-
-
-def test_azure_devops_and_github_credentials_stay_independent(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    monkeypatch.setenv("GH_TOKEN", "gh-value")
-    monkeypatch.setenv("AZ_TOKEN", "az-value")
-    cfg = SspmConfig.model_validate(
-        {
-            "github_credentials": [{"organization": "gh-org", "pat_token": "${GH_TOKEN}"}],
-            "azure_devops_credentials": [{"organization": "az-org", "pat_token": "${AZ_TOKEN}"}],
-        },
-        context={"resolve_env": True},
-    )
-    assert cfg.github_credentials == [
-        GithubPat(organization="gh-org", pat_token="gh-value"),  # noqa: S106
-    ]
-    assert cfg.azure_devops_credentials == [
-        AzureDevopsPat(organization="az-org", pat_token="az-value"),  # noqa: S106
-    ]