opentf-toolkit-nightly 0.61.0.dev1271__py3-none-any.whl → 0.61.0.dev1277__py3-none-any.whl

opentf/scripts/startup.py

@@ -289,15 +289,29 @@ def maybe_start_eventbus(conf: Dict[str, Any]) -> List[Any]:
 
 
 def maybe_start_otelcol():
-    if (v := _get_env('OPENTF_TELEMETRY')) and v.lower() in ('true', 'yes', 'on', '1'):
+    telemetry = _get_env('OPENTF_TELEMETRY')
+    expected = ('true', 'yes', 'on', '1')
+    if telemetry and telemetry.lower() in expected:
         try:
+            extra_options = os.environ.get('OTELCOL_EXTRA_OPTIONS', None)
+            options_msg = (
+                f' with following command line options: {extra_options}'
+                if extra_options
+                else ''
+            )
             cmd = '"/usr/local/bin/otelcol --config=file:/app/otelcol-config.yaml $OTELCOL_EXTRA_OPTIONS"'
-            logging.info('Starting OpenTelemetry Collector...')
+            logging.info(f'Starting OpenTelemetry Collector{options_msg}...')
             pid = subprocess.Popen(f'sh -c {cmd}', shell=True)
             logging.debug('(pid is %d.)', pid.pid)
             return [pid]
         except Exception as err:
             logging.error('Failed to start OpenTelemetry Collector: %s.', str(err))
+    elif telemetry:
+        logging.warning(
+            'Unexpected OPENTF_TELEMETRY environment variable value %s (accepted values are %s).',
+            telemetry,
+            ', '.join(expected),
+        )
     return []
 
 

opentf/toolkit/channels.py

@@ -528,6 +528,13 @@ def _must_keep_workspace(metadata: Dict[str, Any]) -> bool:
     return False
 
 
+def _must_remove_workspace(metadata: Dict[str, Any]) -> bool:
+    hooks_annotations = metadata.get('annotations', {}).get(HOOKS_ANNOTATIONS, {})
+    if hooks_annotations.get('channel') == 'teardown':
+        return hooks_annotations.get('keep-workspace') is False
+    return False
+
+
 def _maybe_change_directory(
     command: Dict[str, Any], runner_os: str, script: List[str], prefix: str
 ) -> None:
@@ -582,7 +589,12 @@ def _make_prolog(
         if name in local_variables_names:
             script.append(VARIABLE_MAKER[runner_os](name, value))
 
-    if step_sequence_id == CHANNEL_RELEASE:
+    if step_sequence_id != CHANNEL_RELEASE and _must_remove_workspace(
+        command['metadata']
+    ):
+        script.append(PROLOG_SCRIPTS[runner_os][REMOVE_WORKSPACE])
+        _export_opentf_workspace(runner_os, '.', script)
+    elif step_sequence_id == CHANNEL_RELEASE:
         # on windows, the script ends if it is removed, so script
         # removal should be the last operation
         if not _must_keep_workspace(command['metadata']):

{opentf_toolkit_nightly-0.61.0.dev1271.dist-info → opentf_toolkit_nightly-0.61.0.dev1277.dist-info}/METADATA

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

{opentf_toolkit_nightly-0.61.0.dev1271.dist-info → opentf_toolkit_nightly-0.61.0.dev1277.dist-info}/RECORD

@@ -54,12 +54,12 @@ 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=8pOCkHNlrJ_ezCY2yx83EUMrK_mzy4cmuwMiAuK9YbY,22264
+opentf/scripts/startup.py,sha256=vOGxl7xBcp1-_LsAKiOmeOqFl2iT81A2XRrXBLUrNi4,22785
 opentf/toolkit/__init__.py,sha256=mYeJPZ92ulbTBItqEsZgF4nnuRh6G19QPY3Jxc92ifc,23028
-opentf/toolkit/channels.py,sha256=EDuX5rk-wdaPLZeirllJqosRnmtz8bA4_eRfH857KZ4,23717
+opentf/toolkit/channels.py,sha256=ZKxJ6KplBt_SJS0H2Dikno_mogupFTJ94Myl4pWGFH8,24232
 opentf/toolkit/core.py,sha256=fqnGgaYnuVcd4fyeNIwpc0QtyUo7jsKeVgdkBfY3iqo,9443
-opentf_toolkit_nightly-0.61.0.dev1271.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.61.0.dev1271.dist-info/METADATA,sha256=sWTNOIgENU5mx22FRGYlFqeNQDHt3BaHbfb0-7v_lr4,2192
-opentf_toolkit_nightly-0.61.0.dev1271.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-opentf_toolkit_nightly-0.61.0.dev1271.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.61.0.dev1271.dist-info/RECORD,,
+opentf_toolkit_nightly-0.61.0.dev1277.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.61.0.dev1277.dist-info/METADATA,sha256=M2qAA4WvCbNFxktm7FEhHxV3TtnNX9Lu0bd2Y0UGBBU,2192
+opentf_toolkit_nightly-0.61.0.dev1277.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
+opentf_toolkit_nightly-0.61.0.dev1277.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.61.0.dev1277.dist-info/RECORD,,

{opentf_toolkit_nightly-0.61.0.dev1271.dist-info → opentf_toolkit_nightly-0.61.0.dev1277.dist-info}/WHEEL

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