opentf-toolkit-nightly 0.62.0.dev1330__py3-none-any.whl → 0.62.0.dev1333__py3-none-any.whl

opentf/commons/__init__.py

@@ -830,14 +830,17 @@ def validate_inputs(
     declaration: Dict[str, Dict[str, Any]],
     inputs: Dict[str, Any],
     additional_inputs: bool = False,
+    normalize: bool = True,
 ) -> None:
     """Validate inputs.
 
     Default values are filled in `inputs` as appropriate.
 
-    Input names are normalized to use hyphens instead of underscores.
+    Input names are normalized to use hyphens instead of underscores
+    by default (declaration is expected to be normalized).
 
-    Non-normalized inputs are removed from the dictionary.
+    If `normalize` is set, non-normalized inputs are removed from the
+    dictionary.
 
     Choices values are validated.  Types are not checked.
 
@@ -849,16 +852,14 @@ def validate_inputs(
     # Optional parameters
 
     - additional_inputs: a boolean (False by default)
+    - normalize: a boolean (True by default)
 
     # Raised exceptions
 
     A _ValueError_ exception is raised if inputs do not match
     declaration.
     """
-    for key in declaration:
-        if key.startswith('{'):  # Skip template entries
-            break
-    else:
+    if normalize and not any(key.startswith('{') for key in declaration):
         _normalize_inputs(inputs)
 
     for key, definition in declaration.items():
@@ -868,6 +869,7 @@ def validate_inputs(
             if definition.get('required', False):
                 raise ValueError(f'Mandatory input "{key}" not provided.')
             _set_default(inputs, key, definition)
+            continue
         if definition.get('type') == 'choice':
             if (val := inputs.get(key)) not in definition['options']:
                 allowed = '", "'.join(sorted(definition['options']))
@@ -878,9 +880,9 @@ def validate_inputs(
     if additional_inputs:
         return
 
-    for key in inputs:
-        if key not in declaration and key.replace('_', '-') not in declaration:
-            allowed = '", "'.join(sorted(declaration))
-            raise ValueError(
-                f'Unexpected input "{key}" found.  Allowed inputs: "{allowed}".'
-            )
+    if unexpected := set(inputs) - set(declaration):
+        allowed = '", "'.join(sorted(declaration))
+        unexpected = '", "'.join(sorted(unexpected))
+        raise ValueError(
+            f'Unexpected inputs "{unexpected}" found.  Allowed inputs: "{allowed}".'
+        )

{opentf_toolkit_nightly-0.62.0.dev1330.dist-info → opentf_toolkit_nightly-0.62.0.dev1333.dist-info}/METADATA

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

{opentf_toolkit_nightly-0.62.0.dev1330.dist-info → opentf_toolkit_nightly-0.62.0.dev1333.dist-info}/RECORD

@@ -1,4 +1,4 @@
-opentf/commons/__init__.py,sha256=zyXR1ivlO_PZipQzRA2156qPMA0z7SpeFOOalQ7EG0Y,27075
+opentf/commons/__init__.py,sha256=sa_sDz-XnbmJTqe9E_o6orixV9RoMLm-bqm-A3BRvvc,27210
 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
@@ -59,8 +59,8 @@ opentf/scripts/startup.py,sha256=AcVXU2auPvqMb_6OpGzkVqrpgYV6vz7x_Rnv8YbAEkk,231
 opentf/toolkit/__init__.py,sha256=7MGAfKb5V9ckzWE8ozfj0PcC7g0a-0VfdyrClkWTk38,22319
 opentf/toolkit/channels.py,sha256=6qKSsAgq_oJpuDRiKqVUz-EAjdfikcCG3SFAGmKZdhQ,25551
 opentf/toolkit/core.py,sha256=fqnGgaYnuVcd4fyeNIwpc0QtyUo7jsKeVgdkBfY3iqo,9443
-opentf_toolkit_nightly-0.62.0.dev1330.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.62.0.dev1330.dist-info/METADATA,sha256=IN0fv6k0RErVnPzp5ZrrjdNSvDoyP2vKQIODmDm_dVc,2214
-opentf_toolkit_nightly-0.62.0.dev1330.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-opentf_toolkit_nightly-0.62.0.dev1330.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.62.0.dev1330.dist-info/RECORD,,
+opentf_toolkit_nightly-0.62.0.dev1333.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.62.0.dev1333.dist-info/METADATA,sha256=Fw7qG9XcomeHvCOAz_zt_HxYs3nfs1ObRWYkYLV3ntA,2214
+opentf_toolkit_nightly-0.62.0.dev1333.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+opentf_toolkit_nightly-0.62.0.dev1333.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.62.0.dev1333.dist-info/RECORD,,