opentf-toolkit-nightly 0.57.0.dev1118__py3-none-any.whl → 0.57.0.dev1129__py3-none-any.whl

opentf/commons/schemas.py

@@ -44,7 +44,7 @@ WORKFLOWRESULT = 'opentestfactory.org/v1alpha1/WorkflowResult'
 GENERATORCOMMAND = 'opentestfactory.org/v1alpha1/GeneratorCommand'
 GENERATORRESULT = 'opentestfactory.org/v1/GeneratorResult'
 
-PROVIDERCOMMAND = 'opentestfactory.org/v1beta1/ProviderCommand'
+PROVIDERCOMMAND = 'opentestfactory.org/v1/ProviderCommand'
 PROVIDERRESULT = 'opentestfactory.org/v1/ProviderResult'
 
 EXECUTIONCOMMAND = 'opentestfactory.org/v1/ExecutionCommand'

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

@@ -0,0 +1,151 @@
+{
+    "$schema": "https://json-schema.org/draft/2019-09/schema#",
+    "title": "JSON SCHEMA for opentestfactory.org/v1 ProviderCommand manifests",
+    "type": "object",
+    "properties": {
+        "apiVersion": {
+            "const": "opentestfactory.org/v1"
+        },
+        "kind": {
+            "const": "ProviderCommand"
+        },
+        "metadata": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "namespace": {
+                    "type": "string",
+                    "pattern": "^[a-z0-9][a-z0-9-]*$"
+                },
+                "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"
+                    }
+                },
+                "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",
+                "job_id",
+                "job_origin",
+                "step_id",
+                "step_origin"
+            ]
+        },
+        "runs-on": {
+            "$ref": "#/definitions/runs-on-maybe-empty-const-array"
+        },
+        "contexts": {
+            "type": "object"
+        },
+        "step": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "uses": {
+                    "type": "string"
+                },
+                "with": {
+                    "type": "object"
+                },
+                "variables": {
+                    "$ref": "#/definitions/variables"
+                },
+                "timeout-minutes": {
+                    "type": "number"
+                },
+                "continue-on-error": {
+                    "type": "boolean"
+                },
+                "working-directory": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "uses"
+            ],
+            "additionalProperties": false
+        }
+    },
+    "required": [
+        "apiVersion",
+        "kind",
+        "metadata",
+        "runs-on",
+        "step",
+        "contexts"
+    ],
+    "additionalProperties": false,
+    "definitions": {
+        "runs-on-maybe-empty-const-array": {
+            "type": "array",
+            "items": {
+                "type": "string",
+                "pattern": "^[a-zA-Z][a-zA-Z0-9-]*$"
+            },
+            "minItems": 0
+        },
+        "variables": {
+            "type": "object",
+            "patternProperties": {
+                "^[a-zA-Z0-9_]+$": {
+                    "oneOf": [
+                        {
+                            "type": "string"
+                        },
+                        {
+                            "type": "object",
+                            "properties": {
+                                "value": {
+                                    "type": "string"
+                                },
+                                "verbatim": {
+                                    "type": "boolean"
+                                }
+                            },
+                            "required": [
+                                "value"
+                            ],
+                            "additionalProperties": false
+                        }
+                    ]
+                }
+            },
+            "minProperties": 1
+        }
+    }
+}

opentf/toolkit/__init__.py

@@ -18,6 +18,7 @@ from typing import Any, Callable, Dict, Optional, Tuple
 
 import os
 import threading
+import sys
 
 from collections import defaultdict
 from time import sleep
@@ -478,10 +479,23 @@ def _subscribe(
         manifest.get('inputs', {}),
         manifest.get('additionalInputs'),
     )
-    context[OUTPUTS_KEY][(cat_prefix, cat, cat_version)] = {
-        k: v['value'] if isinstance(v, dict) else v
-        for k, v in manifest.get('outputs', {}).items()
-    }
+    try:
+        context[OUTPUTS_KEY][(cat_prefix, cat, cat_version)] = {
+            k: v['value'] if isinstance(v, dict) else v
+            for k, v in manifest.get('outputs', {}).items()
+        }
+    except KeyError as err:
+        plugin.logger.error(
+            "Invalid descriptor 'outputs' section, could not find key %s in: %s.",
+            err,
+            manifest.get('outputs', {}),
+        )
+        sys.exit(2)
+    except Exception as err:
+        plugin.logger.error(
+            "Invalid descriptor 'outputs' section, got %s while parsing outputs.", err
+        )
+        sys.exit(2)
     return subscribe(kind=kind, target='inbox', app=plugin, labels=labels)
 
 

