Merge pull request #315 from bsummers-tc/main

APP-3868 - updated all submodule
ThreatConnect-Inc · Jul 26, 2023 · 59080c3 · 59080c3
2 parents 0ee79ac + bacaa02
commit 59080c3
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 18 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,18 +12,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.11']
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+            submodules: recursive
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install .[dev]
+          pip install .[dev,test]
           pip freeze
       - name: Lint with pre-commit
         run: |

diff --git a/tcex/api/tc/ti_transform/transform_abc.py b/tcex/api/tc/ti_transform/transform_abc.py
@@ -169,7 +169,7 @@ def _process_associated_group(self, associations: list[AssociatedGroupTransform]
         """Process Attribute data"""
         for association in associations or []:
             for value in filter(bool, self._process_metadata_transform_model(association.value)):
-                self.add_associated_group(value)
+                self.add_associated_group(value)  # type: ignore
 
     def _process_metadata_transform_model(
         self, value: bool | MetadataTransformModel | str | None, expected_length: int | None = None
@@ -410,7 +410,7 @@ def _process_tags(self, tags: list[TagTransformModel]):
         """Process Tag data"""
         for tag in tags or []:
             for value in filter(bool, self._process_metadata_transform_model(tag.value)):
-                self.add_tag(name=value)
+                self.add_tag(name=value)  # type: ignore
 
     def _process_rating(self, metadata: MetadataTransformModel | None):
         """Process standard metadata fields."""

diff --git a/tcex/api/tc/v2/batch/batch.py b/tcex/api/tc/v2/batch/batch.py
@@ -678,7 +678,7 @@ def submit_all(
                         .get('data', {})
                         .get('batchStatus', {})
                     )
-                    if errors:
+                    if errors and batch_data is not None:
                         # retrieve errors
                         error_count = batch_data.get('errorCount', 0)
                         error_groups = batch_data.get('errorGroupCount', 0)

diff --git a/tcex/api/tc/v3/_gen/_gen.py b/tcex/api/tc/v3/_gen/_gen.py
@@ -244,15 +244,15 @@ def all(  # pylint: disable=redefined-builtin
 ):
     """Generate Args."""
     log_server()
-    gen_type = gen_type.value.lower()
+    gen_type_ = gen_type.value.lower()
     for type_ in ObjectTypes:
         type_ = util.snake_string(type_.value)
 
-        if gen_type in ['all', 'filter']:
+        if gen_type_ in ['all', 'filter']:
             gen_filter(type_)
-        if gen_type in ['all', 'model']:
+        if gen_type_ in ['all', 'model']:
             gen_model(type_)
-        if gen_type in ['all', 'object']:
+        if gen_type_ in ['all', 'object']:
             gen_object(type_)
 
 

diff --git a/tcex/api/tc/v3/_gen/_gen_abc.py b/tcex/api/tc/v3/_gen/_gen_abc.py
@@ -414,7 +414,8 @@ def gen_requirements(self):
             self.requirements['standard library'].append('from typing import TYPE_CHECKING')
 
         indent = ''
-        _libs: list[dict | str] = []
+        # _libs: list[dict | str] = []
+        _libs = []
         for from_, libs in self.requirements.items():
             if not libs:
                 # continue if there are no libraries to import

diff --git a/tcex/app/config b/tcex/app/config
diff --git a/tcex/app/key_value_store b/tcex/app/key_value_store
diff --git a/tcex/app/playbook b/tcex/app/playbook
diff --git a/tcex/pleb b/tcex/pleb
diff --git a/tcex/requests_tc b/tcex/requests_tc
diff --git a/tcex/util b/tcex/util
diff --git a/tests/api/tc/v3/indicators/test_indicator_interface.py b/tests/api/tc/v3/indicators/test_indicator_interface.py
@@ -307,7 +307,7 @@ def test_indicator_address(self, request: FixtureRequest):
         """Test Artifact get single attached to task by id"""
         associated_indicator = self.v3_helper.create_indicator()
         associated_group = self.v3_helper.create_group(
-            **{
+            **{  # type: ignore
                 'associated_indicators': associated_indicator.model.gen_body(
                     method='PUT', nested=True
                 )
+4 −4		.pre-commit-config.yaml
+1 −1		code_operation.py
+2 −8		string_operation.py