pytestomatio 2.8.2.dev8__tar.gz → 2.8.2.dev9__tar.gz

{pytestomatio-2.8.2.dev8/pytestomatio.egg-info → pytestomatio-2.8.2.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytestomatio
-Version: 2.8.2.dev8
+Version: 2.8.2.dev9
 Summary: Pytest plugin to sync test with testomat.io
 Author: Oleksii Ostapov, TikoQA
 Project-URL: Testomat.io, https://testomat.io/
@@ -219,6 +219,8 @@ def test_example():
 - test run labels, tags
 
 ## TODO
+- retry test run update with less attributes, we get 500 from api
+- handler non configured s3 bucket error
 - Fix test duration
 
 ## Contribution

{pytestomatio-2.8.2.dev8 → pytestomatio-2.8.2.dev9}/README.md

@@ -197,6 +197,8 @@ def test_example():
 - test run labels, tags
 
 ## TODO
+- retry test run update with less attributes, we get 500 from api
+- handler non configured s3 bucket error
 - Fix test duration
 
 ## Contribution

{pytestomatio-2.8.2.dev8 → pytestomatio-2.8.2.dev9}/pyproject.toml

@@ -13,7 +13,7 @@ version_provider = "pep621"
 update_changelog_on_bump = false
 [project]
 name = "pytestomatio"
-version = "2.8.2.dev8"
+version = "2.8.2.dev9"
 
 dependencies = [
     "requests>=2.29.0",

{pytestomatio-2.8.2.dev8 → pytestomatio-2.8.2.dev9}/pytestomatio/connect/s3_connector.py

@@ -1,3 +1,4 @@
+from typing import Optional
 import boto3
 import logging
 from io import BytesIO
@@ -6,7 +7,7 @@ log = logging.getLogger(__name__)
 log.setLevel('INFO')
 
 
-def parse_endpoint(endpoint: str or None) -> str or None:
+def parse_endpoint(endpoint: str = None) -> Optional[str]:
     if endpoint is None:
         return
     if endpoint.startswith('https://'):
@@ -17,11 +18,14 @@ def parse_endpoint(endpoint: str or None) -> str or None:
 
 
 class S3Connector:
-    def __init__(self, aws_access_key_id: str or None = None,
-                 aws_secret_access_key: str or None = None,
-                 endpoint: str or None = None,
-                 bucket_name: str or None = None):
+    def __init__(self,
+                 aws_region_name: Optional[str],
+                 aws_access_key_id: Optional[str],
+                 aws_secret_access_key: Optional[str],
+                 endpoint: Optional[str],
+                 bucket_name: Optional[str]):
 
+        self.aws_region_name = aws_region_name
         self.endpoint = parse_endpoint(endpoint)
         self.bucket_name = bucket_name
         self.client = None
@@ -35,11 +39,14 @@ class S3Connector:
             's3',
             endpoint_url=f'https://{self.endpoint}',
             aws_access_key_id=self.aws_access_key_id,
-            aws_secret_access_key=self.aws_secret_access_key)
+            aws_secret_access_key=self.aws_secret_access_key,
+            region_name=self.aws_region_name
+            ),
+
         self._is_logged_in = True
         log.info('s3 session created')
 
-    def upload_file(self, file_path: str, key: str = None, bucket_name: str = None) -> str or None:
+    def upload_file(self, file_path: str, key: str = None, bucket_name: str = None) -> Optional[str]:
         if not self._is_logged_in:
             log.warning('s3 session is not created, creating new one')
             return
@@ -54,7 +61,7 @@ class S3Connector:
         log.info(f'artifact {file_path} uploaded to s3://{bucket_name}/{key}')
         return f'https://{bucket_name}.{self.endpoint}/{key}'
 
-    def upload_file_object(self, file_bytes: bytes, key: str, bucket_name: str = None) -> str or None:
+    def upload_file_object(self, file_bytes: bytes, key: str, bucket_name: str = None) -> Optional[str]:
         if not self._is_logged_in:
             log.warning('s3 session is not created, creating new one')
             return

{pytestomatio-2.8.2.dev8 → pytestomatio-2.8.2.dev9}/pytestomatio/utils/helper.py

@@ -86,10 +86,11 @@ def add_and_enrich_tests(meta: list[TestItem], test_files: set,
 
 def read_env_s3_keys(artifact: dict) -> tuple:
     return (
-        os.environ.get('ACCESS_KEY_ID') or artifact.get('ACCESS_KEY_ID'),
-        os.environ.get('SECRET_ACCESS_KEY') or artifact.get('SECRET_ACCESS_KEY'),
-        os.environ.get('ENDPOINT') or artifact.get('ENDPOINT'),
-        os.environ.get('BUCKET') or artifact.get('BUCKET')
+        os.environ.get('REGION') or os.environ.get('S3_REGION') or artifact.get('REGION'),
+        os.environ.get('ACCESS_KEY_ID') or os.environ.get('S3_ACCESS_KEY_ID') or artifact.get('ACCESS_KEY_ID'),
+        os.environ.get('SECRET_ACCESS_KEY') or os.environ.get('S3_SECRET_ACCESS_KEY') or artifact.get('SECRET_ACCESS_KEY'),
+        os.environ.get('ENDPOINT') or  os.environ.get('S3_ENDPOINT') or artifact.get('ENDPOINT'),
+        os.environ.get('BUCKET') or os.environ.get('S3_BUCKET') or artifact.get('BUCKET')
     )
 
 def safe_string_list(param: str):

{pytestomatio-2.8.2.dev8 → pytestomatio-2.8.2.dev9/pytestomatio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytestomatio
-Version: 2.8.2.dev8
+Version: 2.8.2.dev9
 Summary: Pytest plugin to sync test with testomat.io
 Author: Oleksii Ostapov, TikoQA
 Project-URL: Testomat.io, https://testomat.io/
@@ -219,6 +219,8 @@ def test_example():
 - test run labels, tags
 
 ## TODO
+- retry test run update with less attributes, we get 500 from api
+- handler non configured s3 bucket error
 - Fix test duration
 
 ## Contribution