opentf-toolkit-nightly 0.59.0.dev1214__py3-none-any.whl → 0.59.0.dev1221__py3-none-any.whl

opentf/commons/selectors.py

@@ -30,7 +30,7 @@ OpCode = Tuple[
 ]
 
 KEY = r'[a-z0-9A-Z-_./]+'
-VALUE = r'[a-z0-9A-Z-_./@]+'
+VALUE = r'[a-z0-9A-Z-_./@:]+'
 TAIL = rf"\[({KEY})\]"
 EQUAL_EXPR = re.compile(rf'^({KEY})({TAIL})?\s*([=!]?=)\s*({VALUE})(?:,|$)')
 INSET_EXPR = re.compile(

opentf/toolkit/channels.py

@@ -323,6 +323,12 @@ def process_output(
 ) -> Dict[str, Any]:
     """Process output, filling structures.
 
+    `event` is expected to have its metadata enriched with the following
+    fields:
+
+    - channel_os: the runner OS
+    - channel_temp: the temporary directory on the runner
+
     # Required parameters
 
     - event: an ExecutionCommand event
@@ -330,7 +336,6 @@ def process_output(
     - stdout: a list of strings
     - stderr: a list of strings
     - jobstate: a JobState object
-    - context: a dictionary, channelhandler context
     - _get: a function copying a remote file to a local path
     - _put: a function copying a local file to a remote environment
 
@@ -428,6 +433,9 @@ def process_output(
 
     metadata: Dict[str, Any] = event['metadata']
     is_windows: bool = metadata['channel_os'] == 'windows'
+    opentfvariables = VARIABLES_TEMPLATE[metadata['channel_os']].format(
+        job_id=metadata['job_id'], root=metadata['channel_temp']
+    )
     separator = '\\' if is_windows else '/'
     outputs = {}
     logs: List[str] = []
@@ -466,6 +474,9 @@ def process_output(
     if metadata.get('artifacts'):
         del metadata['artifacts']
 
+    if metadata['step_sequence_id'] != CHANNEL_RELEASE:
+        _attach(opentfvariables, f'type={OPENTF_VARIABLES_TYPE}')
+
     result = make_event(EXECUTIONRESULT, metadata=metadata, status=resp)
 
     if outputs:
@@ -480,17 +491,6 @@ def process_output(
     return result
 
 
-def _attach_opentf_variables(runner_os: str, script: List[str]):
-    if runner_os == 'windows':
-        script.append(
-            f'@if exist "%OPENTF_VARIABLES%" echo ::attach type={OPENTF_VARIABLES_TYPE}::%OPENTF_VARIABLES%'
-        )
-    else:
-        script.append(
-            f'if [ -f "$OPENTF_VARIABLES" ]; then echo "::attach type={OPENTF_VARIABLES_TYPE}::"$OPENTF_VARIABLES""; fi'
-        )
-
-
 def _export_opentf_workspace(runner_os: str, workspace: str, script: List[str]) -> None:
     opentf_workspace = WORKSPACE_TEMPLATE[runner_os].format(workspace=workspace)
     if runner_os == 'windows':
@@ -675,7 +675,6 @@ def make_script(
     _maybe_create_workspace(metadata, runner_os, step_sequence_id, script)
     _make_prolog(runner_os, job_id, step_sequence_id, root, script, command)
     _maybe_change_directory(command, runner_os, script, prefix)
-    _attach_opentf_variables(runner_os, script)
 
     if command.get('shell') in (None, SHELL_DEFAULT[runner_os]):
         script += command['scripts']

{opentf_toolkit_nightly-0.59.0.dev1214.dist-info → opentf_toolkit_nightly-0.59.0.dev1221.dist-info}/METADATA

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

{opentf_toolkit_nightly-0.59.0.dev1214.dist-info → opentf_toolkit_nightly-0.59.0.dev1221.dist-info}/RECORD

@@ -5,7 +5,7 @@ opentf/commons/datasources.py,sha256=GSbjrYnZQup2B3r7T7l3C_o6R2jS13nQiu6dRitoenk
 opentf/commons/expressions.py,sha256=jM_YKXVOFhvOE2aE2IuacuvxhIsOYTFs2oQkpcbWR6g,19645
 opentf/commons/pubsub.py,sha256=M0bvajR9raUP-xe5mfRjdrweZyHQw1_Qsy56gS-Sck4,7676
 opentf/commons/schemas.py,sha256=cjyPXRhRIPQauCdy9zGRaOkqdVcklz47JnljTTLNpq8,4254
-opentf/commons/selectors.py,sha256=DEpLgRAr5HXSpSYI4liXP2hLUTvOSexFa9Vfa1xIQTk,7134
+opentf/commons/selectors.py,sha256=8_SeCm5pS5rWARwt1amOjdwNXwfPd5NOoyz4OZrniZo,7135
 opentf/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opentf/schemas/abac.opentestfactory.org/v1alpha1/Policy.json,sha256=JXsfNAPSEYggeyaDutSQBeG38o4Bmcr70dPLWWeqIh8,2105
 opentf/schemas/opentestfactory.org/v1/ExecutionCommand.json,sha256=UtmAlTaYdPSZDeQnx-ocX8IonyEPWoNmgDkHwQwQxWE,4126
@@ -56,10 +56,10 @@ 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=sggwEpMx7PTaSgYzs-2uCF5YZzpsncMyTlfF_G60CrE,21518
 opentf/toolkit/__init__.py,sha256=mYeJPZ92ulbTBItqEsZgF4nnuRh6G19QPY3Jxc92ifc,23028
-opentf/toolkit/channels.py,sha256=0kaoSHAOEk8YxnQUNFZFB-eHa_SpZtbzhiVUJRjBkvo,23459
+opentf/toolkit/channels.py,sha256=lqFGQiHYiGMaYuGAXmbyaIsW2B_9KlaUTF8LiUIQOAg,23399
 opentf/toolkit/core.py,sha256=cscUkwdwvLkerqMRL05dgtKJ42QbBQQc28kRBiyZM9o,9883
-opentf_toolkit_nightly-0.59.0.dev1214.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.59.0.dev1214.dist-info/METADATA,sha256=JoKYEtOwdsWC7_sPXoIQLMlJcDVE7uo12-ezonH39wo,1940
-opentf_toolkit_nightly-0.59.0.dev1214.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-opentf_toolkit_nightly-0.59.0.dev1214.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.59.0.dev1214.dist-info/RECORD,,
+opentf_toolkit_nightly-0.59.0.dev1221.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.59.0.dev1221.dist-info/METADATA,sha256=Vpu0PnqxyOxphIAfhWnlnZqWzwd8iXdAGth9rM-nqxM,1940
+opentf_toolkit_nightly-0.59.0.dev1221.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+opentf_toolkit_nightly-0.59.0.dev1221.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.59.0.dev1221.dist-info/RECORD,,