opentf-toolkit-nightly 0.62.0.dev1311__py3-none-any.whl → 0.62.0.dev1317__py3-none-any.whl

opentf/commons/__init__.py

@@ -839,6 +839,8 @@ def validate_inputs(
 
     Non-normalized inputs are removed from the dictionary.
 
+    Choices values are validated.  Types are not checked.
+
     # Required parameters
 
     - declaration: a dictionary
@@ -866,13 +868,19 @@ def validate_inputs(
             if definition.get('required', False):
                 raise ValueError(f'Mandatory input "{key}" not provided.')
             _set_default(inputs, key, definition)
+        if definition.get('type') == 'choice':
+            if inputs.get(key) not in definition['options']:
+                allowed = '", "'.join(sorted(definition['options']))
+                raise ValueError(
+                    f'Invalid value "{inputs.get(key)}" for input "{key}".  Allowed values: "{allowed}".'
+                )
 
     if additional_inputs:
         return
 
     for key in inputs:
         if key not in declaration and key.replace('_', '-') not in declaration:
-            allowed = ', '.join(sorted([f'"{k}"' for k in declaration.keys()]))
+            allowed = '", "'.join(sorted(declaration))
             raise ValueError(
-                f'Unexpected input "{key}" found.  Allowed inputs: {allowed}.'
+                f'Unexpected input "{key}" found.  Allowed inputs: "{allowed}".'
             )

opentf/commons/selectors.py

@@ -172,7 +172,8 @@ def match_selectors(
 
     where `expr` is one of `key`, `!key`, or `key op value`, with
     `op` being one of `=`, `==`, or `!=`.  The
-    `key in (value[, value...])` and `key notin (value[, value...])`
+    `key in (value[, value...])`, `key notin (value[, value...])`,
+    `(value[, value...]) in key` and `(value[, value...]) notin key`
     set-based requirements are also implemented.
 
     # Required parameters

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

@@ -554,6 +554,21 @@
                         "default": {
                             "type": "string"
                         },
+                        "type": {
+                            "enum": [
+                                "string",
+                                "number",
+                                "boolean",
+                                "choice"
+                            ]
+                        },
+                        "options": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            },
+                            "minItems": 1
+                        },
                         "depreciationMessage": {
                             "type": "string"
                         }
@@ -561,6 +576,29 @@
                     "required": [
                         "description"
                     ],
+                    "if": {
+                        "properties": {
+                            "type": {
+                                "const": "choice"
+                            }
+                        },
+                        "required": [
+                            "type"
+                        ]
+
+                    },
+                    "then": {
+                        "required": [
+                            "options"
+                        ]
+                    },
+                    "else": {
+                        "not": {
+                            "required": [
+                                "options"
+                            ]
+                        }
+                    },
                     "additionalProperties": false
                 }
             },

{opentf_toolkit_nightly-0.62.0.dev1311.dist-info → opentf_toolkit_nightly-0.62.0.dev1317.dist-info}/METADATA

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

{opentf_toolkit_nightly-0.62.0.dev1311.dist-info → opentf_toolkit_nightly-0.62.0.dev1317.dist-info}/RECORD

@@ -1,11 +1,11 @@
-opentf/commons/__init__.py,sha256=HvqRbKN7QbHrL4eSNp3q7hdf1OEo4-qvTzwVH_nx5js,26712
+opentf/commons/__init__.py,sha256=965jZDUnSWT8h6Bw283JgNp5mkxzEM0KMkoIwijWXAw,27083
 opentf/commons/auth.py,sha256=gXRp_0Tf3bfd65F4QiQmh6C6vR9y3ugag_0DSvozJFk,15898
 opentf/commons/config.py,sha256=RVSSdQhMle4oCo_z_AR2EQ4U6sUjSxw-qVBtjKuJVfo,10219
 opentf/commons/exceptions.py,sha256=7dhUXO8iyAbqVwlUKxZhgRzGqVcb7LkG39hFlm-VxIA,2407
 opentf/commons/expressions.py,sha256=jM_YKXVOFhvOE2aE2IuacuvxhIsOYTFs2oQkpcbWR6g,19645
 opentf/commons/pubsub.py,sha256=M0bvajR9raUP-xe5mfRjdrweZyHQw1_Qsy56gS-Sck4,7676
 opentf/commons/schemas.py,sha256=u1TdoGFNWoslWV7foBqXPgkGTQtRZWtXTr_PEd_TsFY,5189
-opentf/commons/selectors.py,sha256=R7y1E_5yP1zsz40eNy1buk464SaKVH5dCcRZnEYkdpU,7136
+opentf/commons/selectors.py,sha256=2mmnvfZ13KizBQLsIvHXPU0Qtf6hkIvJpYdejNRszUs,7203
 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
@@ -14,7 +14,7 @@ opentf/schemas/opentestfactory.org/v1/GeneratorResult.json,sha256=sOwieyDWi6UZR7
 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/Subscription.json,sha256=hNaCUW3qSqqa1LY01Ao7kQ8FJhkjkwMrrPf4xihgSt4,7150
-opentf/schemas/opentestfactory.org/v1/Workflow.json,sha256=WAFvCAIxmp22-AN1wPuOkd3BYs8UP5u3hj74NnlO3vU,22945
+opentf/schemas/opentestfactory.org/v1/Workflow.json,sha256=17EE3VgrjSe_nOufJ2UZbgWbOSnK8Yu4TxIoJjGEkF4,24229
 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
@@ -58,8 +58,8 @@ opentf/scripts/startup.py,sha256=AcVXU2auPvqMb_6OpGzkVqrpgYV6vz7x_Rnv8YbAEkk,231
 opentf/toolkit/__init__.py,sha256=xh0XggCuR4jumiYDeMGaklktMmV8_9HAb6K5z1oJzdU,22327
 opentf/toolkit/channels.py,sha256=6qKSsAgq_oJpuDRiKqVUz-EAjdfikcCG3SFAGmKZdhQ,25551
 opentf/toolkit/core.py,sha256=fqnGgaYnuVcd4fyeNIwpc0QtyUo7jsKeVgdkBfY3iqo,9443
-opentf_toolkit_nightly-0.62.0.dev1311.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.62.0.dev1311.dist-info/METADATA,sha256=i_WxoxnBB2QmspW3dzimmGitEDI4dn008lIyif90GiE,2192
-opentf_toolkit_nightly-0.62.0.dev1311.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-opentf_toolkit_nightly-0.62.0.dev1311.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.62.0.dev1311.dist-info/RECORD,,
+opentf_toolkit_nightly-0.62.0.dev1317.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.62.0.dev1317.dist-info/METADATA,sha256=a-uQFxjMjZdzOuib536HCOALi98E_7kQMNMOumpk9eo,2192
+opentf_toolkit_nightly-0.62.0.dev1317.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+opentf_toolkit_nightly-0.62.0.dev1317.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.62.0.dev1317.dist-info/RECORD,,