From 1ee862c12cc16f8de4a0964d68472eb9b5e85a51 Mon Sep 17 00:00:00 2001 From: Imgyu Kim Date: Fri, 20 Mar 2026 18:29:38 +0900 Subject: [PATCH] Fix tls.create_csr log message path concatenation (#60877) Use os.path.join() instead of f-string concatenation for csr_path in return message to avoid missing separator when csr_path lacks a trailing slash. Before: 'Created Private Key: "/etc/ssl/MYCA/certsMY.HOSTNAME.key"' After: 'Created Private Key: "/etc/ssl/MYCA/certs/MY.HOSTNAME.key"' --- salt/modules/tls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/modules/tls.py b/salt/modules/tls.py index 85e599cccf36..6c60a33acb5a 100644 --- a/salt/modules/tls.py +++ b/salt/modules/tls.py @@ -1253,8 +1253,8 @@ def create_csr( ) ) - ret = f'Created Private Key: "{csr_path}{csr_filename}.key" ' - ret += f'Created CSR for "{CN}": "{csr_path}{csr_filename}.csr"' + ret = f'Created Private Key: "{os.path.join(csr_path, csr_filename)}.key" ' + ret += f'Created CSR for "{CN}": "{os.path.join(csr_path, csr_filename)}.csr"' return ret