Merge lp:~thomir-deactivatedaccount/charm-haproxy/make-config-less-insane into lp:~ubuntuone-pqm-team/charm-haproxy/snap-store

[Thomi Richards]

Allow users to force particular option strings to the FE or BE sections.

Allow users to force particular option strings to the FE or BE sections, since the charm apparently has decided to tell me where my options must live :(

[lp:~thomir-deactivatedaccount/charm-haproxy/make-config-less-insane]

112. By Thomi Richards on 2017-07-25

Fix service option filtering.

113. By Thomi Richards on 2017-07-25

Consolidate two loops.

114. By Thomi Richards on 2017-07-25

Code cleanups.

115. By Thomi Richards on 2017-07-25

Code cleanups.

116. By Thomi Richards on 2017-07-25

Code cleanups.

117. By Thomi Richards on 2017-07-25

Code cleanups.

[William Grant (wgrant)]

good riddance

review: Approve (code)

[lp:~thomir-deactivatedaccount/charm-haproxy/make-config-less-insane]

118. By Thomi Richards on 2017-07-25

Fixed failing test.

[William Grant (wgrant)]

review: Approve (goodlord)

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2017-03-02 16:10:43 +0000
+++ hooks/hooks.py	2017-07-25 07:09:10 +0000
@@ -347,16 +347,24 @@
             if any(map(o.strip().startswith, service_options)):
                 fe_options.append(o)
                 be_options.append(o)
+
         # Filter provided service options into frontend-only and backend-only.
-        results = izip(
-            (fe_options, be_options),
-            (True, False),
-            tee((o, any(map(o.strip().startswith,
-                            frontend_only_options)))
-                for o in service_options))
-        for out, cond, result in results:
-            out.extend(option for option, match in result
-                       if match is cond and option not in out)
+        # XXX: The '{FE}' and '{BE}' feature is a local patch in this version
+        # of the charm, and is not present in the upstream charm.
+        for option in service_options:
+            option = option.strip()
+            if option.startswith('{FE}'):
+                fe_options.append(option[4:].strip())
+            elif option.startswith('{BE}'):
+                be_options.append(option[4:].strip())
+            else:
+                if any(map(option.startswith, frontend_only_options)):
+                    if option not in fe_options:
+                        fe_options.append(option)
+                else:
+                    if option not in be_options:
+                        be_options.append(option)
+
     service_config = []
     unit_name = os.environ["JUJU_UNIT_NAME"].replace("/", "-")
     service_config.append("frontend %s-%s" % (unit_name, service_port))