opentf-toolkit-nightly 0.63.0.dev1406__py3-none-any.whl → 0.63.0.dev1418__py3-none-any.whl

opentf/scripts/startup.py

@@ -434,90 +434,43 @@ def maybe_generate_token() -> None:
 
 
 def maybe_populate_keystore() -> None:
-    """Populate Java keystore if CURL_CA_BUNDLE defined."""
+    """Populate keystore if CURL_CA_BUNDLE defined."""
     if (ca_bundle := os.environ.get('CURL_CA_BUNDLE')) is None:
         return
     if not os.path.isfile(ca_bundle):
         logging.error('CURL_CA_BUNDLE "%s" does not exist, aborting.', ca_bundle)
         sys.exit(1)
 
-    with open(ca_bundle, 'r', encoding='utf-8') as bundle_file:
-        ca_list = bundle_file.read().split(CA_END)
-    if not ca_list[-1].rstrip():
-        ca_list.pop()
+    add_keystore_certificate(ca_bundle)
 
-    if truststore := os.environ.get('JAVA_TRUSTSTORE'):
-        logging.debug('Using truststore "%s".', truststore)
-        keystore = ('-keystore', truststore)
-    else:
-        logging.debug('Using default truststore.')
-        keystore = ('-cacerts',)
-
-    for ca_counter, ca in enumerate(ca_list):
-        add_keystore_certificate(ca_counter, f'{ca}{CA_END}', keystore)
-
-
-def add_keystore_certificate(
-    ca_counter: int, ca: str, keystore: Tuple[str, ...]
-) -> None:
-    """Add certificate to keystore.
-
-    !!! warning
-        This calls `keytool`, which requires root privileges, as it
-        add certificates to the system's keystore.
-
-    Certificates will have an alias of the form:
 
-        `opentf:{ca_counter}_{random string}`
-
-    # Required parameters
-
-    - ca_counter: an integer, the certificate position in the bundle
-    - ca: the certificate as a string
-    """
-    with tempfile.NamedTemporaryFile('w') as ca_file:
-        ca_path = ca_file.name
-        ca_alias = f'opentf:{ca_counter}_{os.path.basename(ca_path)}'
-        try:
-            ca_file.write(ca)
-            logging.debug('File "%s" written.', ca_path)
-        except IOError as err:
-            logging.error('An error occurred while writing the file: %s.', err)
-            sys.exit(1)
-        ca_file.flush()
-        try:
-            ca_import_execute = subprocess.run(
-                [
-                    'keytool',
-                    '-importcert',
-                    '-alias',
-                    ca_alias,
-                    '-file',
-                    ca_path,
-                    '-storepass',
-                    'changeit',
-                    '-noprompt',
-                    *keystore,
-                ],
-                stdout=subprocess.PIPE,
-                stderr=subprocess.STDOUT,
-                check=True,
-            )
-            logging.debug(
-                'Certificate %d successfully added to keystore with alias %s:\n%s.',
-                ca_counter,
-                ca_alias,
-                ca_import_execute.stdout.decode().rstrip(''),
-            )
-        except subprocess.CalledProcessError as err:
-            logging.error(
-                'Failed to add certificate %d with alias %s to keystore: %s.\n%s',
-                ca_counter,
-                ca_alias,
-                err,
-                err.stdout.decode().rstrip(''),
-            )
-            sys.exit(1)
+def add_keystore_certificate(ca_bundle: str) -> None:
+    try:
+        subprocess.run(
+            [
+                'openssl',
+                'pkcs12',
+                '-export',
+                '-nokeys',
+                '-in',
+                ca_bundle,
+                '-password',
+                'pass:',
+                '-out',
+                '/app/keystore.p12',
+            ],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            check=True,
+        )
+        logging.debug('Certificate successfully added to keystore.')
+    except subprocess.CalledProcessError as err:
+        logging.error(
+            'Failed to add certificate to keystore: %s\n%s',
+            err,
+            err.stdout.decode().rstrip(''),
+        )
+        sys.exit(1)
 
 
 def _ensure_abac_if_defined(name, value):

opentf/toolkit/channels.py

@@ -17,7 +17,6 @@
 
 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
@@ -48,15 +47,6 @@ 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
 
 CHANNEL_REQUEST = -1
