opentf-toolkit-nightly 0.63.0.dev1397__py3-none-any.whl → 0.63.0.dev1406__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

@@ -17,6 +17,8 @@
 
 from typing import Any, Callable, Dict, List, NamedTuple, Optional, Set, Tuple, Union
 
+from collections import defaultdict
+from copy import deepcopy
 from datetime import datetime
 from shlex import quote
 
@@ -46,6 +48,14 @@ STOPCOMMANDS_COMMAND = re.compile(r'^::stop-commands::(\w+)$')
 ADDMASK_COMMAND = re.compile(r'^::add-mask::(.*)$')
 PUT_FILE_COMMAND = re.compile(r'^::put\s+file=(.*?)\s*::(.*?)\s*$')
 
+COMMAND_PATTERNS = (
+    ATTACH_COMMAND,
+    UPLOAD_COMMAND,
+    DOWNLOAD_COMMAND,
+    PUT_FILE_COMMAND,
+    SETOUTPUT_COMMAND,
+)
+
 
 ## step sequence IDs
 
@@ -313,6 +323,7 @@ class JobState:
     def __init__(self) -> None:
         self.stop_command: Optional[str] = None
         self.masks: List[str] = []
+        self.workflow_commands: List[str] = []
 
 
 def mask(line: str, state: JobState) -> str:
@@ -332,6 +343,9 @@ def _as_log(line: str, jobstate: JobState):
     return mask(line, jobstate).rstrip()
 
 
+## artifacts
+
+
 def process_upload(result: Dict[str, Any]) -> Dict[str, Any]:
     """Process ExecutionResult event containing .metadata.upload flag.
 
@@ -427,7 +441,7 @@ def _download_artifacts(
 
 def process_output(
     event: Dict[str, Any],
-    resp: int,
+    resp: Optional[int],
     stdout: List[str],
     stderr: List[str],
     jobstate: JobState,
@@ -540,6 +554,14 @@ def process_output(
     attachments: List[str] = []
     attachments_metadata = {}
 
+    is_channel_notify = False
+    step_sequence_id = metadata['step_sequence_id']
+    if resp is None:
+        resp, is_channel_notify = 0, True
+    if not is_channel_notify and jobstate.workflow_commands:
+        stdout.extend(jobstate.workflow_commands)
+        jobstate.workflow_commands.clear()
+
     has_artifacts = False
     for line in stdout:
         # Parsing stdout for workflow commands
@@ -548,6 +570,10 @@ def process_output(
                 jobstate.stop_command = None
             continue
 
+        if is_channel_notify and any(p.match(line) for p in COMMAND_PATTERNS):
+            jobstate.workflow_commands.append(line)
+            continue
+
         if wcmd := ATTACH_COMMAND.match(line):
             resp = _attach(wcmd.group(2), wcmd.group(1))
         elif wcmd := UPLOAD_COMMAND.match(line):
@@ -569,11 +595,20 @@ def process_output(
     for line in stderr:
         logs.append(mask(line, jobstate).rstrip())
 
+    if is_channel_notify:
+        notify = make_event(EXECUTIONRESULT, metadata=deepcopy(metadata), status=resp)
+        notify['metadata']['step_sequence_id_origin'] = metadata['step_sequence_id']
+        notify['metadata']['step_sequence_id'] = CHANNEL_NOTIFY
+        notify['logs'] = logs
+        if notify['metadata'].get('artifacts'):
+            del notify['metadata']['artifacts']
+        return notify
+
     if metadata.get('artifacts'):
         del metadata['artifacts']
 
     opentf_variables = None
-    if metadata['step_sequence_id'] != CHANNEL_RELEASE:
+    if step_sequence_id != CHANNEL_RELEASE:
         if variables:
             opentf_variables = _read_opentf_variables(variables)
         else:

{opentf_toolkit_nightly-0.63.0.dev1397.dist-info → opentf_toolkit_nightly-0.63.0.dev1406.dist-info}/METADATA

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

{opentf_toolkit_nightly-0.63.0.dev1397.dist-info → opentf_toolkit_nightly-0.63.0.dev1406.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=7uHpQUCWCzSxcQifeUL9SB9fvsq6_9cZt_8IdBgw8FQ,26272
+opentf/toolkit/channels.py,sha256=8WuybkK7HZpTvCqstnik6cz-OGd7p4AMBAfBJX3E3zA,27389
 opentf/toolkit/core.py,sha256=jMBDIYZ8Qn3BvsysfKoG0iTtjOnZsggetpH3eXygCsI,9636
 opentf/toolkit/models.py,sha256=PNfXVQbeyOwDfaNrLjcfhYm6duMSlNWBtZsWZcs53ag,6583
-opentf_toolkit_nightly-0.63.0.dev1397.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.63.0.dev1397.dist-info/METADATA,sha256=vEYD3Fg0XWwNxtheNasZuvo8NDBsGF3ffn_o52w6Ffk,2215
-opentf_toolkit_nightly-0.63.0.dev1397.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-opentf_toolkit_nightly-0.63.0.dev1397.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.63.0.dev1397.dist-info/RECORD,,
+opentf_toolkit_nightly-0.63.0.dev1406.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.63.0.dev1406.dist-info/METADATA,sha256=EXkrO2T8qRPNdSP83yiGluJDu-aq7zwXDY4mDbsrbUg,2215
+opentf_toolkit_nightly-0.63.0.dev1406.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+opentf_toolkit_nightly-0.63.0.dev1406.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.63.0.dev1406.dist-info/RECORD,,

{opentf_toolkit_nightly-0.63.0.dev1397.dist-info → opentf_toolkit_nightly-0.63.0.dev1406.dist-info}/WHEEL

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