opentf-toolkit-nightly 0.57.0.dev1098__py3-none-any.whl → 0.57.0.dev1106__py3-none-any.whl

opentf/commons/__init__.py

@@ -448,13 +448,24 @@ def make_app(
 
 
 def get_context_parameter(
-    app: Flask, name: str, validator: Optional[Any] = None
+    app: Flask,
+    name: str,
+    validator: Optional[Any] = None,
+    default: Optional[Any] = None,
 ) -> Any:
     """Get an integer parameter from configuration context.
 
     Exits with an error code of 2 if the parameter is not properly
     valued or is not defined.
 
+    Resolution order:
+
+    - `{app.name.upper()}_{name.upper()}` environment variable
+    - `{name.upper()}` environment variable (if spec is shared)
+    - `name` in configuration context
+    - `spec['default']` if spec defines a default value
+    - `default` if not None
+
     # Required parameters
 
     - app: a Flask object
@@ -463,6 +474,7 @@ def get_context_parameter(
     # Optional parameters
 
     - validator: a function of two arguments or None (None by default)
+    - default: any value or None (None by default)
 
     # Returned value
 
@@ -484,15 +496,19 @@ def get_context_parameter(
         sys.exit(2)
 
     spec = _get_contextparameter_spec(app, name)
-    if name not in app.config['CONTEXT']:
+    val = os.environ.get(name.upper()) if spec and spec.get('shared') else None
+    val = os.environ.get(f'{app.name.upper()}_{name.upper()}', val)
+    if val is None and name not in app.config['CONTEXT']:
         if spec and 'default' in spec:
             return _maybe_validate(spec['default'])
+        if default is not None:
+            return _maybe_validate(default)
         _fatal(
             'Context parameter %s not in current context and no default value specified.',
             name,
         )
 
-    val = app.config['CONTEXT'][name]
+    val = val if val is not None else app.config['CONTEXT'][name]
     if not spec:
         return _maybe_validate(val)
     if spec.get('type') == 'int':

opentf/commons/schemas.py

@@ -36,6 +36,7 @@ PROVIDERCONFIG = 'opentestfactory.org/v1beta1/ProviderConfig'
 SUBSCRIPTION = 'opentestfactory.org/v1alpha1/Subscription'
 
 WORKFLOW = 'opentestfactory.org/v1/Workflow'
+WORKFLOWCANCELLATION = 'opentestfactory.org/v1/WorkflowCancellation'
 WORKFLOWCOMPLETED = 'opentestfactory.org/v1/WorkflowCompleted'
 WORKFLOWCANCELED = 'opentestfactory.org/v1/WorkflowCanceled'
 WORKFLOWRESULT = 'opentestfactory.org/v1alpha1/WorkflowResult'
@@ -63,6 +64,7 @@ RETENTION_POLICY = 'opentestfactory.org/v1alpha1/RetentionPolicy'
 TRACKER_PUBLISHER = 'opentestfactory.org/v1alpha1/TrackerPublisher'
 INSIGHT_COLLECTOR = 'opentestfactory.org/v1alpha1/InsightCollector'
 
+
 ########################################################################
 # JSON Schema Helpers
 

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

@@ -139,17 +139,32 @@
                 {
                     "required": [
                         "generator"
-                    ]
+                    ],
+                    "not": {
+                        "required": [
+                            "outputs"
+                        ]
+                    }
                 },
                 {
                     "required": [
                         "uses"
-                    ]
+                    ],
+                    "not": {
+                        "required": [
+                            "outputs"
+                        ]
+                    }
                 },
                 {
                     "required": [
                         "jobs"
-                    ]
+                    ],
+                    "not": {
+                        "required": [
+                            "with"
+                        ]
+                    }
                 }
             ],
             "additionalProperties": false

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

@@ -0,0 +1,70 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema#",
+    "title": "JSON SCHEMA for opentestfactory.org/v1 WorkflowCancellation manifests",
+    "type": "object",
+    "properties": {
+        "apiVersion": {
+            "const": "opentestfactory.org/v1"
+        },
+        "kind": {
+            "const": "WorkflowCancellation"
+        },
+        "metadata": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "namespace": {
+                    "type": "string",
+                    "pattern": "^[a-z0-9][a-z0-9-]*$"
+                },
+                "workflow_id": {
+                    "type": "string"
+                },
+                "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
+                }
+            },
+            "additionalProperties": true,
+            "required": [
+                "name",
+                "workflow_id"
+            ]
+        },
+        "details": {
+            "type": "object",
+            "properties": {
+                "reason": {
+                    "type": "string"
+                },
+                "source": {
+                    "type": "string"
+                }
+            },
+            "patternProperties": {
+                "^.*\\..*$": {
+                    "type": [
+                        "string",
+                        "array",
+                        "object"
+                    ]
+                }
+            },
+            "additionalProperties": false
+        }
+    },
+    "required": [
+        "apiVersion",
+        "kind",
+        "metadata"
+    ],
+    "additionalProperties": false
+}

{opentf_toolkit_nightly-0.57.0.dev1098.dist-info → opentf_toolkit_nightly-0.57.0.dev1106.dist-info}/METADATA

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

{opentf_toolkit_nightly-0.57.0.dev1098.dist-info → opentf_toolkit_nightly-0.57.0.dev1106.dist-info}/RECORD

@@ -1,18 +1,19 @@
-opentf/commons/__init__.py,sha256=pHeXaleOQxz0b0Ds8zIvMu2COi7jYuj6dNne08o0UU0,22092
+opentf/commons/__init__.py,sha256=3gZyXpN2Dmpkn-MRE_Ns1kYHiGyQfXQ8YF25fErVXwE,22728
 opentf/commons/auth.py,sha256=bM2Z3kxm2Wku1lKXaRAIg37LHvXWAXIZIqjplDfN2P8,15899
 opentf/commons/config.py,sha256=dyus4K5Zdmcftc3Y9Z1YRkzA1KwiRLHoeAlg2_A49QM,7876
 opentf/commons/datasources.py,sha256=lIQf81riLHWYj1bG0Mxez7rf9cxSL50NVOf2bmKkWT4,26032
 opentf/commons/expressions.py,sha256=jM_YKXVOFhvOE2aE2IuacuvxhIsOYTFs2oQkpcbWR6g,19645
 opentf/commons/pubsub.py,sha256=DVrSara5FRfNdPBwXKUkTobqGki0RPDehylTEFcJnFc,7341
-opentf/commons/schemas.py,sha256=C4DE5LXTMTLHTiLGhcwtS-8za8d9ZgkMPiA9PDLpAJ4,4195
+opentf/commons/schemas.py,sha256=QtgVr_I2PAUAAQbutrhZ8y2AM-0w9GOQ6CztxZkkCYw,4265
 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/ExecutionCommand.json,sha256=UtmAlTaYdPSZDeQnx-ocX8IonyEPWoNmgDkHwQwQxWE,4126
 opentf/schemas/opentestfactory.org/v1/GeneratorResult.json,sha256=neoFocJGkVTQQPtnG5xnbqNLX8ivFBJbanbbPweId7s,16608
 opentf/schemas/opentestfactory.org/v1/ProviderResult.json,sha256=Ej4zhCE3rCqCGKcaeAoIHwSJTV_7fw-rAxhJ52qA-Gs,9641
-opentf/schemas/opentestfactory.org/v1/Workflow.json,sha256=mpWxJfP3aV3sYzVxxWOivD55Top4J5WXTTKBzp7gjIw,22486
+opentf/schemas/opentestfactory.org/v1/Workflow.json,sha256=WAFvCAIxmp22-AN1wPuOkd3BYs8UP5u3hj74NnlO3vU,22945
 opentf/schemas/opentestfactory.org/v1/WorkflowCanceled.json,sha256=BCWxnm3rt4VWh9GXkIhdNY9JYohFWxi9Wg3JjXIavaU,1694
+opentf/schemas/opentestfactory.org/v1/WorkflowCancellation.json,sha256=HAtc8xjrr-WwXwIck9B86BrHELkCb1oPYhTsRzHMMOE,1993
 opentf/schemas/opentestfactory.org/v1/WorkflowCompleted.json,sha256=KtC9-oeaBNM3D60SFpmYnLMtqewUAGRoOJfVzb7CdHg,1635
 opentf/schemas/opentestfactory.org/v1alpha1/AgentRegistration.json,sha256=NQykqU-lKE8LtBhBiFUcpVJq00MRG6dZsoM1xedx6uQ,1230
 opentf/schemas/opentestfactory.org/v1alpha1/AllureCollectorOutput.json,sha256=-L9DDWA0A4x54bPMn4m6Qwi2tf2nHvzIPFOElTjaVck,1366
@@ -54,8 +55,8 @@ opentf/scripts/startup.py,sha256=Da2zo93pBWbdRmj-wgekgLcF94rpNc3ZkbvR8R0w8XY,212
 opentf/toolkit/__init__.py,sha256=nbllYXON3Rzd-hU7Cred7r4hPaCPbfSJmoY7cQ6RShc,22589
 opentf/toolkit/channels.py,sha256=6xcVKHUK2FdyVKIQmPQbakngfVuQDzCcD_lInOdKpro,17171
 opentf/toolkit/core.py,sha256=6nud1vqcfjs9swZu_Z-rbvdbejtrlSjOd8eZXIF0ChE,9795
-opentf_toolkit_nightly-0.57.0.dev1098.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.57.0.dev1098.dist-info/METADATA,sha256=uPhQAxjwlGe5OUfel_BAR_JEbwnkreTZzEpleEdePxM,1946
-opentf_toolkit_nightly-0.57.0.dev1098.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-opentf_toolkit_nightly-0.57.0.dev1098.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.57.0.dev1098.dist-info/RECORD,,
+opentf_toolkit_nightly-0.57.0.dev1106.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.57.0.dev1106.dist-info/METADATA,sha256=cvfIn7vsCaFTCwbtH9WAQY6LzB5b9B_2p0bRoTEdEmA,1946
+opentf_toolkit_nightly-0.57.0.dev1106.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+opentf_toolkit_nightly-0.57.0.dev1106.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.57.0.dev1106.dist-info/RECORD,,