Fix reading existing dokku docker options (#146)

* Fix reading existing dokku docker options * Add test for dokku_docker_options
dokku · Oct 17, 2022 · fb8174f · fb8174f
1 parent 7edd059
commit fb8174f
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 13 deletions.
diff --git a/library/dokku_docker_options.py b/library/dokku_docker_options.py
@@ -4,6 +4,7 @@
 from ansible.module_utils.dokku_utils import subprocess_check_output
 import pipes
 import subprocess
+import re
 
 DOCUMENTATION = """
 ---
@@ -57,22 +58,17 @@
 
 
 def dokku_docker_options(data):
-    options = {"build": [], "deploy": [], "run": []}
-    command = "dokku --quiet docker-options {0}".format(data["app"])
+    options = {"build": "", "deploy": "", "run": ""}
+    command = "dokku --quiet docker-options:report {0}".format(data["app"])
     output, error = subprocess_check_output(command)
     if error is None:
-        _type = "build"
         for line in output:
-            if line == "Build options:":
-                _type = "build"
-                continue
-            elif line == "Deploy options:":
-                _type = "deploy"
-                continue
-            elif line == "Run options:":
-                _type = "run"
-                continue
-            options[_type].append(line)
+            match = re.match(
+                "Docker options (?P<type>build|deploy|run):(?P<options>.+)",
+                line.strip(),
+            )
+            if match:
+                options[match.group("type")] = match.group("options").strip()
     return options, error
 
 

diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
@@ -325,3 +325,55 @@
       msg: |-
         checks were not enabled in output of 'dokku checks':
         {{ dokku_checks.stdout }}
+
+  # Testing dokku_docker_options
+  - name: Set docker build options
+    dokku_docker_options:
+      app: example-app
+      phase: build
+      option: "--pull"
+
+  - name: Get docker-options output # noqa 301
+    command: dokku docker-options:report example-app
+    register: dokku_docker_options
+
+  - name: Check that the docker options were set
+    assert:
+      that:
+      - "'--pull' in dokku_docker_options.stdout"
+      msg: |-
+        docker option '--pull' was not set in output of 'dokku docker-options':
+        {{ dokku_docker_options.stdout }}
+
+  - name: Set docker build options that already exist # noqa 301
+    dokku_docker_options:
+      app: example-app
+      phase: build
+      option: "--pull"
+    register: existing_docker_options
+
+  - name: Check that setting existing docker options did not change anything
+    assert:
+      that:
+      - not existing_docker_options.changed
+      msg: |
+        Setting existing docker options resulted in changed status
+
+  - name: Remove docker build options
+    dokku_docker_options:
+      app: example-app
+      phase: build
+      option: "--pull"
+      state: absent
+
+  - name: Get docker-options output # noqa 301
+    command: dokku docker-options:report example-app
+    register: dokku_docker_options
+
+  - name: Check that the docker options were removed
+    assert:
+      that:
+      - "'--pull' not in dokku_docker_options.stdout"
+      msg: |-
+        docker option '--pull' was not removed in output of 'dokku docker-options':
+        {{ dokku_docker_options.stdout }}