cumulusci-plus 5.0.43__py3-none-any.whl → 5.0.45__py3-none-any.whl

cumulusci/__about__.py

@@ -1 +1 @@
-__version__ = "5.0.43"
+__version__ = "5.0.45"

cumulusci/cli/cci.py

@@ -173,11 +173,11 @@ def main(args=None):
         with set_debug_mode(debug):
             try:
                 runtime = CliRuntime(load_keychain=False)
+                runtime.check_cumulusci_version()
             except Exception as e:
                 handle_exception(e, is_error_command, tempfile_path, debug)
                 sys.exit(1)
 
-            runtime.check_cumulusci_version()
             should_show_stacktraces = runtime.universal_config.cli__show_stacktraces
 
             init_logger(debug=debug)
@@ -233,7 +233,8 @@ def handle_exception(
         with open(logfile_path, "a") as log_file:
             traceback.print_exc(file=log_file)  # log stacktrace silently
 
-    if should_show_stacktraces and not isinstance(error, USAGE_ERRORS):
+    # Show stacktraces when explicitly requested (e.g., --debug flag)
+    if should_show_stacktraces:
         error_console.print_exception()
 
 

cumulusci/core/config/sfdx_org_config.py

@@ -53,7 +53,10 @@ class SfdxOrgConfig(OrgConfig):
                     "Failed to parse json from output.\n  "
                     f"Exception: {e.__class__.__name__}\n  Output: {''.join(stdout_list)}"
                 )
-            org_id = org_info["result"]["accessToken"].split("!")[0]
+            org_id = (
+                org_info["result"].get("id")
+                or org_info["result"]["accessToken"].split("!")[0]
+            )
 
         sfdx_info = {
             "instance_url": org_info["result"]["instanceUrl"],

cumulusci/tasks/utility/secretsToEnv.py

@@ -64,18 +64,21 @@ class SecretsToEnv(BaseTask):
 
         self._init_secrets()
 
-        output_file = self.parsed_options.env_path
-
         for secret_key, secret_name in self.secrets.items():
             if secret_key == "*":
                 self.env_values.update(
                     self._get_all_credentials(secret_key, secret_name=secret_name)
                 )
             else:
-                safe_value, _ = self._get_credential(
+                self.env_values[secret_key] = self._get_credential(
                     secret_key, secret_key, secret_name=secret_name
                 )
-                self.env_values[secret_key] = safe_value
+        self.return_values = {"env_values": self.env_values}
+        self._write_env_file()
+
+    def _write_env_file(self):
+        safe_env_values = {}
+        output_file = self.parsed_options.env_path
 
         # Ensure output directory exists
         os.makedirs(os.path.dirname(output_file) or ".", exist_ok=True)
@@ -83,7 +86,37 @@ class SecretsToEnv(BaseTask):
         # Write env file with UTF-8 encoding to support Unicode characters
         with open(output_file, "w", encoding="utf-8") as env_file:
             for key, value in self.env_values.items():
-                env_file.write(f'{key}="{value}"\n')
+                safe_env_values[key] = self._escape_env_value(value)
+                env_file.write(f'{key}="{safe_env_values[key]}"\n')
+
+        self.return_values["safe_env_values"] = safe_env_values
+
+    # https://pypi.org/project/python-dotenv/ -> README -> Escaping Values
+    def _escape_env_value(self, value):
+        """
+        Escape special characters for .env file values in double quotes.
+        Escapes: \\, \', \", \a, \b, \f, \n, \r, \t, \v
+        """
+        if not isinstance(value, str):
+            return value
+
+        escape_map = {
+            "\\": "\\\\",  # Backslash must be first
+            "'": "\\'",  # Single quote
+            '"': '\\"',  # Double quote
+            "\a": "\\a",  # Bell/Alert
+            "\b": "\\b",  # Backspace
+            "\f": "\\f",  # Form feed
+            "\n": "\\n",  # Newline
+            "\r": "\\r",  # Carriage return
+            "\t": "\\t",  # Tab
+            "\v": "\\v",  # Vertical tab
+        }
+
+        for char, escaped in escape_map.items():
+            value = value.replace(char, escaped)
+
+        return value
 
     def _get_credential(
         self,
@@ -108,8 +141,7 @@ class SecretsToEnv(BaseTask):
         self.logger.info(
             f"Set secrets env var from {self.provider.provider_type}: {env_key}={display_value}"
         )
-        safe_value = cred_secret_value.replace('"', '\\"').replace("\n", "\\n")
-        return safe_value, cred_secret_value
+        return cred_secret_value
 
     def _get_all_credentials(
         self, credential_key, display_value="*****", secret_name=None
@@ -129,7 +161,6 @@ class SecretsToEnv(BaseTask):
             self.logger.info(
                 f"Set secrets env var from {self.provider.provider_type}: {key}={display_value}"
             )
-            safe_value = value.replace('"', '\\"').replace("\n", "\\n")
-            dict_values[key] = safe_value
+            dict_values[key] = value
 
         return dict_values