pytestomatio 2.8.2.dev8__tar.gz → 2.8.2.dev10__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytestomatio
-Version: 2.8.2.dev8
+Version: 2.8.2.dev10
 Summary: Pytest plugin to sync test with testomat.io
 Author: Oleksii Ostapov, TikoQA
 Project-URL: Testomat.io, https://testomat.io/
@@ -114,7 +114,7 @@ https://docs.testomat.io/usage/test-artifacts/
 Analyser needs to be aware of the cloud storage credentials.
 There are two options:
 1. Enable **Share credentials with testomat.io Reporter** option in testomat.io Settings -> Artifacts.
-2. Use environment variables   `ACCESS_KEY_ID, SECRET_ACCESS_KEY, ENDPOINT, BUCKET`
+2. Use environment variables   `ACCESS_KEY_ID, SECRET_ACCESS_KEY, ENDPOINT, BUCKET, BUCKET_PATH`
 
 You would need to decide when you want to upload your test artifacts to cloud storage
 
@@ -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.dev10}/README.md

@@ -92,7 +92,7 @@ https://docs.testomat.io/usage/test-artifacts/
 Analyser needs to be aware of the cloud storage credentials.
 There are two options:
 1. Enable **Share credentials with testomat.io Reporter** option in testomat.io Settings -> Artifacts.
-2. Use environment variables   `ACCESS_KEY_ID, SECRET_ACCESS_KEY, ENDPOINT, BUCKET`
+2. Use environment variables   `ACCESS_KEY_ID, SECRET_ACCESS_KEY, ENDPOINT, BUCKET, BUCKET_PATH`
 
 You would need to decide when you want to upload your test artifacts to cloud storage
 
@@ -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.dev10}/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.dev10"
 
 dependencies = [
     "requests>=2.29.0",

{pytestomatio-2.8.2.dev8 → pytestomatio-2.8.2.dev10}/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://'):
@@ -15,15 +16,20 @@ def parse_endpoint(endpoint: str or None) -> str or None:
         return endpoint[7:]
     return endpoint
 
-
 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],
+                 bucker_prefix: Optional[str]
+                 ):
 
+        self.aws_region_name = aws_region_name
         self.endpoint = parse_endpoint(endpoint)
         self.bucket_name = bucket_name
+        self.bucker_prefix = bucker_prefix
         self.client = None
         self._is_logged_in = False
         self.aws_access_key_id = aws_access_key_id
@@ -35,35 +41,38 @@ 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
         if not key:
             key = file_path
+        key = f"{self.bucker_prefix}/{key}"
         if not bucket_name:
             bucket_name = self.bucket_name
-        if bucket_name is None:
-            raise Exception('bucket name is not defined')
+
         log.info(f'uploading artifact {file_path} to s3://{bucket_name}/{key}')
         self.client.upload_file(file_path, bucket_name, key)
         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
         file = BytesIO(file_bytes)
         if not bucket_name:
             bucket_name = self.bucket_name
-        if bucket_name is None:
-            raise Exception('bucket name is not defined')
+        key = f"{self.bucker_prefix}/{key}"
+
         log.info(f'uploading artifact {key} to s3://{bucket_name}/{key}')
         self.client.upload_fileobj(file, bucket_name, key)
         log.info(f'artifact {key} uploaded to s3://{bucket_name}/{key}')
-        return f'https://{bucket_name}.{self.endpoint}/{key}'
+        return f'https://{bucket_name}.{self.endpoint}/{key}' 

{pytestomatio-2.8.2.dev8 → pytestomatio-2.8.2.dev10}/pytestomatio/main.py

@@ -114,15 +114,14 @@ def pytest_collection_modifyitems(session: Session, config: Config, items: list[
                 log.error('Test run failed to create. Reporting skipped')
                 return
 
-            artifact = run_details.get('artifacts')
-            if artifact:
-                s3_details = helper.read_env_s3_keys(artifact)
-
-                if all(s3_details):
-                    pytest.testomatio.s3_connector = S3Connector(*s3_details)
-                    pytest.testomatio.s3_connector.login()
-                else:
-                    pytest.testomatio.s3_connector = S3Connector()
+            s3_details = helper.read_env_s3_keys(run_details)
+
+            if all(s3_details):
+                pytest.testomatio.s3_connector = S3Connector(*s3_details)
+                pytest.testomatio.s3_connector.login()
+            else:
+                pytest.testomatio.s3_connector = S3Connector()
+                
         case 'debug':
             with open(metadata_file, 'w') as file:
                 data = json.dumps([i.to_dict() for i in meta], indent=4)

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

@@ -84,12 +84,16 @@ def add_and_enrich_tests(meta: list[TestItem], test_files: set,
         update_tests(test_file, mapping, test_names, decorator_name)
 
 
-def read_env_s3_keys(artifact: dict) -> tuple:
+def read_env_s3_keys(testRunConfig: dict) -> tuple:
+    artifacts = testRunConfig.get('artifacts')
+    bucket_path = (os.environ.get('BUCKET_PATH') or os.environ.get('S3_BUCKET_PATH'))
     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 artifacts.get('REGION'),
+        os.environ.get('ACCESS_KEY_ID') or os.environ.get('S3_ACCESS_KEY_ID') or artifacts.get('ACCESS_KEY_ID'),
+        os.environ.get('SECRET_ACCESS_KEY') or os.environ.get('S3_SECRET_ACCESS_KEY') or artifacts.get('SECRET_ACCESS_KEY'),
+        os.environ.get('ENDPOINT') or  os.environ.get('S3_ENDPOINT') or artifacts.get('ENDPOINT'),
+        os.environ.get('BUCKET') or os.environ.get('S3_BUCKET') or artifacts.get('BUCKET'),
+        bucket_path + "/" + testRunConfig.get("uid") if bucket_path else testRunConfig.get("uid")
     )
 
 def safe_string_list(param: str):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytestomatio
-Version: 2.8.2.dev8
+Version: 2.8.2.dev10
 Summary: Pytest plugin to sync test with testomat.io
 Author: Oleksii Ostapov, TikoQA
 Project-URL: Testomat.io, https://testomat.io/
@@ -114,7 +114,7 @@ https://docs.testomat.io/usage/test-artifacts/
 Analyser needs to be aware of the cloud storage credentials.
 There are two options:
 1. Enable **Share credentials with testomat.io Reporter** option in testomat.io Settings -> Artifacts.
-2. Use environment variables   `ACCESS_KEY_ID, SECRET_ACCESS_KEY, ENDPOINT, BUCKET`
+2. Use environment variables   `ACCESS_KEY_ID, SECRET_ACCESS_KEY, ENDPOINT, BUCKET, BUCKET_PATH`
 
 You would need to decide when you want to upload your test artifacts to cloud storage
 
@@ -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