opentf-toolkit-nightly 0.56.0.dev1005__py3-none-any.whl → 0.56.0.dev1011__py3-none-any.whl

opentf/commons/expressions.py

@@ -387,26 +387,14 @@ def evaluate_status_function(name: str, contexts) -> bool:
     """Evaluate job status function.
 
     Annotates the contexts[SPECIAL_FUNCTIONS] entry with a `__called__`
-    sub-entry if appropriate, so that caller can detect status function
-    usage.
+    sub-entry, so that caller can detect status function usage.
     """
-    if name not in ('always', 'success', 'failure', 'cancelled'):
+    funcs = contexts.get(SPECIAL_FUNCTIONS, {})
+    if name not in funcs:
         raise ValueError(f'Unknown function {name}()')
     # a status function has been used
-    if SPECIAL_FUNCTIONS in contexts:
-        contexts[SPECIAL_FUNCTIONS]['__called__'] = True
-    if name == 'always':
-        return True
-    if external_functions := contexts.get(SPECIAL_FUNCTIONS):
-        if name in external_functions:
-            return external_functions[name]
-        raise ValueError(f'Unknown function {name}()')
-    if name == 'success':
-        return contexts['job']['status'] == 'success'
-    if name == 'failure':
-        return contexts['job']['status'] == 'failure'
-    if name == 'cancelled':
-        return contexts['job']['status'] == 'cancelled'
+    funcs['__called__'] = True
+    return funcs[name]
 
 
 def _evaluate_identifier(
@@ -648,11 +636,18 @@ def evaluate_bool(expr: str, contexts, special_functions=None) -> bool:
 
     `expr` may be surrounded by `${{` and `}}`.
 
+    `special_functions`, if provided, is a dictionary of function names
+    to bools.
+
     # Required parameters
 
     - expr: a string
     - contexts: a dictionary
 
+    # Optional parameters
+
+    - special_functions: a dictionary or None (None by default)
+
     # Returned value
 
     A boolean.

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

@@ -531,22 +531,29 @@
             "type": "object",
             "patternProperties": {
                 "^[a-zA-Z_][a-zA-Z0-9_-]*$": {
-                    "type": "object",
-                    "properties": {
-                        "description": {
-                            "type": "string"
+                    "oneOf": [
+                        {
+                            "type": "object",
+                            "properties": {
+                                "description": {
+                                    "type": "string"
+                                },
+                                "value": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "value"
+                            ],
+                            "additionalProperties": false
                         },
-                        "value": {
+                        {
                             "type": "string"
                         }
-                    },
-                    "required": [
-                        "value"
-                    ],
-                    "additionalProperties": false
-                }
-            },
-            "minProperties": 1
+                    ]
+                },
+                "minProperties": 1
+            }
         },
         "resources": {
             "type": "object",
@@ -628,4 +635,4 @@
             }
         }
     }
-}
+}

{opentf_toolkit_nightly-0.56.0.dev1005.dist-info → opentf_toolkit_nightly-0.56.0.dev1011.dist-info}/METADATA

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

{opentf_toolkit_nightly-0.56.0.dev1005.dist-info → opentf_toolkit_nightly-0.56.0.dev1011.dist-info}/RECORD

@@ -2,13 +2,13 @@ opentf/commons/__init__.py,sha256=KRY8ShQw_0ZZ0oEOiKi4-xnWofE_QsFjEe1T8wUxJ-w,21
 opentf/commons/auth.py,sha256=bM2Z3kxm2Wku1lKXaRAIg37LHvXWAXIZIqjplDfN2P8,15899
 opentf/commons/config.py,sha256=GmvInVnUsXIwlNfgTQeQ_pPs97GeGTGn2S2QZEFwss8,7828
 opentf/commons/datasources.py,sha256=4ye-TMtaE88O8GVcWx-FtKXOC8aIZLteR6wfIr7Do8U,25232
-opentf/commons/expressions.py,sha256=973wiKlM0jcKf4nQpVRtZ7F0-ORHQn1TY_4rVGtNZXc,20007
+opentf/commons/expressions.py,sha256=jM_YKXVOFhvOE2aE2IuacuvxhIsOYTFs2oQkpcbWR6g,19645
 opentf/commons/pubsub.py,sha256=7khxAHVZiwJRcwIBJ6MPR-f3xY9144-2eNLROwq5F-4,5894
 opentf/commons/schemas.py,sha256=YSCvlmqc7satt-OqIoYXnmhOyo9h8wIpNyKaBAY4u9c,4039
 opentf/commons/selectors.py,sha256=DEpLgRAr5HXSpSYI4liXP2hLUTvOSexFa9Vfa1xIQTk,7134
 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/Workflow.json,sha256=FEPqeeUeBfPPyaDAceqhj3XP8j8VVqHAvKHvp3KAl3I,21459
+opentf/schemas/opentestfactory.org/v1/Workflow.json,sha256=CBMVP_6xD3Iffep9db0R_-i3kV7f5Lk_tjPOljyjrmw,21769
 opentf/schemas/opentestfactory.org/v1alpha1/AgentRegistration.json,sha256=NQykqU-lKE8LtBhBiFUcpVJq00MRG6dZsoM1xedx6uQ,1230
 opentf/schemas/opentestfactory.org/v1alpha1/AllureCollectorOutput.json,sha256=-L9DDWA0A4x54bPMn4m6Qwi2tf2nHvzIPFOElTjaVck,1366
 opentf/schemas/opentestfactory.org/v1alpha1/ChannelHandlerHooks.json,sha256=6K6m9praw_f2biCMHfTsHPYia5z2jq10dciRLqf3ogI,1239
@@ -49,8 +49,8 @@ opentf/scripts/startup.py,sha256=Da2zo93pBWbdRmj-wgekgLcF94rpNc3ZkbvR8R0w8XY,212
 opentf/toolkit/__init__.py,sha256=icNo_jz2IfhwddunQpfq6F-0xeKS70S-0Or5zJliEZs,21692
 opentf/toolkit/channels.py,sha256=6xcVKHUK2FdyVKIQmPQbakngfVuQDzCcD_lInOdKpro,17171
 opentf/toolkit/core.py,sha256=MvvWUrS4dvo3Qrd_Yl9uND3CllL0qtMi-y1S-Na1uQs,9621
-opentf_toolkit_nightly-0.56.0.dev1005.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.56.0.dev1005.dist-info/METADATA,sha256=Q_gf0f6Sl_vQPx2ykXg2s1zGIuLueSg3PfcApGwlh_0,1946
-opentf_toolkit_nightly-0.56.0.dev1005.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-opentf_toolkit_nightly-0.56.0.dev1005.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.56.0.dev1005.dist-info/RECORD,,
+opentf_toolkit_nightly-0.56.0.dev1011.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.56.0.dev1011.dist-info/METADATA,sha256=9MI2DUIbZhJadrqfmuHfsqeVRaCxrUreUM7Pedu2_iA,1946
+opentf_toolkit_nightly-0.56.0.dev1011.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+opentf_toolkit_nightly-0.56.0.dev1011.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.56.0.dev1011.dist-info/RECORD,,