stix2arango 1.0.3__tar.gz → 1.1.1__tar.gz

{stix2arango-1.0.3 → stix2arango-1.1.1}/.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.0.3 → stix2arango-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stix2arango
-Version: 1.0.3
+Version: 1.1.1
 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.0.3 → stix2arango-1.1.1}/pyproject.toml

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

{stix2arango-1.0.3 → stix2arango-1.1.1}/stix2arango/services/arangodb_service.py

@@ -220,7 +220,8 @@ class ArangoDBService:
         )
         out = [dict(zip(('id', '_key', 'modified', '_record_modified', '_is_latest', '_id'), obj_tuple)) for obj_tuple in out]
         annotated, deprecated = annotate_versions(out)
-        self.db.collection(collection_name).update_many(annotated, sync=True, keep_none=False)
+        for chunk in utils.chunked(annotated, 10_000):
+            self.db.collection(collection_name).update_many(chunk, sync=True, keep_none=False)
         return deprecated
 
 
@@ -297,8 +298,9 @@ class ArangoDBService:
     @contextlib.contextmanager
     def transactional(self, write=None, exclusive=None, sync=True):
         original_db = self.db
-        transactional_db = self.db.begin_transaction(allow_implicit=True, write=write, exclusive=exclusive, sync=sync)
+        transactional_db = self.db.begin_transaction(allow_implicit=True, write=write, exclusive=exclusive, sync=sync, lock_timeout=300)
         try:
+            logging.info(f"entering transaction: {transactional_db.transaction_status()}")
             self.db = transactional_db
             yield self
             transactional_db.commit_transaction()
@@ -306,4 +308,5 @@ class ArangoDBService:
             transactional_db.abort_transaction()
             raise
         finally:
+            logging.info(f"exiting transaction: {transactional_db.transaction_status()}")
             self.db = original_db