opentf-toolkit-nightly 0.63.0.dev1404__py3-none-any.whl → 0.63.0.dev1406__py3-none-any.whl

opentf/toolkit/channels.py

@@ -17,6 +17,8 @@
 
 from typing import Any, Callable, Dict, List, NamedTuple, Optional, Set, Tuple, Union
 
+from collections import defaultdict
+from copy import deepcopy
 from datetime import datetime
 from shlex import quote
 
@@ -46,6 +48,14 @@ STOPCOMMANDS_COMMAND = re.compile(r'^::stop-commands::(\w+)$')
 ADDMASK_COMMAND = re.compile(r'^::add-mask::(.*)$')
 PUT_FILE_COMMAND = re.compile(r'^::put\s+file=(.*?)\s*::(.*?)\s*$')
 
+COMMAND_PATTERNS = (
+    ATTACH_COMMAND,
+    UPLOAD_COMMAND,
+    DOWNLOAD_COMMAND,
+    PUT_FILE_COMMAND,
+    SETOUTPUT_COMMAND,
+)
+
 
 ## step sequence IDs
 
@@ -313,6 +323,7 @@ class JobState:
     def __init__(self) -> None:
         self.stop_command: Optional[str] = None
         self.masks: List[str] = []
+        self.workflow_commands: List[str] = []
 
 
 def mask(line: str, state: JobState) -> str:
@@ -332,6 +343,9 @@ def _as_log(line: str, jobstate: JobState):
     return mask(line, jobstate).rstrip()
 
 
+## artifacts
+
+
 def process_upload(result: Dict[str, Any]) -> Dict[str, Any]:
     """Process ExecutionResult event containing .metadata.upload flag.
 
@@ -427,7 +441,7 @@ def _download_artifacts(
 
 def process_output(
     event: Dict[str, Any],
-    resp: int,
+    resp: Optional[int],
     stdout: List[str],
     stderr: List[str],
     jobstate: JobState,
@@ -540,6 +554,14 @@ def process_output(
     attachments: List[str] = []
     attachments_metadata = {}
 
+    is_channel_notify = False
+    step_sequence_id = metadata['step_sequence_id']
+    if resp is None:
+        resp, is_channel_notify = 0, True
+    if not is_channel_notify and jobstate.workflow_commands:
+        stdout.extend(jobstate.workflow_commands)
+        jobstate.workflow_commands.clear()
+
     has_artifacts = False
     for line in stdout:
         # Parsing stdout for workflow commands
@@ -548,6 +570,10 @@ def process_output(
                 jobstate.stop_command = None
             continue
 
+        if is_channel_notify and any(p.match(line) for p in COMMAND_PATTERNS):
+            jobstate.workflow_commands.append(line)
+            continue
+
         if wcmd := ATTACH_COMMAND.match(line):
             resp = _attach(wcmd.group(2), wcmd.group(1))
         elif wcmd := UPLOAD_COMMAND.match(line):
@@ -569,11 +595,20 @@ def process_output(
     for line in stderr:
         logs.append(mask(line, jobstate).rstrip())
 
+    if is_channel_notify:
+        notify = make_event(EXECUTIONRESULT, metadata=deepcopy(metadata), status=resp)
+        notify['metadata']['step_sequence_id_origin'] = metadata['step_sequence_id']
+        notify['metadata']['step_sequence_id'] = CHANNEL_NOTIFY
+        notify['logs'] = logs
+        if notify['metadata'].get('artifacts'):
+            del notify['metadata']['artifacts']
+        return notify
+
     if metadata.get('artifacts'):
         del metadata['artifacts']
 
     opentf_variables = None
-    if metadata['step_sequence_id'] != CHANNEL_RELEASE:
+    if step_sequence_id != CHANNEL_RELEASE:
         if variables:
             opentf_variables = _read_opentf_variables(variables)
         else:

{opentf_toolkit_nightly-0.63.0.dev1404.dist-info → opentf_toolkit_nightly-0.63.0.dev1406.dist-info}/METADATA

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

{opentf_toolkit_nightly-0.63.0.dev1404.dist-info → opentf_toolkit_nightly-0.63.0.dev1406.dist-info}/RECORD

@@ -58,11 +58,11 @@ opentf/schemas/opentestfactory.org/v1beta2/ServiceConfig.json,sha256=rEvK2YWL5lG
 opentf/scripts/launch_java_service.sh,sha256=S0jAaCuv2sZy0Gf2NGBuPX-eD531rcM-b0fNyhmzSjw,2423
 opentf/scripts/startup.py,sha256=DLanDaXutUTYcG2PwoJ34QH-5G0TwfLUY_xy1VkVOqA,23202
 opentf/toolkit/__init__.py,sha256=YnH66dmePAIU7dq_xWFYTIEUrsL9qV9f82LRDiBzbzs,22057
-opentf/toolkit/channels.py,sha256=7uHpQUCWCzSxcQifeUL9SB9fvsq6_9cZt_8IdBgw8FQ,26272
+opentf/toolkit/channels.py,sha256=8WuybkK7HZpTvCqstnik6cz-OGd7p4AMBAfBJX3E3zA,27389
 opentf/toolkit/core.py,sha256=jMBDIYZ8Qn3BvsysfKoG0iTtjOnZsggetpH3eXygCsI,9636
 opentf/toolkit/models.py,sha256=PNfXVQbeyOwDfaNrLjcfhYm6duMSlNWBtZsWZcs53ag,6583
-opentf_toolkit_nightly-0.63.0.dev1404.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.63.0.dev1404.dist-info/METADATA,sha256=e5Yk6R0U0-fHJQtr-EBn1kD1EqdiUVBpSnCvYBoTiLA,2215
-opentf_toolkit_nightly-0.63.0.dev1404.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-opentf_toolkit_nightly-0.63.0.dev1404.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.63.0.dev1404.dist-info/RECORD,,
+opentf_toolkit_nightly-0.63.0.dev1406.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.63.0.dev1406.dist-info/METADATA,sha256=EXkrO2T8qRPNdSP83yiGluJDu-aq7zwXDY4mDbsrbUg,2215
+opentf_toolkit_nightly-0.63.0.dev1406.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+opentf_toolkit_nightly-0.63.0.dev1406.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.63.0.dev1406.dist-info/RECORD,,