opentf-toolkit-nightly 0.63.0.dev1393__py3-none-any.whl → 0.63.0.dev1397__py3-none-any.whl

opentf/toolkit/channels.py

@@ -210,26 +210,31 @@ def _add_default_variables(
     script.append(VARIABLE_MAKER[runner_os]('CI', 'true'))
 
 
-def _get_opentf_variables_path(metadata: Dict[str, Any]) -> str:
+def get_opentf_variables_path(metadata: Dict[str, Any]) -> str:
     return VARIABLES_TEMPLATE[metadata['channel_os']].format(
         job_id=metadata['job_id'], root=metadata['channel_temp']
     )
 
 
-def _get_opentf_variables(path: str) -> Dict[str, str]:
+def _read_opentf_variables(lines: List[str]) -> Dict[str, str]:
     variables = {}
+    for line in lines:
+        if '=' not in line:
+            continue
+        line = line.strip()
+        if set_export := OPENTF_VARIABLES_REGEX.match(line):
+            line = set_export.group(2)
+            if line.startswith('"'):
+                line = line[1:-1]
+        key, _, value = line.partition('=')
+        if OPENTF_VARIABLES_NAME_REGEX.match(key):
+            variables[key] = value
+    return variables
+
+
+def _get_opentf_variables(path: str) -> Dict[str, str]:
     with open(path, 'r') as f:
-        for line in f.readlines():
-            if '=' not in line:
-                continue
-            line = line.strip()
-            if set_export := OPENTF_VARIABLES_REGEX.match(line):
-                line = set_export.group(2)
-                if line.startswith('"'):
-                    line = line[1:-1]
-            key, _, value = line.partition('=')
-            if OPENTF_VARIABLES_NAME_REGEX.match(key):
-                variables[key] = value
+        variables = _read_opentf_variables(f.readlines())
     try:
         os.remove(path)
     except FileNotFoundError:
@@ -428,6 +433,7 @@ def process_output(
     jobstate: JobState,
     _get: Callable[[str, str], None],
     _put: Callable[[str, str], None],
+    variables: Optional[List[str]] = None,
 ) -> Dict[str, Any]:
     """Process output, filling structures.
 
@@ -566,8 +572,14 @@ def process_output(
     if metadata.get('artifacts'):
         del metadata['artifacts']
 
+    opentf_variables = None
     if metadata['step_sequence_id'] != CHANNEL_RELEASE:
-        _attach(_get_opentf_variables_path(metadata), f'type={OPENTF_VARIABLES_TYPE}')
+        if variables:
+            opentf_variables = _read_opentf_variables(variables)
+        else:
+            _attach(
+                get_opentf_variables_path(metadata), f'type={OPENTF_VARIABLES_TYPE}'
+            )
 
     result = make_event(EXECUTIONRESULT, metadata=metadata, status=resp)
     if outputs:
@@ -579,7 +591,8 @@ def process_output(
         result['metadata']['attachments'] = attachments_metadata
     if has_artifacts:
         result['metadata']['upload'] = resp
-
+    if opentf_variables:
+        result['variables'] = opentf_variables
     return result
 
 

{opentf_toolkit_nightly-0.63.0.dev1393.dist-info → opentf_toolkit_nightly-0.63.0.dev1397.dist-info}/METADATA

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

{opentf_toolkit_nightly-0.63.0.dev1393.dist-info → opentf_toolkit_nightly-0.63.0.dev1397.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=K-uW-70EJb4Ou2dBFR_7utDU3oMWBczkomtikq_2qCc,23119
 opentf/toolkit/__init__.py,sha256=YnH66dmePAIU7dq_xWFYTIEUrsL9qV9f82LRDiBzbzs,22057
-opentf/toolkit/channels.py,sha256=oXZzW5bwcnGbJ7WAIkV42ekFnOQq7HxIvnyvURWaoNs,25904
+opentf/toolkit/channels.py,sha256=7uHpQUCWCzSxcQifeUL9SB9fvsq6_9cZt_8IdBgw8FQ,26272
 opentf/toolkit/core.py,sha256=jMBDIYZ8Qn3BvsysfKoG0iTtjOnZsggetpH3eXygCsI,9636
 opentf/toolkit/models.py,sha256=PNfXVQbeyOwDfaNrLjcfhYm6duMSlNWBtZsWZcs53ag,6583
-opentf_toolkit_nightly-0.63.0.dev1393.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.63.0.dev1393.dist-info/METADATA,sha256=qLd_GytuE-XM02HMzjQN_vxrvV6jkVN8_EwHahEtUvc,2215
-opentf_toolkit_nightly-0.63.0.dev1393.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-opentf_toolkit_nightly-0.63.0.dev1393.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.63.0.dev1393.dist-info/RECORD,,
+opentf_toolkit_nightly-0.63.0.dev1397.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.63.0.dev1397.dist-info/METADATA,sha256=vEYD3Fg0XWwNxtheNasZuvo8NDBsGF3ffn_o52w6Ffk,2215
+opentf_toolkit_nightly-0.63.0.dev1397.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+opentf_toolkit_nightly-0.63.0.dev1397.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.63.0.dev1397.dist-info/RECORD,,

{opentf_toolkit_nightly-0.63.0.dev1393.dist-info → opentf_toolkit_nightly-0.63.0.dev1397.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.0)
+Generator: setuptools (80.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any