opentf-toolkit-nightly 0.62.0.dev1298__py3-none-any.whl → 0.62.0.dev1302__py3-none-any.whl

opentf/scripts/startup.py

@@ -54,6 +54,7 @@ ENVIRONMENT_VARIABLES = {
     'DEBUG_LEVEL': 'INFO',
     'HTTP_PROXY': None,
     'HTTPS_PROXY': None,
+    'JAVA_TRUSTSTORE': None,
     'KEY_SIZE': 4096,
     'NO_PROXY': None,
     'OPENTF_TELEMETRY': None,
@@ -101,7 +102,7 @@ def _get_env_int(var: str) -> int:
     except ValueError:
         val = ENVIRONMENT_VARIABLES[var]
         logging.warning(
-            "Environment variable '%s' not an integer, defaulting to %d.",
+            'Environment variable "%s" not an integer, defaulting to %d.',
             var,
             val,
         )
@@ -228,16 +229,16 @@ def parse_and_start(
         return result
     for path in paths:
         for entry in os.walk(path):
-            logging.debug("Reading path '%s'.", entry[0])
+            logging.debug('Reading path "%s".', entry[0])
             if item not in entry[2]:
                 logging.debug('(No manifest found in path.)')
                 continue
-            logging.debug("(Found a '%s' manifest, parsing.)", item)
+            logging.debug('(Found a "%s" manifest, parsing.)', item)
             with open(os.path.join(entry[0], item), 'r', encoding='utf-8') as manifests:
                 for manifest in yaml.safe_load_all(manifests):
                     if disabled and manifest['metadata']['name'].lower() in disabled:
                         logging.debug(
-                            "(Plugin '%s' explicitly disabled, ignoring.)",
+                            '(Plugin "%s" explicitly disabled, ignoring.)',
                             manifest['metadata']['name'],
                         )
                         continue
@@ -308,7 +309,7 @@ def maybe_start_otelcol():
             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).',
+            'Unexpected OPENTF_TELEMETRY environment variable value "%s" (accepted values are %s).',
             telemetry,
             ', '.join(expected),
         )
@@ -412,7 +413,7 @@ def maybe_generate_token() -> None:
     if public_key := os.environ.get('PUBLIC_KEY'):
         if len(public_key.split()) < 2:
             logging.error(
-                "PUBLIC_KEY must be of the form: 'type-name base64-encoded-ssh-public-key [optional comment]', got: %s.",
+                'PUBLIC_KEY must be of the form: "type-name base64-encoded-ssh-public-key [optional comment]", got: %s.',
                 public_key,
             )
             sys.exit(1)
@@ -436,7 +437,7 @@ def maybe_populate_keystore() -> None:
     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)
+        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:
@@ -444,11 +445,20 @@ def maybe_populate_keystore() -> None:
     if not ca_list[-1].rstrip():
         ca_list.pop()
 
+    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}')
+        add_keystore_certificate(ca_counter, f'{ca}{CA_END}', keystore)
 
 
-def add_keystore_certificate(ca_counter: int, ca: str) -> None:
+def add_keystore_certificate(
+    ca_counter: int, ca: str, keystore: Tuple[str, ...]
+) -> None:
     """Add certificate to keystore.
 
     !!! warning
@@ -469,7 +479,7 @@ def add_keystore_certificate(ca_counter: int, ca: str) -> None:
         ca_alias = f'opentf:{ca_counter}_{os.path.basename(ca_path)}'
         try:
             ca_file.write(ca)
-            logging.debug("File '%s' written.", ca_path)
+            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)
@@ -483,10 +493,10 @@ def add_keystore_certificate(ca_counter: int, ca: str) -> None:
                     ca_alias,
                     '-file',
                     ca_path,
-                    '-cacerts',
                     '-storepass',
                     'changeit',
                     '-noprompt',
+                    *keystore,
                 ],
                 stdout=subprocess.PIPE,
                 stderr=subprocess.STDOUT,
@@ -514,14 +524,14 @@ def _ensure_abac_if_defined(name, 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(
+                '  OPENTF_AUTHORIZATION_MODE must include "ABAC" to use {0}.'.format(
                     name
                 )
             )
             sys.exit(1)
         if 'ABAC' not in OPENTF_AUTHORIZATION_MODE.split(','):
             logging.error(
-                "OPENTF_AUTHORIZATION_MODE must include 'ABAC' to use %s.", name
+                'OPENTF_AUTHORIZATION_MODE must include "ABAC" to use %s.', name
             )
             sys.exit(1)
         if not os.path.isfile(value):

{opentf_toolkit_nightly-0.62.0.dev1298.dist-info → opentf_toolkit_nightly-0.62.0.dev1302.dist-info}/METADATA

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

{opentf_toolkit_nightly-0.62.0.dev1298.dist-info → opentf_toolkit_nightly-0.62.0.dev1302.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=vOGxl7xBcp1-_LsAKiOmeOqFl2iT81A2XRrXBLUrNi4,22785
+opentf/scripts/startup.py,sha256=AcVXU2auPvqMb_6OpGzkVqrpgYV6vz7x_Rnv8YbAEkk,23114
 opentf/toolkit/__init__.py,sha256=ohrde5mcMY26p64E0Z2XunZAWYOiEkXKTg5E1J4TGGc,23571
 opentf/toolkit/channels.py,sha256=6qKSsAgq_oJpuDRiKqVUz-EAjdfikcCG3SFAGmKZdhQ,25551
 opentf/toolkit/core.py,sha256=fqnGgaYnuVcd4fyeNIwpc0QtyUo7jsKeVgdkBfY3iqo,9443
-opentf_toolkit_nightly-0.62.0.dev1298.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentf_toolkit_nightly-0.62.0.dev1298.dist-info/METADATA,sha256=zPOTouTQoLWUCjDEAvzyd6zBD72RgfGlTL9UGDTITuw,2192
-opentf_toolkit_nightly-0.62.0.dev1298.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-opentf_toolkit_nightly-0.62.0.dev1298.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
-opentf_toolkit_nightly-0.62.0.dev1298.dist-info/RECORD,,
+opentf_toolkit_nightly-0.62.0.dev1302.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentf_toolkit_nightly-0.62.0.dev1302.dist-info/METADATA,sha256=lva7suqvsswuh12Bjo-ZGIcaCepyWpzylYpxRlVUqQo,2192
+opentf_toolkit_nightly-0.62.0.dev1302.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+opentf_toolkit_nightly-0.62.0.dev1302.dist-info/top_level.txt,sha256=_gPuE6GTT6UNXy1DjtmQSfCcZb_qYA2vWmjg7a30AGk,7
+opentf_toolkit_nightly-0.62.0.dev1302.dist-info/RECORD,,

{opentf_toolkit_nightly-0.62.0.dev1298.dist-info → opentf_toolkit_nightly-0.62.0.dev1302.dist-info}/WHEEL

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