{opentf_toolkit_nightly-0.57.0.dev1118.dist-info → opentf_toolkit_nightly-0.57.0.dev1129.dist-info}/METADATA

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

{opentf_toolkit_nightly-0.57.0.dev1118.dist-info → opentf_toolkit_nightly-0.57.0.dev1129.dist-info}/RECORD

@@ -4,12 +4,13 @@ opentf/commons/config.py,sha256=dyus4K5Zdmcftc3Y9Z1YRkzA1KwiRLHoeAlg2_A49QM,7876
 opentf/commons/datasources.py,sha256=OcwVLPGK0iCnTgHu3RJ9C1U3AUs5LTKvyOTQZFIh7Ek,25996
 opentf/commons/expressions.py,sha256=jM_YKXVOFhvOE2aE2IuacuvxhIsOYTFs2oQkpcbWR6g,19645
 opentf/commons/pubsub.py,sha256=DVrSara5FRfNdPBwXKUkTobqGki0RPDehylTEFcJnFc,7341
-opentf/commons/schemas.py,sha256=QtgVr_I2PAUAAQbutrhZ8y2AM-0w9GOQ6CztxZkkCYw,4265
+opentf/commons/schemas.py,sha256=Ub6klLnDh_O44r0aZzsspMV3sx-An0lClfim1dyASZQ,4260
 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/ProviderCommand.json,sha256=EU4kvEKxlqpH2IkLZ1HdBealuG6C0YzPkAtI7dNrfHg,4427
 opentf/schemas/opentestfactory.org/v1/ProviderResult.json,sha256=Ej4zhCE3rCqCGKcaeAoIHwSJTV_7fw-rAxhJ52qA-Gs,9641
 opentf/schemas/opentestfactory.org/v1/Workflow.json,sha256=WAFvCAIxmp22-AN1wPuOkd3BYs8UP5u3hj74NnlO3vU,22945
 opentf/schemas/opentestfactory.org/v1/WorkflowCanceled.json,sha256=BCWxnm3rt4VWh9GXkIhdNY9JYohFWxi9Wg3JjXIavaU,1694
@@ -52,11 +53,11 @@ opentf/schemas/opentestfactory.org/v1beta1/Workflow.json,sha256=QZ8mM9PhzsI9gTmw
 opentf/schemas/opentestfactory.org/v1beta2/ServiceConfig.json,sha256=rEvK2YWL5lG94_qYgR_GnLWNsaQhaQ-2kuZdWJr5NnY,3517
 opentf/scripts/launch_java_service.sh,sha256=S0jAaCuv2sZy0Gf2NGBuPX-eD531rcM-b0fNyhmzSjw,2423
 opentf/scripts/startup.py,sha256=Da2zo93pBWbdRmj-wgekgLcF94rpNc3ZkbvR8R0w8XY,21279
-opentf/toolkit/__init__.py,sha256=nbllYXON3Rzd-hU7Cred7r4hPaCPbfSJmoY7cQ6RShc,22589
+opentf/toolkit/__init__.py,sha256=mYeJPZ92ulbTBItqEsZgF4nnuRh6G19QPY3Jxc92ifc,23028
 opentf/toolkit/channels.py,sha256=6xcVKHUK2FdyVKIQmPQbakngfVuQDzCcD_lInOdKpro,17171
 opentf/toolkit/core.py,sha256=6nud1vqcfjs9swZu_Z-rbvdbejtrlSjOd8eZXIF0ChE,9795
-opentf_toolkit_nightly-0.57.0.dev1118.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.57.0.dev1118.dist-info/METADATA,sha256=fr_0Yv5d6o47lQMzVuXmoXRs9sfCLFh0nIfG4PcZggM,1946
-opentf_toolkit_nightly-0.57.0.dev1118.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-opentf_toolkit_nightly-0.57.0.dev1118.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.57.0.dev1118.dist-info/RECORD,,
+opentf_toolkit_nightly-0.57.0.dev1129.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.57.0.dev1129.dist-info/METADATA,sha256=tmXgnoeS1Ql8EdjnWk8L0EehqXWtMJHZWFtO0GgJIqk,1946
+opentf_toolkit_nightly-0.57.0.dev1129.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+opentf_toolkit_nightly-0.57.0.dev1129.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.57.0.dev1129.dist-info/RECORD,,