opentf-toolkit-nightly 0.63.0.dev1393__py3-none-any.whl → 0.63.0.dev1404__py3-none-any.whl

opentf/scripts/startup.py

@@ -14,7 +14,7 @@
 
 """Startup script for allinone images."""
 
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any, Dict, List, Optional, Set, Tuple, Union
 
 from datetime import datetime
 from importlib.metadata import version
@@ -64,6 +64,7 @@ ENVIRONMENT_VARIABLES = {
     'OPENTF_BASE_URL': None,
     'OPENTF_CONTEXT': 'allinone',
     'OPENTF_DEBUG': 'INFO',
+    'OPENTF_DISABLED_PLUGINS': None,
     'OPENTF_EVENTBUS_WARMUPDELAY': 2,
     'OPENTF_EVENTBUS_WARMUPURL': 'http://127.0.0.1:38368/subscriptions',
     'OPENTF_EVENTBUSCONFIG': 'conf/eventbus.yaml',
@@ -220,7 +221,7 @@ SERVICES = set()
 
 
 def parse_and_start(
-    paths: List[str], item: str, disabled: Optional[List[str]] = None
+    paths: List[str], item: str, disabled: Optional[Set[str]] = None
 ) -> List[Any]:
     """Lookup item manifests and start them if not disabled."""
     result = []
@@ -301,7 +302,7 @@ def maybe_start_otelcol():
                 else ''
             )
             cmd = '"/usr/local/bin/otelcol --config=file:/app/otelcol-config.yaml $OTELCOL_EXTRA_OPTIONS"'
-            logging.info(f'Starting OpenTelemetry Collector{options_msg}...')
+            logging.info('Starting OpenTelemetry Collector%s...', options_msg)
             pid = subprocess.Popen(f'sh -c {cmd}', shell=True)
             logging.debug('(pid is %d.)', pid.pid)
             return [pid]
@@ -389,17 +390,17 @@ def start_services(conf: Dict[str, Any]) -> List[Any]:
 
 def start_plugins(conf: Dict[str, Any]) -> List[Any]:
     """Lookup plugins and start them."""
-    if disabled := conf.get('disabled'):
-        disabled = [plugin.lower() for plugin in disabled]
-    else:
-        disabled = []
+    disabled = set(conf.get('disabled', {}))
     if (v := _get_env('OPENTF_ALLURE_ENABLED')) is None or (
         v.lower() not in ('true', 'yes', 'on', '1')
     ):
-        disabled.append('allure.collector')
-        disabled.append('result.aggregator')
+        disabled.add('allure.collector')
+        disabled.add('result.aggregator')
+    if v := _get_env('OPENTF_DISABLED_PLUGINS'):
+        disabled |= set(v.split(','))
     if aggregated := conf.get('aggregated'):
-        disabled += [plugin.lower() for plugin in aggregated]
+        disabled |= set(aggregated)
+    disabled = {plugin.strip().lower() for plugin in disabled if plugin.strip()}
     plugins = []
     for entry in conf['plugins']:
         plugins += parse_and_start(_expand(entry), PLUGIN_DESCRIPTOR, disabled)
@@ -523,10 +524,10 @@ def _ensure_abac_if_defined(name, value):
     if value:
         if not OPENTF_AUTHORIZATION_MODE:
             logging.error(
-                '{0} is defined but OPENTF_AUTHORIZATION_MODE is undefined.'
-                '  OPENTF_AUTHORIZATION_MODE must include "ABAC" to use {0}.'.format(
-                    name
-                )
+                '%s is defined but OPENTF_AUTHORIZATION_MODE is undefined.'
+                '  OPENTF_AUTHORIZATION_MODE must include "ABAC" to use %s.',
+                name,
+                name,
             )
             sys.exit(1)
         if 'ABAC' not in OPENTF_AUTHORIZATION_MODE.split(','):

opentf/toolkit/channels.py

