fluidattacks-core 4.2.1__tar.gz → 4.3.1__tar.gz

{fluidattacks_core-4.2.1 → fluidattacks_core-4.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fluidattacks-core
-Version: 4.2.1
+Version: 4.3.1
 Summary: Fluid Attacks Core Library
 Author-email: Development <development@fluidattacks.com>
 License: MPL-2.0
@@ -25,24 +25,26 @@ Requires-Dist: bugsnag>=4.7.1; extra == "bugsnag"
 Provides-Extra: git
 Requires-Dist: aiofiles>=23.2.1; extra == "git"
 Requires-Dist: boto3>=1.34; extra == "git"
+Requires-Dist: botocore>=1.40.18; extra == "git"
 Requires-Dist: GitPython>=3.1.41; extra == "git"
 Requires-Dist: pathspec>=0.12.1; extra == "git"
 Provides-Extra: http
 Provides-Extra: serializers
-Requires-Dist: tree-sitter>=0.25.2; extra == "serializers"
 Requires-Dist: more-itertools>=10.0.0; extra == "serializers"
 Requires-Dist: tree-sitter-c-sharp>=0.23.1; extra == "serializers"
 Requires-Dist: tree-sitter-go>=0.23.4; extra == "serializers"
+Requires-Dist: tree-sitter-html>=0.23.2; extra == "serializers"
 Requires-Dist: tree-sitter-java>=0.23.4; extra == "serializers"
 Requires-Dist: tree-sitter-javascript>=0.23.1; extra == "serializers"
 Requires-Dist: tree-sitter-json>=0.24.8; extra == "serializers"
 Requires-Dist: tree-sitter-kotlin>=1.0.1; extra == "serializers"
-Requires-Dist: tree-sitter-python>=0.23.4; extra == "serializers"
 Requires-Dist: tree-sitter-php==0.23.11; extra == "serializers"
+Requires-Dist: tree-sitter-python>=0.23.4; extra == "serializers"
 Requires-Dist: tree-sitter-typescript>=0.23.2; extra == "serializers"
-Requires-Dist: tree-sitter-yaml>=0.7.0; extra == "serializers"
-Requires-Dist: tree-sitter-html>=0.23.2; extra == "serializers"
 Requires-Dist: tree-sitter-xml>=0.7.0; extra == "serializers"
+Requires-Dist: tree-sitter-yaml>=0.7.0; extra == "serializers"
+Requires-Dist: tree-sitter>=0.25.2; extra == "serializers"
+Requires-Dist: tree-sitter-dart-orchard==0.3.2; extra == "serializers"
 Provides-Extra: cpg
 Requires-Dist: aioboto3>=13.3.0; extra == "cpg"
 Requires-Dist: platformdirs>=4.3.8; extra == "cpg"
@@ -54,13 +56,13 @@ Provides-Extra: all
 Requires-Dist: fluidattacks-core[aio]; extra == "all"
 Requires-Dist: fluidattacks-core[authz]; extra == "all"
 Requires-Dist: fluidattacks-core[bugsnag]; extra == "all"
+Requires-Dist: fluidattacks-core[cpg]; extra == "all"
+Requires-Dist: fluidattacks-core[filesystem]; extra == "all"
 Requires-Dist: fluidattacks-core[git]; extra == "all"
 Requires-Dist: fluidattacks-core[http]; extra == "all"
-Requires-Dist: fluidattacks-core[serializers]; extra == "all"
-Requires-Dist: fluidattacks-core[filesystem]; extra == "all"
-Requires-Dist: fluidattacks-core[cpg]; extra == "all"
 Requires-Dist: fluidattacks-core[sarif]; extra == "all"
 Requires-Dist: fluidattacks-core[semver]; extra == "all"
+Requires-Dist: fluidattacks-core[serializers]; extra == "all"
 
 # Fluid Attacks Core Library
 

{fluidattacks_core-4.2.1 → fluidattacks_core-4.3.1}/fluidattacks_core/logging/sources/__init__.py

@@ -24,11 +24,19 @@ class LambdaSource(SourceStrategy):
 
     @staticmethod
     def log_metadata() -> dict[str, str]:
+        product_id = get_env_var("PRODUCT_ID")
+        function_name = get_env_var("AWS_LAMBDA_FUNCTION_NAME")
+        service = product_id or function_name or "unknown"
+
+        trace_header = get_env_var("_X_AMZN_TRACE_ID")
+
         return {
             "ddsource": "lambda",
-            "dd.service": get_env_var("AWS_LAMBDA_FUNCTION_NAME") or "unknown",
+            "dd.service": service,
             "dd.version": get_version(),
             "deployment.environment": get_environment(),
+            "lambda_metadata.function_name": function_name or "unknown",
+            "lambda_metadata.trace_header": trace_header or "unknown",
         }
 
 
@@ -39,18 +47,31 @@ class BatchSource(SourceStrategy):
 
     @staticmethod
     def log_metadata() -> dict[str, str]:
-        job_name = get_env_var("JOB_NAME")
+        job_id = get_env_var("AWS_BATCH_JOB_ID")
+        attempt = get_env_var("AWS_BATCH_JOB_ATTEMPT")
+        compute_environment = get_env_var("AWS_BATCH_CE_NAME")
+
+        product_id = get_env_var("PRODUCT_ID")
         job_definition_name = get_env_var("JOB_DEFINITION_NAME")
+        job_name = get_env_var("JOB_NAME")
         job_queue = get_env_var("AWS_BATCH_JQ_NAME")
-        product_id = get_env_var("PRODUCT_ID")
         service = (
-            job_name or job_definition_name or (f"from-{job_queue}" if job_queue else product_id)
+            product_id
+            or job_definition_name
+            or job_name
+            or (f"from-{job_queue}" if job_queue else "unknown")
         )
+
         return {
             "ddsource": "batch",
-            "dd.service": service or "unknown",
+            "dd.service": service,
             "dd.version": get_version(),
             "deployment.environment": get_environment(),
+            "job_metadata.id": job_id or "unknown",
+            "job_metadata.queue": job_queue or "unknown",
+            "job_metadata.definition_name": job_definition_name or "unknown",
+            "job_metadata.attempt": attempt or "unknown",
+            "job_metadata.compute_environment": compute_environment or "unknown",
         }
 
 
@@ -88,20 +109,20 @@ class PipelineSource(SourceStrategy):
 
         return {
             "ddsource": f"ci/{pipeline}",
-            "deployment.pipeline.type": pipeline,
+            "pipeline_metadata.type": pipeline,
             **(
                 {
-                    "deployment.pipeline.CI_JOB_ID": get_env_var("CI_JOB_ID") or "unknown",
-                    "deployment.pipeline.CI_JOB_URL": get_env_var("CI_JOB_URL") or "unknown",
+                    "pipeline_metadata.CI_JOB_ID": get_env_var("CI_JOB_ID") or "unknown",
+                    "pipeline_metadata.CI_JOB_URL": get_env_var("CI_JOB_URL") or "unknown",
                 }
                 if pipeline == "gitlab_ci"
                 else {}
             ),
             **(
                 {
-                    "deployment.pipeline.CIRCLE_BUILD_NUM": get_env_var("CIRCLE_BUILD_NUM")
+                    "pipeline_metadata.CIRCLE_BUILD_NUM": get_env_var("CIRCLE_BUILD_NUM")
                     or "unknown",
-                    "deployment.pipeline.CIRCLE_BUILD_URL": get_env_var("CIRCLE_BUILD_URL")
+                    "pipeline_metadata.CIRCLE_BUILD_URL": get_env_var("CIRCLE_BUILD_URL")
                     or "unknown",
                 }
                 if pipeline == "circleci"
@@ -109,16 +130,16 @@ class PipelineSource(SourceStrategy):
             ),
             **(
                 {
-                    "deployment.pipeline.System.JobId": get_env_var("System.JobId") or "unknown",
+                    "pipeline_metadata.System.JobId": get_env_var("System.JobId") or "unknown",
                 }
                 if pipeline == "azure_devops"
                 else {}
             ),
             **(
                 {
-                    "deployment.pipeline.BUILD_NUMBER": get_env_var("BUILD_NUMBER") or "unknown",
-                    "deployment.pipeline.BUILD_ID": get_env_var("BUILD_ID") or "unknown",
-                    "deployment.pipeline.BUILD_URL": get_env_var("BUILD_URL") or "unknown",
+                    "pipeline_metadata.BUILD_NUMBER": get_env_var("BUILD_NUMBER") or "unknown",
+                    "pipeline_metadata.BUILD_ID": get_env_var("BUILD_ID") or "unknown",
+                    "pipeline_metadata.BUILD_URL": get_env_var("BUILD_URL") or "unknown",
                 }
                 if pipeline == "jenkins"
                 else {}
@@ -137,11 +158,16 @@ class ContainerSource(SourceStrategy):
 
     @staticmethod
     def log_metadata() -> dict[str, str]:
+        product_id = get_env_var("PRODUCT_ID")
+        container_image = get_env_var("CONTAINER_IMAGE")
+        service = product_id or container_image or "unknown"
+
         return {
             "ddsource": "container",
-            "dd.service": get_env_var("PRODUCT_ID") or "unknown",
+            "dd.service": service,
             "dd.version": get_version(),
             "deployment.environment": get_environment(),
+            "container_metadata.image": container_image or "unknown",
         }
 
 

{fluidattacks_core-4.2.1 → fluidattacks_core-4.3.1}/fluidattacks_core/serializers/syntax.py

@@ -281,7 +281,10 @@ def get_language_from_path(path: str) -> str | None:
 
 def get_language_for_tree(language: str) -> Language:
     try:
-        language_module = importlib.import_module(f"tree_sitter_{language}")
+        parser_name = (
+            f"tree_sitter_{language}" if language != "dart" else "tree_sitter_dart_orchard"
+        )
+        language_module = importlib.import_module(parser_name)
         function_name = {
             "php": "language_php",
             "tsx": "language_tsx",

{fluidattacks_core-4.2.1 → fluidattacks_core-4.3.1}/fluidattacks_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fluidattacks-core
-Version: 4.2.1
+Version: 4.3.1
 Summary: Fluid Attacks Core Library
 Author-email: Development <development@fluidattacks.com>
 License: MPL-2.0
@@ -25,24 +25,26 @@ Requires-Dist: bugsnag>=4.7.1; extra == "bugsnag"
 Provides-Extra: git
 Requires-Dist: aiofiles>=23.2.1; extra == "git"
 Requires-Dist: boto3>=1.34; extra == "git"
+Requires-Dist: botocore>=1.40.18; extra == "git"
 Requires-Dist: GitPython>=3.1.41; extra == "git"
 Requires-Dist: pathspec>=0.12.1; extra == "git"
 Provides-Extra: http
 Provides-Extra: serializers
-Requires-Dist: tree-sitter>=0.25.2; extra == "serializers"
 Requires-Dist: more-itertools>=10.0.0; extra == "serializers"
 Requires-Dist: tree-sitter-c-sharp>=0.23.1; extra == "serializers"
 Requires-Dist: tree-sitter-go>=0.23.4; extra == "serializers"
+Requires-Dist: tree-sitter-html>=0.23.2; extra == "serializers"
 Requires-Dist: tree-sitter-java>=0.23.4; extra == "serializers"
 Requires-Dist: tree-sitter-javascript>=0.23.1; extra == "serializers"
 Requires-Dist: tree-sitter-json>=0.24.8; extra == "serializers"
 Requires-Dist: tree-sitter-kotlin>=1.0.1; extra == "serializers"
-Requires-Dist: tree-sitter-python>=0.23.4; extra == "serializers"
 Requires-Dist: tree-sitter-php==0.23.11; extra == "serializers"
+Requires-Dist: tree-sitter-python>=0.23.4; extra == "serializers"
 Requires-Dist: tree-sitter-typescript>=0.23.2; extra == "serializers"
-Requires-Dist: tree-sitter-yaml>=0.7.0; extra == "serializers"
-Requires-Dist: tree-sitter-html>=0.23.2; extra == "serializers"
 Requires-Dist: tree-sitter-xml>=0.7.0; extra == "serializers"
+Requires-Dist: tree-sitter-yaml>=0.7.0; extra == "serializers"
+Requires-Dist: tree-sitter>=0.25.2; extra == "serializers"
+Requires-Dist: tree-sitter-dart-orchard==0.3.2; extra == "serializers"
 Provides-Extra: cpg
 Requires-Dist: aioboto3>=13.3.0; extra == "cpg"
 Requires-Dist: platformdirs>=4.3.8; extra == "cpg"
@@ -54,13 +56,13 @@ Provides-Extra: all
 Requires-Dist: fluidattacks-core[aio]; extra == "all"
 Requires-Dist: fluidattacks-core[authz]; extra == "all"
 Requires-Dist: fluidattacks-core[bugsnag]; extra == "all"
+Requires-Dist: fluidattacks-core[cpg]; extra == "all"
+Requires-Dist: fluidattacks-core[filesystem]; extra == "all"
 Requires-Dist: fluidattacks-core[git]; extra == "all"
 Requires-Dist: fluidattacks-core[http]; extra == "all"
-Requires-Dist: fluidattacks-core[serializers]; extra == "all"
-Requires-Dist: fluidattacks-core[filesystem]; extra == "all"
-Requires-Dist: fluidattacks-core[cpg]; extra == "all"
 Requires-Dist: fluidattacks-core[sarif]; extra == "all"
 Requires-Dist: fluidattacks-core[semver]; extra == "all"
+Requires-Dist: fluidattacks-core[serializers]; extra == "all"
 
 # Fluid Attacks Core Library
 

{fluidattacks_core-4.2.1 → fluidattacks_core-4.3.1}/fluidattacks_core.egg-info/requires.txt

@@ -11,13 +11,13 @@ uvloop>=0.21.0
 fluidattacks-core[aio]
 fluidattacks-core[authz]
 fluidattacks-core[bugsnag]
+fluidattacks-core[cpg]
+fluidattacks-core[filesystem]
 fluidattacks-core[git]
 fluidattacks-core[http]
-fluidattacks-core[serializers]
-fluidattacks-core[filesystem]
-fluidattacks-core[cpg]
 fluidattacks-core[sarif]
 fluidattacks-core[semver]
+fluidattacks-core[serializers]
 
 [authz]
 
@@ -33,6 +33,7 @@ platformdirs>=4.3.8
 [git]
 aiofiles>=23.2.1
 boto3>=1.34
+botocore>=1.40.18
 GitPython>=3.1.41
 pathspec>=0.12.1
 
@@ -44,17 +45,18 @@ pydantic>=2.12.3
 [semver]
 
 [serializers]
-tree-sitter>=0.25.2
 more-itertools>=10.0.0
 tree-sitter-c-sharp>=0.23.1
 tree-sitter-go>=0.23.4
+tree-sitter-html>=0.23.2
 tree-sitter-java>=0.23.4
 tree-sitter-javascript>=0.23.1
 tree-sitter-json>=0.24.8
 tree-sitter-kotlin>=1.0.1
-tree-sitter-python>=0.23.4
 tree-sitter-php==0.23.11
+tree-sitter-python>=0.23.4
 tree-sitter-typescript>=0.23.2
-tree-sitter-yaml>=0.7.0
-tree-sitter-html>=0.23.2
 tree-sitter-xml>=0.7.0
+tree-sitter-yaml>=0.7.0
+tree-sitter>=0.25.2
+tree-sitter-dart-orchard==0.3.2

{fluidattacks_core-4.2.1 → fluidattacks_core-4.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fluidattacks-core"
-version = "4.2.1"
+version = "4.3.1"
 description = "Fluid Attacks Core Library"
 authors = [{ name = "Development", email = "development@fluidattacks.com" }]
 license = { text = "MPL-2.0" }
@@ -30,25 +30,27 @@ bugsnag = ["bugsnag>=4.7.1"]
 git = [
   "aiofiles>=23.2.1",
   "boto3>=1.34",
+  "botocore>=1.40.18",
   "GitPython>=3.1.41",
   "pathspec>=0.12.1",
 ]
 http = []
 serializers = [
-  "tree-sitter>=0.25.2",
   "more-itertools>=10.0.0",
   "tree-sitter-c-sharp>=0.23.1",
   "tree-sitter-go>=0.23.4",
+  "tree-sitter-html>=0.23.2",
   "tree-sitter-java>=0.23.4",
   "tree-sitter-javascript>=0.23.1",
   "tree-sitter-json>=0.24.8",
   "tree-sitter-kotlin>=1.0.1",
-  "tree-sitter-python>=0.23.4",
   "tree-sitter-php==0.23.11",
+  "tree-sitter-python>=0.23.4",
   "tree-sitter-typescript>=0.23.2",
-  "tree-sitter-yaml>=0.7.0",
-  "tree-sitter-html>=0.23.2",
   "tree-sitter-xml>=0.7.0",
+  "tree-sitter-yaml>=0.7.0",
+  "tree-sitter>=0.25.2",
+  "tree-sitter-dart-orchard==0.3.2",
 ]
 cpg = ["aioboto3>=13.3.0", "platformdirs>=4.3.8"]
 filesystem = []
@@ -58,28 +60,29 @@ all = [
   "fluidattacks-core[aio]",
   "fluidattacks-core[authz]",
   "fluidattacks-core[bugsnag]",
+  "fluidattacks-core[cpg]",
+  "fluidattacks-core[filesystem]",
   "fluidattacks-core[git]",
   "fluidattacks-core[http]",
-  "fluidattacks-core[serializers]",
-  "fluidattacks-core[filesystem]",
-  "fluidattacks-core[cpg]",
   "fluidattacks-core[sarif]",
   "fluidattacks-core[semver]",
+  "fluidattacks-core[serializers]",
 ]
 
 [dependency-groups]
 dev = [
   "boto3-stubs[essential,dynamodbstreams,sts]>=1.34.0",
   "botocore-stubs==1.35.71",
+  "datamodel-code-generator>=0.35.0",
+  "deptry==0.24.0",
   "import-linter==2.5.2",
   "mypy==1.18.2",
-  "ruff==0.14.0",
+  "pytest-asyncio>=1.1.0",
   "pytest==8.4.1",
+  "ruff==0.14.0",
+  "types-aioboto3[s3]>=15.1.0",
   "types-aiofiles==24.1.0.20240626",
   "types-simplejson>=3.20.0.20250822",
-  "types-aioboto3[s3]>=15.1.0",
-  "pytest-asyncio>=1.1.0",
-  "datamodel-code-generator>=0.35.0",
 ]
 
 [tool.setuptools]
@@ -91,6 +94,26 @@ include = ["fluidattacks_core*"]
 [tool.setuptools.package-data]
 "fluidattacks_core.sarif" = ["__init__.py"]
 
+[tool.deptry]
+extend_exclude = ["^test/.*"]
+
+[tool.deptry.per_rule_ignores]
+DEP002 = [
+  "tree-sitter-c-sharp",
+  "tree-sitter-go",
+  "tree-sitter-html",
+  "tree-sitter-java",
+  "tree-sitter-javascript",
+  "tree-sitter-json",
+  "tree-sitter-kotlin",
+  "tree-sitter-php",
+  "tree-sitter-python",
+  "tree-sitter-typescript",
+  "tree-sitter-xml",
+  "tree-sitter-yaml",
+  "tree-sitter-dart-orchard",
+]
+
 [build-system]
 requires = ["setuptools>=69", "wheel"]
 build-backend = "setuptools.build_meta"

{fluidattacks_core-4.2.1 → fluidattacks_core-4.3.1}/test/test_logging.py

@@ -122,10 +122,11 @@ def test_json_formatter_for_lambdas(
 @pytest.mark.parametrize(
     ("job_name", "job_queue", "product_id", "expected_source", "expected_service_name"),
     [
-        ("skims_process", "skims_large", "skims", "batch", "skims_process"),
-        (None, "skims_large", "skims", "batch", "from-skims_large"),
+        ("skims_process", "skims_large", "skims", "batch", "skims"),
+        ("skims_process", "skims_large", None, "batch", "skims_process"),
         (None, None, "skims", "batch", "skims"),
         (None, None, None, "batch", "unknown"),
+        (None, "skims_large", None, "batch", "from-skims_large"),
     ],
 )
 def test_json_formatter_for_batch(  # noqa: PLR0913
@@ -149,6 +150,7 @@ def test_json_formatter_for_batch(  # noqa: PLR0913
     log_entry = json.loads(output.err)
     assert log_entry["ddsource"] == expected_source
     assert log_entry["dd.service"] == expected_service_name
+    assert log_entry["job_metadata.id"] == "111"
 
 
 @pytest.mark.parametrize(