opentf-toolkit-nightly 0.57.0.dev1098__py3-none-any.whl → 0.57.0.dev1102__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_toolkit_nightly-0.57.0.dev1098.dist-info → opentf_toolkit_nightly-0.57.0.dev1102.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opentf-toolkit-nightly
-Version: 0.57.0.dev1098
+Version: 0.57.0.dev1102
 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.dev1102.dist-info}/RECORD

@@ -1,4 +1,4 @@
-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
@@ -54,8 +54,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.dev1102.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.57.0.dev1102.dist-info/METADATA,sha256=VW_IooOM5t5nsVnnYoaURymd7hBOiyx-EKHn0h6Nqdk,1946
+opentf_toolkit_nightly-0.57.0.dev1102.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+opentf_toolkit_nightly-0.57.0.dev1102.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.57.0.dev1102.dist-info/RECORD,,