refactor(module): add get_acme_bin function

genaumann · Jan 10, 2024 · 289dffa · 289dffa
1 parent b54956a
commit 289dffa
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/_modules/acme_sh.py b/_modules/acme_sh.py
@@ -12,6 +12,17 @@
 
 log = logging.getLogger(__name__)
 
+def _get_acme_bin(
+    script_path,
+    home_dir
+):
+
+  acme_bin = script_path if script_path else f"{home_dir}/.acme.sh/acme.sh"
+  if not salt.utils.path.which_bin([acme_bin]):
+    raise CommandNotFoundError("acme.sh script is not available. Specify the absolute script path in `script_path`")
+
+  return acme_bin
+
 def install(
     email,
     user='root',
@@ -158,10 +169,7 @@ def cert(
       __context__["retcode"] = 1
       return "Install socat to use standalone mode first"
 
-  # check command exist
-  acme_bin = script_path if script_path else f"{home_dir}/.acme.sh/acme.sh"
-  if not salt.utils.path.which_bin([acme_bin]):
-    raise CommandNotFoundError("acme.sh script is not available. Specify the absolute script path in `script_path`")
+  acme_bin = _get_acme_bin(script_path, home_dir)
 
   # check keysize
   possible_keylength = ["ec-256", "ec-384", "ec-521", "2048", "3072", "4096"]