opentf-toolkit-nightly 0.57.0.dev1093__py3-none-any.whl → 0.57.0.dev1098__py3-none-any.whl

opentf/commons/__init__.py

@@ -66,6 +66,7 @@ DEFAULT_HEADERS = {
 REASON_STATUS = {
     'OK': 200,
     'Created': 201,
+    'Accepted': 202,
     'NoContent': 204,
     'BadRequest': 400,
     'Unauthorized': 401,
@@ -75,6 +76,7 @@ REASON_STATUS = {
     'AlreadyExists': 409,
     'Conflict': 409,
     'Invalid': 422,
+    'TooManyRequests': 429,  # https://datatracker.ietf.org/doc/html/rfc6585
     'InternalError': 500,
 }
 

opentf/commons/datasources.py

@@ -49,6 +49,14 @@ CREATION_TIMESTAMP = 'creationTimestamp'
 ## Helpers
 
 
+class DataSourceScopeError(Exception):
+    """CacheException class"""
+
+    def __init__(self, msg, details=None):
+        self.msg = msg
+        self.details = details
+
+
 def _merge_dicts(dict1: Dict[str, Any], dict2: Dict[str, Any]) -> Dict[str, Any]:
     for k, v in dict1.items():
         if k in dict2:
@@ -431,7 +439,7 @@ def _make_testcase_from_testresult(
         if not in_scope(scope, testcase):
             return {}
     except ValueError as err:
-        raise ValueError(f'[SCOPE ERROR] {err}')
+        raise DataSourceScopeError(f'[SCOPE ERROR] {err}')
     return testcase
 
 
@@ -449,8 +457,11 @@ def _extract_testcases(
 ) -> Dict[str, Dict[str, Any]]:
     testcases = {}
     items = 0
+    testresults_part = testresults[state['last_notification_used'] :]
+    if not testresults_part:
+        return {}
     for i, testresult in enumerate(
-        testresults[state['last_notification_used'] :],
+        testresults_part,
         start=state['last_notification_used'],
     ):
         if i == state['last_notification_used']:
@@ -547,11 +558,12 @@ def get_testcases(
 
     if not testresults:
         raise ValueError('No test results in events.')
-
-    testcases = _extract_testcases(testresults, state, scope, events)
-    if not testcases:
-        raise ValueError(f'No test cases matching scope `{scope}`.')
-
+    try:
+        testcases = _extract_testcases(testresults, state, scope, events)
+        if not testcases:
+            raise DataSourceScopeError(f'No test cases matching scope `{scope}`.')
+    except DataSourceScopeError:
+        raise
     return testcases
 
 
@@ -582,9 +594,7 @@ def _make_tag_datasource(tag: str, parent: Dict[str, Any]) -> Dict[str, Any]:
     }
 
 
-def get_tags(
-    events: List[Dict[str, Any]], scope: Union[str, bool] = True, state=None
-) -> Dict[str, Any]:
+def get_tags(events: List[Dict[str, Any]]) -> Dict[str, Any]:
     """Extract metadata for each execution environment tag.
 
     # Required parameters:
@@ -619,25 +629,12 @@ def get_tags(
         raise ValueError(
             'No job events found in workflow. Cannot extract data for tags.'
         )
-    try:
-        testcases = get_testcases(events, scope, state)
-    except ValueError as err:
-        if str(err).startswith('[SCOPE ERROR] '):
-            raise ValueError(str(err))
-        current_app.logger.debug(str(err))
-        testcases = {}
     tags = {}
     for job, parent in jobs.values():
         for tag in job['runs-on']:
             tags.setdefault(tag, _make_tag_datasource(tag, parent))
             tags[tag]['status']['jobCount'] += 1
 
-    for testcase in testcases.values():
-        for tag in testcase['test']['runs-on']:
-            tags[tag]['status']['testCaseCount'] += 1
-            tags[tag]['status']['testCaseStatusSummary'][
-                testcase['test']['outcome']
-            ] += 1
     return tags
 
 
@@ -757,9 +754,7 @@ def _make_job_datasource(
     }
 
 
-def get_jobs(
-    events: List[Dict[str, Any]], scope: Union[str, bool] = True, state=None
-) -> Dict[str, Any]:
+def get_jobs(events: List[Dict[str, Any]]) -> Dict[str, Any]:
     """Extract metadata for each job.
 
     # Required parameters:
@@ -811,14 +806,6 @@ def get_jobs(
             'No job events found in workflow. Cannot extract data for jobs.'
         )
 
-    try:
-        testcases = get_testcases(events, scope, state)
-    except ValueError as err:
-        if str(err).startswith('[SCOPE ERROR] '):
-            raise ValueError(str(err))
-        current_app.logger.debug(str(err))
-        testcases = {}
-
     jobs_events = list(
         filter(
             lambda event: event['kind'] in (EXECUTIONCOMMAND, EXECUTIONRESULT)
@@ -846,10 +833,4 @@ def get_jobs(
         )
         jobs[data['metadata']['id']] = data
 
-    for testcase in testcases.values():
-        jobs[testcase['metadata']['job_id']]['status']['testCaseCount'] += 1
-        jobs[testcase['metadata']['job_id']]['status']['testCaseStatusSummary'][
-            testcase['test']['outcome']
-        ] += 1
-
     return jobs

opentf/commons/schemas.py

@@ -37,7 +37,7 @@ SUBSCRIPTION = 'opentestfactory.org/v1alpha1/Subscription'
 
 WORKFLOW = 'opentestfactory.org/v1/Workflow'
 WORKFLOWCOMPLETED = 'opentestfactory.org/v1/WorkflowCompleted'
-WORKFLOWCANCELED = 'opentestfactory.org/v1alpha1/WorkflowCanceled'
+WORKFLOWCANCELED = 'opentestfactory.org/v1/WorkflowCanceled'
 WORKFLOWRESULT = 'opentestfactory.org/v1alpha1/WorkflowResult'
 
 GENERATORCOMMAND = 'opentestfactory.org/v1alpha1/GeneratorCommand'

opentf/schemas/opentestfactory.org/v1/WorkflowCanceled.json

@@ -0,0 +1,60 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema#",
+    "title": "JSON SCHEMA for opentestfactory.org/v1 WorkflowCanceled manifests",
+    "type": "object",
+    "properties": {
+        "apiVersion": {
+            "const": "opentestfactory.org/v1"
+        },
+        "kind": {
+            "const": "WorkflowCanceled"
+        },
+        "metadata": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "namespace": {
+                    "type": "string",
+                    "pattern": "^[a-z0-9][a-z0-9-]*$"
+                },
+                "workflow_id": {
+                    "type": "string"
+                },
+                "labels": {
+                    "type": "object",
+                    "patternProperties": {
+                        "^([a-zA-Z0-9-.]+/)?[a-zA-Z0-9]([a-zA-Z0-9._-]*[a-zA-Z0-9])?$": {
+                            "type": "string"
+                        }
+                    },
+                    "minProperties": 1,
+                    "additionalProperties": false
+                }
+            },
+            "additionalProperties": true,
+            "required": [
+                "name",
+                "workflow_id"
+            ]
+        },
+        "details": {
+            "type": "object"
+        },
+        "outputs": {
+            "type": "object",
+            "patternProperties": {
+                "^[a-zA-Z_][a-zA-Z0-9_-]*$": {
+                    "type": "string"
+                }
+            }
+        }
+    },
+    "required": [
+        "apiVersion",
+        "kind",
+        "metadata"
+    ],
+    "additionalProperties": false
+}

{opentf_toolkit_nightly-0.57.0.dev1093.dist-info → opentf_toolkit_nightly-0.57.0.dev1098.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentf-toolkit-nightly
-Version: 0.57.0.dev1093
+Version: 0.57.0.dev1098
 Summary: OpenTestFactory Orchestrator Toolkit
 Home-page: https://gitlab.com/henixdevelopment/open-source/opentestfactory/python-toolkit
 Author: Martin Lafaix

{opentf_toolkit_nightly-0.57.0.dev1093.dist-info → opentf_toolkit_nightly-0.57.0.dev1098.dist-info}/RECORD

@@ -1,10 +1,10 @@
-opentf/commons/__init__.py,sha256=Uq-7WvkMoBiF3C1KnhwIL4LCKpT8EvomnuG4MBYpIhs,21994
+opentf/commons/__init__.py,sha256=pHeXaleOQxz0b0Ds8zIvMu2COi7jYuj6dNne08o0UU0,22092
 opentf/commons/auth.py,sha256=bM2Z3kxm2Wku1lKXaRAIg37LHvXWAXIZIqjplDfN2P8,15899
 opentf/commons/config.py,sha256=dyus4K5Zdmcftc3Y9Z1YRkzA1KwiRLHoeAlg2_A49QM,7876
-opentf/commons/datasources.py,sha256=LjIjZbf08u1VllPN4fDss0OAg-_7gtRqgpIZ2tLuiHo,26807
+opentf/commons/datasources.py,sha256=lIQf81riLHWYj1bG0Mxez7rf9cxSL50NVOf2bmKkWT4,26032
 opentf/commons/expressions.py,sha256=jM_YKXVOFhvOE2aE2IuacuvxhIsOYTFs2oQkpcbWR6g,19645
 opentf/commons/pubsub.py,sha256=DVrSara5FRfNdPBwXKUkTobqGki0RPDehylTEFcJnFc,7341
-opentf/commons/schemas.py,sha256=Ya5aNBSvq4oFu6oRQcyM7CHNjTDgaX8O2JrN1S9X1I4,4201
+opentf/commons/schemas.py,sha256=C4DE5LXTMTLHTiLGhcwtS-8za8d9ZgkMPiA9PDLpAJ4,4195
 opentf/commons/selectors.py,sha256=DEpLgRAr5HXSpSYI4liXP2hLUTvOSexFa9Vfa1xIQTk,7134
 opentf/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opentf/schemas/abac.opentestfactory.org/v1alpha1/Policy.json,sha256=JXsfNAPSEYggeyaDutSQBeG38o4Bmcr70dPLWWeqIh8,2105
@@ -12,6 +12,7 @@ opentf/schemas/opentestfactory.org/v1/ExecutionCommand.json,sha256=UtmAlTaYdPSZD
 opentf/schemas/opentestfactory.org/v1/GeneratorResult.json,sha256=neoFocJGkVTQQPtnG5xnbqNLX8ivFBJbanbbPweId7s,16608
 opentf/schemas/opentestfactory.org/v1/ProviderResult.json,sha256=Ej4zhCE3rCqCGKcaeAoIHwSJTV_7fw-rAxhJ52qA-Gs,9641
 opentf/schemas/opentestfactory.org/v1/Workflow.json,sha256=mpWxJfP3aV3sYzVxxWOivD55Top4J5WXTTKBzp7gjIw,22486
+opentf/schemas/opentestfactory.org/v1/WorkflowCanceled.json,sha256=BCWxnm3rt4VWh9GXkIhdNY9JYohFWxi9Wg3JjXIavaU,1694
 opentf/schemas/opentestfactory.org/v1/WorkflowCompleted.json,sha256=KtC9-oeaBNM3D60SFpmYnLMtqewUAGRoOJfVzb7CdHg,1635
 opentf/schemas/opentestfactory.org/v1alpha1/AgentRegistration.json,sha256=NQykqU-lKE8LtBhBiFUcpVJq00MRG6dZsoM1xedx6uQ,1230
 opentf/schemas/opentestfactory.org/v1alpha1/AllureCollectorOutput.json,sha256=-L9DDWA0A4x54bPMn4m6Qwi2tf2nHvzIPFOElTjaVck,1366
@@ -53,8 +54,8 @@ opentf/scripts/startup.py,sha256=Da2zo93pBWbdRmj-wgekgLcF94rpNc3ZkbvR8R0w8XY,212
 opentf/toolkit/__init__.py,sha256=nbllYXON3Rzd-hU7Cred7r4hPaCPbfSJmoY7cQ6RShc,22589
 opentf/toolkit/channels.py,sha256=6xcVKHUK2FdyVKIQmPQbakngfVuQDzCcD_lInOdKpro,17171
 opentf/toolkit/core.py,sha256=6nud1vqcfjs9swZu_Z-rbvdbejtrlSjOd8eZXIF0ChE,9795
-opentf_toolkit_nightly-0.57.0.dev1093.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.57.0.dev1093.dist-info/METADATA,sha256=0087ivZhlFClfs_ytPhHZMPsQ134M1jStT6afbJkhB8,1946
-opentf_toolkit_nightly-0.57.0.dev1093.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-opentf_toolkit_nightly-0.57.0.dev1093.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.57.0.dev1093.dist-info/RECORD,,
+opentf_toolkit_nightly-0.57.0.dev1098.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.57.0.dev1098.dist-info/METADATA,sha256=uPhQAxjwlGe5OUfel_BAR_JEbwnkreTZzEpleEdePxM,1946
+opentf_toolkit_nightly-0.57.0.dev1098.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+opentf_toolkit_nightly-0.57.0.dev1098.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.57.0.dev1098.dist-info/RECORD,,