@@ -210,26 +210,31 @@ def _add_default_variables(
     script.append(VARIABLE_MAKER[runner_os]('CI', 'true'))
 
 
-def _get_opentf_variables_path(metadata: Dict[str, Any]) -> str:
+def get_opentf_variables_path(metadata: Dict[str, Any]) -> str:
     return VARIABLES_TEMPLATE[metadata['channel_os']].format(
         job_id=metadata['job_id'], root=metadata['channel_temp']
     )
 
 
-def _get_opentf_variables(path: str) -> Dict[str, str]:
+def _read_opentf_variables(lines: List[str]) -> Dict[str, str]:
     variables = {}
+    for line in lines:
+        if '=' not in line:
+            continue
+        line = line.strip()
+        if set_export := OPENTF_VARIABLES_REGEX.match(line):
+            line = set_export.group(2)
+            if line.startswith('"'):
+                line = line[1:-1]
+        key, _, value = line.partition('=')
+        if OPENTF_VARIABLES_NAME_REGEX.match(key):
+            variables[key] = value
+    return variables
+
+
+def _get_opentf_variables(path: str) -> Dict[str, str]:
     with open(path, 'r') as f:
-        for line in f.readlines():
-            if '=' not in line:
-                continue
-            line = line.strip()
-            if set_export := OPENTF_VARIABLES_REGEX.match(line):
-                line = set_export.group(2)
-                if line.startswith('"'):
-                    line = line[1:-1]
-            key, _, value = line.partition('=')
-            if OPENTF_VARIABLES_NAME_REGEX.match(key):
-                variables[key] = value
+        variables = _read_opentf_variables(f.readlines())
     try:
         os.remove(path)
     except FileNotFoundError:
@@ -428,6 +433,7 @@ def process_output(
     jobstate: JobState,
     _get: Callable[[str, str], None],
     _put: Callable[[str, str], None],
+    variables: Optional[List[str]] = None,
 ) -> Dict[str, Any]:
     """Process output, filling structures.
 
@@ -566,8 +572,14 @@ def process_output(
     if metadata.get('artifacts'):
         del metadata['artifacts']
 
+    opentf_variables = None
     if metadata['step_sequence_id'] != CHANNEL_RELEASE:
-        _attach(_get_opentf_variables_path(metadata), f'type={OPENTF_VARIABLES_TYPE}')
+        if variables:
+            opentf_variables = _read_opentf_variables(variables)
+        else:
+            _attach(
+                get_opentf_variables_path(metadata), f'type={OPENTF_VARIABLES_TYPE}'
+            )
 
     result = make_event(EXECUTIONRESULT, metadata=metadata, status=resp)
     if outputs:
@@ -579,7 +591,8 @@ def process_output(
         result['metadata']['attachments'] = attachments_metadata
     if has_artifacts:
         result['metadata']['upload'] = resp
-
+    if opentf_variables:
+        result['variables'] = opentf_variables
     return result
 
 

{opentf_toolkit_nightly-0.63.0.dev1393.dist-info → opentf_toolkit_nightly-0.63.0.dev1404.dist-info}/METADATA

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

{opentf_toolkit_nightly-0.63.0.dev1393.dist-info → opentf_toolkit_nightly-0.63.0.dev1404.dist-info}/RECORD

@@ -56,13 +56,13 @@ opentf/schemas/opentestfactory.org/v1beta1/ServiceConfig.json,sha256=m5ZgWAKbutu
 opentf/schemas/opentestfactory.org/v1beta1/Workflow.json,sha256=QZ8mM9PhzsI9gTmwmKTWYNoRn--rtcM3L0PzgnPBfMU,15424
 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=K-uW-70EJb4Ou2dBFR_7utDU3oMWBczkomtikq_2qCc,23119
+opentf/scripts/startup.py,sha256=DLanDaXutUTYcG2PwoJ34QH-5G0TwfLUY_xy1VkVOqA,23202
 opentf/toolkit/__init__.py,sha256=YnH66dmePAIU7dq_xWFYTIEUrsL9qV9f82LRDiBzbzs,22057
-opentf/toolkit/channels.py,sha256=oXZzW5bwcnGbJ7WAIkV42ekFnOQq7HxIvnyvURWaoNs,25904
+opentf/toolkit/channels.py,sha256=7uHpQUCWCzSxcQifeUL9SB9fvsq6_9cZt_8IdBgw8FQ,26272
 opentf/toolkit/core.py,sha256=jMBDIYZ8Qn3BvsysfKoG0iTtjOnZsggetpH3eXygCsI,9636
 opentf/toolkit/models.py,sha256=PNfXVQbeyOwDfaNrLjcfhYm6duMSlNWBtZsWZcs53ag,6583
-opentf_toolkit_nightly-0.63.0.dev1393.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.63.0.dev1393.dist-info/METADATA,sha256=qLd_GytuE-XM02HMzjQN_vxrvV6jkVN8_EwHahEtUvc,2215
-opentf_toolkit_nightly-0.63.0.dev1393.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-opentf_toolkit_nightly-0.63.0.dev1393.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.63.0.dev1393.dist-info/RECORD,,
+opentf_toolkit_nightly-0.63.0.dev1404.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.63.0.dev1404.dist-info/METADATA,sha256=e5Yk6R0U0-fHJQtr-EBn1kD1EqdiUVBpSnCvYBoTiLA,2215
+opentf_toolkit_nightly-0.63.0.dev1404.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+opentf_toolkit_nightly-0.63.0.dev1404.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.63.0.dev1404.dist-info/RECORD,,

{opentf_toolkit_nightly-0.63.0.dev1393.dist-info → opentf_toolkit_nightly-0.63.0.dev1404.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any