fluidattacks_core_models 14.3.0__tar.gz → 14.5.0__tar.gz

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

@@ -1,5 +1,7 @@
 dist/
 dist-*/
+*.zip
+.tflint.d
 /.cargo-cache
 target/
 .direnv/
@@ -9,3 +11,5 @@ target/
 # each package's shell writes its own, beside the package rather than here
 **/.vscode/settings.json
 *.so
+# the publish check builds into its own tree per architecture
+target-*/

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

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

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

@@ -33,13 +33,19 @@ from fluidattacks_core.models.scanners.sbom_config import (
 from fluidattacks_core.models.scanners.sca_config import ScaConfig
 from fluidattacks_core.models.scanners.scan_config import ScanConfig
 from fluidattacks_core.models.scanners.sniffs_config import SniffsConfig
-from fluidattacks_core.models.scanners.sspm_config import GithubApp, GithubPat, SspmConfig
+from fluidattacks_core.models.scanners.sspm_config import (
+    AzureDevopsPat,
+    GithubApp,
+    GithubPat,
+    SspmConfig,
+)
 
 __all__ = [
     "ApkConfig",
     "ApkEnvironment",
     "AwsCredentials",
     "AwsRole",
+    "AzureDevopsPat",
     "ContainerImageConfig",
     "ContainerScaItem",
     "ContainersScaConfig",

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

@@ -29,6 +29,19 @@ class GithubApp(BaseModel):
         return resolve_env_var(v, info)
 
 
+class AzureDevopsPat(BaseModel):
+    model_config = {"extra": "forbid"}
+    organization: str
+    pat_token: str = Field(repr=False)
+    environment_id: str | None = None
+
+    @field_validator("pat_token", 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] = []

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

@@ -37,9 +37,7 @@ class StateMachineCloningInput(BaseModel):
     user_email: str = Field(..., serialization_alias="userEmail")
     trigger: TCloningTrigger = Field(serialization_alias="trigger")
     execute_sifts: bool = Field(..., serialization_alias="executeSifts")
-    cloning_job_queue: str = Field(
-        default="integrates_clone", serialization_alias="cloningJobQueue"
-    )
+    cloning_job_queue: str = Field(default="clones", serialization_alias="cloningJobQueue")
 
     @computed_field(alias="configId")  # type: ignore[prop-decorator]
     @cached_property

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

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

fluidattacks_core_models-14.5.0/tests/test_sspm_config.py

@@ -0,0 +1,38 @@
+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
+    ]

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

@@ -48,7 +48,7 @@ def test_state_machine_cloning_input() -> None:
         "userEmail": "user@example.com",
         "trigger": "clone_with_warp_scheduler",
         "executeSifts": True,
-        "cloningJobQueue": "integrates_clone",
+        "cloningJobQueue": "clones",
         "configId": _FIXED_UUID_TIME,
     }
     assert machine_name == f"group1_clone_with_warp_scheduler-{_FIXED_UUID_TIME}"
@@ -62,10 +62,10 @@ def test_state_machine_cloning_input_cloning_job_queue() -> None:
             user_email="user@example.com",
             trigger="clone_with_warp_scheduler",
             execute_sifts=True,
-            cloning_job_queue="integrates_large",
+            cloning_job_queue="clones_warp",
         )
         dumped = machine_input.model_dump(by_alias=True, mode="json")
-    assert dumped["cloningJobQueue"] == "integrates_large"
+    assert dumped["cloningJobQueue"] == "clones_warp"
 
 
 def test_state_machine_execute_scanner_input() -> None:

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

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