@@ -323,7 +313,10 @@ class JobState:
     def __init__(self) -> None:
         self.stop_command: Optional[str] = None
         self.masks: List[str] = []
-        self.workflow_commands: List[str] = []
+        self.output_commands: List[str] = []
+        self.attachments: List[str] = []
+        self.attachments_metadata: Dict[str, Any] = {}
+        self.artifacts_resp: bool = False
 
 
 def mask(line: str, state: JobState) -> str:
@@ -552,17 +545,16 @@ def process_output(
     outputs = {}
     logs: List[str] = []
     attachments: List[str] = []
-    attachments_metadata = {}
+    attachments_metadata: Dict[str, Any] = {}
 
     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()
+    if not is_channel_notify and jobstate.output_commands:
+        stdout.extend(jobstate.output_commands)
+        jobstate.output_commands.clear()
 
-    has_artifacts = False
     for line in stdout:
         # Parsing stdout for workflow commands
         if jobstate.stop_command:
@@ -570,14 +562,14 @@ 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)
+        if is_channel_notify and SETOUTPUT_COMMAND.match(line):
+            jobstate.output_commands.append(line)
             continue
 
         if wcmd := ATTACH_COMMAND.match(line):
             resp = _attach(wcmd.group(2), wcmd.group(1))
         elif wcmd := UPLOAD_COMMAND.match(line):
-            has_artifacts = True
+            jobstate.artifacts_resp = True
             resp = _attach(wcmd.group(2), wcmd.group(1), is_artifact=True)
         elif wcmd := DOWNLOAD_COMMAND.match(line):
             resp = _download(wcmd.group(2), wcmd.group(1))
@@ -602,6 +594,9 @@ def process_output(
         notify['logs'] = logs
         if notify['metadata'].get('artifacts'):
             del notify['metadata']['artifacts']
+        if attachments:
+            jobstate.attachments.extend(attachments)
+            jobstate.attachments_metadata.update(attachments_metadata)
         return notify
 
     if metadata.get('artifacts'):
@@ -621,11 +616,17 @@ def process_output(
         result['outputs'] = outputs
     if logs:
         result['logs'] = logs
-    if attachments:
-        result['attachments'] = attachments
-        result['metadata']['attachments'] = attachments_metadata
-    if has_artifacts:
+    if attachments or jobstate.attachments:
+        result['attachments'] = jobstate.attachments + attachments
+        result['metadata']['attachments'] = {
+            **jobstate.attachments_metadata,
+            **attachments_metadata,
+        }
+        jobstate.attachments.clear()
+        jobstate.attachments_metadata = {}
+    if jobstate.artifacts_resp:
         result['metadata']['upload'] = resp
+        jobstate.artifacts_resp = False
     if opentf_variables:
         result['variables'] = opentf_variables
     return result

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

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

{opentf_toolkit_nightly-0.63.0.dev1406.dist-info → opentf_toolkit_nightly-0.63.0.dev1418.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=DLanDaXutUTYcG2PwoJ34QH-5G0TwfLUY_xy1VkVOqA,23202
+opentf/scripts/startup.py,sha256=CZc4sKOQqox0X4R6qQ8GP-4OJwqewrt-XELJ5unG7o0,21456
 opentf/toolkit/__init__.py,sha256=YnH66dmePAIU7dq_xWFYTIEUrsL9qV9f82LRDiBzbzs,22057
-opentf/toolkit/channels.py,sha256=8WuybkK7HZpTvCqstnik6cz-OGd7p4AMBAfBJX3E3zA,27389
+opentf/toolkit/channels.py,sha256=BQh5ztQmIKpxns6ozDNto4YpegktydPZyhOO9F3g-2Q,27731
 opentf/toolkit/core.py,sha256=jMBDIYZ8Qn3BvsysfKoG0iTtjOnZsggetpH3eXygCsI,9636
 opentf/toolkit/models.py,sha256=PNfXVQbeyOwDfaNrLjcfhYm6duMSlNWBtZsWZcs53ag,6583
-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.dev1418.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.63.0.dev1418.dist-info/METADATA,sha256=ZlrRo3jDrv1hF_gDXgQmh6zztZ5NAKTCvti59zQx5EA,2215
+opentf_toolkit_nightly-0.63.0.dev1418.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+opentf_toolkit_nightly-0.63.0.dev1418.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.63.0.dev1418.dist-info/RECORD,,

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

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