opentf-toolkit-nightly 0.58.0.dev1175__py3-none-any.whl → 0.58.0.dev1180__py3-none-any.whl

opentf/toolkit/channels.py

@@ -180,13 +180,17 @@ def _add_default_variables(
 
 
 def _make_attachment_url(
-    metadata: Dict[str, Any], remote: str, separator: str, workflow_result: bool = False
-) -> Tuple[str, Dict[str, Any]]:
+    metadata: Dict[str, Any],
+    remote: str,
+    separator: str,
+    workflow_result: bool = False,
+    name: Optional[str] = None,
+) -> Tuple[str, str]:
     uuid = make_uuid()
     prefix = metadata['workflow_id'] if workflow_result else metadata['job_id']
     suffix = 'WR' if workflow_result else metadata['step_sequence_id']
-    url = f'/tmp/{prefix}-{uuid}_{suffix}_{remote.split(separator)[-1]}'
-    return url, {'uuid': uuid}
+    url = f'/tmp/{prefix}-{uuid}_{suffix}_{name or remote.split(separator)[-1]}'
+    return url, uuid
 
 
 ## masks helpers
@@ -295,13 +299,11 @@ def process_output(
     May raise exceptions.
     """
 
-    def _attach(remote: str, args: str):
+    def _attach(remote: str, args: str, is_artefact: bool = False):
         if is_windows:
             remote = ntpath.normpath(remote)
         try:
-            attachment_url, details = _make_attachment_url(
-                metadata, remote, separator, upload
-            )
+            details = {}
             if args:
                 for parameter in args.strip().split(','):
                     if '=' not in parameter:
@@ -311,6 +313,10 @@ def process_output(
                         return 2
                     key, _, value = parameter.strip().partition('=')
                     details[key] = value
+            attachment_url, uuid = _make_attachment_url(
+                metadata, remote, separator, is_artefact, name=details.get('name')
+            )
+            details['uuid'] = uuid
             _get(remote, attachment_url)
             attachments_metadata[attachment_url] = details
             attachments.append(attachment_url)
@@ -347,7 +353,7 @@ def process_output(
     attachments: List[str] = []
     attachments_metadata = {}
 
-    upload = False
+    has_artefacts = False
     for line in stdout:
         # Parsing stdout for workflow commands
         if jobstate.stop_command:
@@ -358,8 +364,8 @@ def process_output(
         if wcmd := ATTACH_COMMAND.match(line):
             resp = _attach(wcmd.group(2), wcmd.group(1))
         elif wcmd := UPLOAD_COMMAND.match(line):
-            upload = True
-            resp = _attach(wcmd.group(2), wcmd.group(1))
+            has_artefacts = True
+            resp = _attach(wcmd.group(2), wcmd.group(1), is_artefact=True)
         elif wcmd := PUT_FILE_COMMAND.match(line):
             resp = _putfile(wcmd.group(2), wcmd.group(1))
         elif wcmd := SETOUTPUT_COMMAND.match(line):
@@ -383,7 +389,7 @@ def process_output(
     if attachments:
         result['attachments'] = attachments
         result['metadata']['attachments'] = attachments_metadata
-    if upload:
+    if has_artefacts:
         result['metadata']['upload'] = resp
     return result
 

{opentf_toolkit_nightly-0.58.0.dev1175.dist-info → opentf_toolkit_nightly-0.58.0.dev1180.dist-info}/METADATA

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

{opentf_toolkit_nightly-0.58.0.dev1175.dist-info → opentf_toolkit_nightly-0.58.0.dev1180.dist-info}/RECORD

@@ -55,10 +55,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=bAUo0FRNljkjgTkWqSJljsNeMSX21LLLZP-TS4cw1oo,18996
+opentf/toolkit/channels.py,sha256=DUP3tBSp7sjq49SwglobG92MO2zX0vdiHGYx0ms30yA,19182
 opentf/toolkit/core.py,sha256=6nud1vqcfjs9swZu_Z-rbvdbejtrlSjOd8eZXIF0ChE,9795
-opentf_toolkit_nightly-0.58.0.dev1175.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.58.0.dev1175.dist-info/METADATA,sha256=vQyE_Xbm3TYlJUJzcKQTAkpBt2TEgA5sLrNYayfzS_s,1940
-opentf_toolkit_nightly-0.58.0.dev1175.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-opentf_toolkit_nightly-0.58.0.dev1175.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.58.0.dev1175.dist-info/RECORD,,
+opentf_toolkit_nightly-0.58.0.dev1180.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.58.0.dev1180.dist-info/METADATA,sha256=wDWRLuO2YWTW-f40gYSVaGSBBKNw2nssncPMs1wtReo,1940
+opentf_toolkit_nightly-0.58.0.dev1180.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+opentf_toolkit_nightly-0.58.0.dev1180.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.58.0.dev1180.dist-info/RECORD,,