opentf-toolkit-nightly 0.59.0.dev1182__py3-none-any.whl → 0.59.0.dev1200__py3-none-any.whl

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

@@ -0,0 +1,132 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema#",
+    "title": "JSON SCHEMA for opentestfactory.org/v1 ExecutionResult manifests",
+    "type": "object",
+    "properties": {
+        "apiVersion": {
+            "const": "opentestfactory.org/v1"
+        },
+        "kind": {
+            "const": "ExecutionResult"
+        },
+        "metadata": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "workflow_id": {
+                    "type": "string"
+                },
+                "job_id": {
+                    "type": "string"
+                },
+                "job_origin": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "step_id": {
+                    "type": "string"
+                },
+                "step_origin": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "step_origin_status": {
+                    "type": "object",
+                    "patternProperties": {
+                        "^[a-zA-Z0-9-]+$": {
+                            "type": "number"
+                        }
+                    }
+                },
+                "step_sequence_id": {
+                    "type": "number"
+                },
+                "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
+                },
+                "attachments": {
+                    "type": "object",
+                    "minProperties": 1
+                }
+            },
+            "additionalProperties": true,
+            "required": [
+                "name",
+                "workflow_id",
+                "job_id",
+                "step_id",
+                "step_sequence_id"
+            ]
+        },
+        "attachments": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            },
+            "minItems": 1
+        },
+        "outputs": {
+            "type": "object",
+            "patternProperties": {
+                "^[a-zA-Z_][a-zA-Z0-9_-]+$": {
+                    "type": "string"
+                }
+            },
+            "minProperties": 1,
+            "additionalProperties": false
+        },
+        "logs": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "status": {
+            "type": "number"
+        },
+        "variables": {
+            "type": "object",
+            "patternProperties": {
+                "^[a-zA-Z0-9_]+$": {
+                    "oneOf": [
+                        {
+                            "type": "string"
+                        },
+                        {
+                            "type": "object",
+                            "properties": {
+                                "value": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "value"
+                            ],
+                            "additionalProperties": false
+                        }
+                    ]
+                }
+            },
+            "minProperties": 1
+        }
+    },
+    "required": [
+        "apiVersion",
+        "kind",
+        "metadata"
+    ],
+    "additionalProperties": false
+}

opentf/schemas/opentestfactory.org/v1alpha1/ExecutionResult.json

