stix2arango 1.1.0__tar.gz → 1.1.2__tar.gz

{stix2arango-1.1.0 → stix2arango-1.1.2}/.github/workflows/run-tests.yml

@@ -1,15 +1,19 @@
 name: Run Tests
 
+permissions:
+  contents: read
+
 on:
   push:
     branches:
       - main
   pull_request:
-permissions:
-  contents: read
+    types:
+      - opened
+      - synchronize
 
 jobs:
-  run-tests:
+  test-pipeline:
     runs-on: ubuntu-latest
     environment: test_pipeline
     
@@ -24,10 +28,10 @@ jobs:
         with:
           python-version: "3.11"
 
-      - name: start arangodb
+      - name: Start ArangoDB
+        id: start_arango_db
         run: |
           docker run --name s2a-action-arangodb -d -p 8529:8529 -e ARANGO_ROOT_PASSWORD= arangodb/arangodb:latest 
-
           RETRY_DELAY=3
           RETRY_COUNT=10
           echo "Waiting for server to start"
@@ -37,31 +41,31 @@ jobs:
             exit 1
           fi
     
-          
-      - name: Set .env testing purpose
+      - name: Setup environment
+        id: setup_environment
         run: |
             set -a; 
             source tests/tests.env
             set +a;
-
             cp tests/tests.env .env
 
-      - name: test all
-        id: test-all
+      - name: Run tests
+        id: run_tests
         run: |
           pip install -r tests/requirements.txt
           pip install -e .
-
           pytest --cov --cov-branch --cov-report=xml --junitxml=junit.xml -o junit_family=legacy tests/
 
       - name: Upload coverage reports to Codecov
+        id: upload_unit_test_coverage
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Upload test results to Codecov
+        id: upload_unit_test_results
         if: ${{ !cancelled() }}
         uses: codecov/test-results-action@v1
         with:
-          token: ${{ secrets.CODECOV_TOKEN }}
+          token: ${{ secrets.CODECOV_TOKEN }}

{stix2arango-1.1.0 → stix2arango-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stix2arango
-Version: 1.1.0
+Version: 1.1.2
 Summary: stix2arango is a command line tool that takes a group of STIX 2.1 objects in a bundle and inserts them into ArangoDB. It can also handle updates to existing objects in ArangoDB imported in a bundle.
 Project-URL: Homepage, https://github.com/muchdogesec/stix2arango
 Project-URL: Issues, https://github.com/muchdogesec/stix2arango/issues

{stix2arango-1.1.0 → stix2arango-1.1.2}/docs/README.md

@@ -422,6 +422,12 @@ This is done using the STIX2 Python library, and such relationships are generate
     "target_ref": "<REF TARGET PROPERTY>",
     "object_marking_refs": [
         "<object_marking_refs SHOULD MATCH SOURCE_REF OBJECT>"
+    ],
+    "external_references": [
+        {
+            "source_name": "stix2arango",
+            "description": "embedded-relationship"
+        }
     ]
 }
 ```

{stix2arango-1.1.0 → stix2arango-1.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "stix2arango"
-version = "1.1.0"
+version = "1.1.2"
 authors = [
   { name = "dogesec" }
 ]

{stix2arango-1.1.0 → stix2arango-1.1.2}/stix2arango/stix2arango/stix2arango.py

@@ -469,7 +469,6 @@ class Stix2Arango:
 
     def map_embedded_relationships(self, bundle_objects, inserted_object_ids):
         objects = []
-        inserted_data = []
         for obj in tqdm(bundle_objects, desc="upload_embedded_edges"):
             if obj["id"] not in inserted_object_ids:
                 continue

{stix2arango-1.1.0 → stix2arango-1.1.2}/stix2arango/utils.py

@@ -37,7 +37,6 @@ def create_relationship_obj(
     arango_obj=None,
     extra_data=None,
 ):
-    insert_data = []
     if not isinstance(targets, list):
         return []
     for target in targets:
@@ -75,19 +74,15 @@ def create_relationship_obj(
         relationship_object["_is_ref"] = True
         relationship_object["type"] = "relationship"
         relationship_object["spec_version"] = "2.1"
-        # relationship_object['_record_md5_hash'] = generate_md5(relationship_object)
+        relationship_object["external_references"] = {
+            "source_name": "stix2arango",
+            "description": "embedded-relationship",
+        }
         if extra_data:
             relationship_object.update(extra_data)
 
         insert_statement.append(relationship_object)
-        insert_data.append(
-            [
-                "relationship",
-                relationship_object["id"],
-                True if "modified" in obj else False,
-            ]
-        )
-    return insert_data
+    return
 
 
 def generate_md5(obj: dict):