fix up acl_app to capture stderr output from acl:list

dokku · Dec 19, 2022 · e7eaeee · e7eaeee
1 parent 2159005
commit e7eaeee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/library/dokku_acl_app.py b/library/dokku_acl_app.py
@@ -55,7 +55,7 @@ def dokku_acl_app_set(data):
 
     # get users for app
     command = "dokku acl:list {0}".format(data["app"])
-    output, error = subprocess_check_output(command)
+    output, error = subprocess_check_output(command, redirect_stderr=True)
 
     if error is not None:
         meta["error"] = error

diff --git a/library/dokku_acl_service.py b/library/dokku_acl_service.py
@@ -62,14 +62,15 @@ def dokku_acl_service_set(data):
     has_changed = False
 
     # get users for service
-    command = "dokku --quiet acl:list-service {0} {1}".format(data["type"], data["service"])
+    command = "dokku --quiet acl:list-service {0} {1}".format(
+        data["type"], data["service"]
+    )
     output, error = subprocess_check_output(command, redirect_stderr=True)
 
     if error is not None:
         meta["error"] = error
         return (is_error, has_changed, meta)
 
-
     users = set(output)
 
     if data["state"] == "absent":

diff --git a/module_utils/dokku_utils.py b/module_utils/dokku_utils.py
@@ -9,13 +9,16 @@ def force_list(var):
         return var
     return list(var)
 
+
 # Add an option to redirect stderr to stdout, because some dokku commands output to stderr
 def subprocess_check_output(command, split="\n", redirect_stderr=False):
     error = None
     output = []
     try:
         if redirect_stderr:
-            output = subprocess.check_output(command, shell=True, stderr=subprocess.STDOUT)
+            output = subprocess.check_output(
+                command, shell=True, stderr=subprocess.STDOUT
+            )
         else:
             output = subprocess.check_output(command, shell=True)
         if isinstance(output, bytes):