@@ -96,6 +96,31 @@
         },
         "status": {
             "type": "number"
+        },
+        "variables": {
+            "type": "object",
+            "patternProperties": {
+                "^[a-zA-Z0-9_]+$": {
+                    "oneOf": [
+                        {
+                            "type": "string"
+                        },
+                        {
+                            "type": "object",
+                            "properties": {
+                                "value": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "value"
+                            ],
+                            "additionalProperties": false
+                        }
+                    ]
+                }
+            },
+            "minProperties": 1
         }
     },
     "required": [

opentf/toolkit/channels.py

@@ -127,6 +127,8 @@ REMOVE_WORKSPACE = 2
 MOVE_TO_WORKSPACE = 3
 
 HOOKS_ANNOTATIONS = 'opentestfactory.org/hooks'
+OPENTF_VARIABLES_TYPE = 'application/vnd.opentestfactory.opentf-variables'
+OPENTF_VARIABLES_REGEX = re.compile(r'^(export|set)\s(\"?.+)$')
 
 ## os helpers
 
@@ -219,6 +221,40 @@ def _as_log(line: str, jobstate: JobState):
     return mask(line, jobstate).rstrip()
 
 
+def _get_opentf_variables(path: str):
+    variables = {}
+    with open(path, 'r') as f:
+        content = f.readlines()
+        for line in content:
+            if '=' not in line:
+                continue
+            line = line.strip()
+            if set_export := OPENTF_VARIABLES_REGEX.match(line):
+                expr = set_export.group(2)
+                if expr.startswith('"'):
+                    expr = expr[1:-1]
+                key, _, value = expr.partition('=')
+            else:
+                key, _, value = line.partition('=')
+            variables[key] = value
+    return variables
+
+
+def process_opentf_variables(result: Dict[str, Any]):
+    if attachments := result['metadata'].get('attachments'):
+        variables = {}
+        for path, data in attachments.copy().items():
+            if data.get('type') == OPENTF_VARIABLES_TYPE:
+                variables = _get_opentf_variables(path)
+                del result['metadata']['attachments'][path]
+                result['attachments'].remove(path)
+                if not result['metadata']['attachments']:
+                    del result['metadata']['attachments']
+                if not result['attachments']:
+                    del result['attachments']
+        result['variables'] = variables
+
+
 def process_upload(result: Dict[str, Any]):
     """Process ExecutionResult event containing .metadata.upload flag.
 
@@ -394,6 +430,17 @@ 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':
@@ -465,10 +512,18 @@ def _make_prolog(
     script: List[str],
     command: Dict[str, Any],
 ) -> None:
+    local_variables_names = (
+        command['metadata'].get('annotations', {}).get('local_variables_names', [])
+    )
     for name, value in command.get('variables', {}).items():
-        script.append(VARIABLE_MAKER[runner_os](name, value))
+        if name not in local_variables_names:
+            script.append(VARIABLE_MAKER[runner_os](name, value))
 
     script.append(PROLOG_SCRIPTS[runner_os][LOAD_VARIABLES])
+    for name, value in command.get('variables', {}).items():
+        if name in local_variables_names:
+            script.append(VARIABLE_MAKER[runner_os](name, value))
+
     if step_sequence_id == CHANNEL_RELEASE:
         # on windows, the script ends if it is removed, so script
         # removal should be the last operation
@@ -570,6 +625,7 @@ 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/core.py

@@ -280,12 +280,15 @@ def export_variables(*args, verbatim: bool = False) -> List[Dict[str, str]]:
 
     Returns a list of steps.
     """
-    return [
-        {'run': export_variable(name, value, verbatim)}
-        for var_dict in args
-        if var_dict
-        for name, value in var_dict.items()
-    ]
+    exports = '\n'.join(
+        (
+            export_variable(name, value, verbatim)
+            for var_dict in args
+            if var_dict
+            for name, value in var_dict.items()
+        )
+    )
+    return [{'run': exports}] if exports else []
 
 
 def validate_params_inputs(inputs: Dict[str, Any]):

{opentf_toolkit_nightly-0.59.0.dev1182.dist-info → opentf_toolkit_nightly-0.59.0.dev1200.dist-info}/METADATA

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

{opentf_toolkit_nightly-0.59.0.dev1182.dist-info → opentf_toolkit_nightly-0.59.0.dev1200.dist-info}/RECORD

@@ -9,6 +9,7 @@ opentf/commons/selectors.py,sha256=DEpLgRAr5HXSpSYI4liXP2hLUTvOSexFa9Vfa1xIQTk,7
 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
+opentf/schemas/opentestfactory.org/v1/ExecutionResult.json,sha256=Etws3d5Ph6dYjQnBqNefLVFnDTYajcKFEbgXFSdD-Ks,3863
 opentf/schemas/opentestfactory.org/v1/GeneratorResult.json,sha256=sOwieyDWi6UZR7X29R9IjOR87ruSRQ4U6CM2_yT81Zk,16607
 opentf/schemas/opentestfactory.org/v1/ProviderCommand.json,sha256=EU4kvEKxlqpH2IkLZ1HdBealuG6C0YzPkAtI7dNrfHg,4427
 opentf/schemas/opentestfactory.org/v1/ProviderResult.json,sha256=Ej4zhCE3rCqCGKcaeAoIHwSJTV_7fw-rAxhJ52qA-Gs,9641
@@ -23,7 +24,7 @@ opentf/schemas/opentestfactory.org/v1alpha1/ChannelHandlerHooks.json,sha256=6K6m
 opentf/schemas/opentestfactory.org/v1alpha1/EventBusConfig.json,sha256=2aIYtA07qRoauKNy-MH25Kzg1l1Q1fjY9_4YIvlyYgw,2174
 opentf/schemas/opentestfactory.org/v1alpha1/ExecutionCommand.json,sha256=Tsqy0imNqO6Qg6B_Yw-4OeNer3xpURv-ZDaYUoZ-l1c,2702
 opentf/schemas/opentestfactory.org/v1alpha1/ExecutionError.json,sha256=tz8ZggvjSkP2S9ln77Js03LkTnMCTuRVkC1Z3w8uI8k,1347
-opentf/schemas/opentestfactory.org/v1alpha1/ExecutionResult.json,sha256=aF9PbJADupP_m_TfNRqpeayi1_nCj5Ll2_vDCcJWMkY,3050
+opentf/schemas/opentestfactory.org/v1alpha1/ExecutionResult.json,sha256=kG-oXCVoHb0b72aYK7HR1OEFJrIKfMtWREfffqDFpYU,3875
 opentf/schemas/opentestfactory.org/v1alpha1/GeneratorCommand.json,sha256=uxbqDhP4newgz-85TnGKbchx448QEQ8WB5PXpcJy2ME,1754
 opentf/schemas/opentestfactory.org/v1alpha1/GeneratorResult.json,sha256=LkHLGt2uam1Q5Ux0zP_O9oFgxBMCjD3Th3BsfsXxd1g,6633
 opentf/schemas/opentestfactory.org/v1alpha1/InsightCollector.json,sha256=emE0My2cYBRnfA8L3_eY8yOXbSErV4TlwmQbRCgT4O8,16770
@@ -55,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=DUP3tBSp7sjq49SwglobG92MO2zX0vdiHGYx0ms30yA,19182
-opentf/toolkit/core.py,sha256=6nud1vqcfjs9swZu_Z-rbvdbejtrlSjOd8eZXIF0ChE,9795
-opentf_toolkit_nightly-0.59.0.dev1182.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.59.0.dev1182.dist-info/METADATA,sha256=Dd-nF6wo8BrUI89OeoSaZhUJPVW_KRzgzAvkF8ZNctE,1940
-opentf_toolkit_nightly-0.59.0.dev1182.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-opentf_toolkit_nightly-0.59.0.dev1182.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.59.0.dev1182.dist-info/RECORD,,
+opentf/toolkit/channels.py,sha256=Whbt1nClU2QjKi-3DQE0rHa9yyFkdrLLJ-htyltg6qE,21385
+opentf/toolkit/core.py,sha256=cscUkwdwvLkerqMRL05dgtKJ42QbBQQc28kRBiyZM9o,9883
+opentf_toolkit_nightly-0.59.0.dev1200.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.59.0.dev1200.dist-info/METADATA,sha256=JZPw_iSlLF4A2gYG4WyWhlHqZU_CmoLf6--KyuvQsII,1940
+opentf_toolkit_nightly-0.59.0.dev1200.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+opentf_toolkit_nightly-0.59.0.dev1200.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.59.0.dev1200.dist-info/RECORD,,

{opentf_toolkit_nightly-0.59.0.dev1182.dist-info → opentf_toolkit_nightly-0.59.0.dev1200.dist-info}/WHEEL

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