Merge lp:~martin-hilton/charm-haproxy/alias-all_services-services into lp:charm-haproxy

[Martin Hilton]

Update of lp:~evarlast/charm-haproxy/alias-all_services-services to make tests/lint pass.

This is the change originally proposed in https://code.launchpad.net/~evarlast/charm-haproxy/alias-all_services-services/+merge/317254 just updated to be based on the latest version and have test/lint pass.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Stuart Bishop (stub)]

Looks fine, apart from formatting. One pep8 issue that flake8 likely ignores, and some triple quoted string indentation that can be made easier to read. Best if these get fixed before landing.

review: Approve

[Stuart Bishop (stub)]

review: Needs Fixing

[lp:~martin-hilton/charm-haproxy/alias-all_services-services]

118. By Martin Hilton on 2019-05-17

review updates

[Stuart Bishop (stub)]

Yup, ta muchly

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 130

=== modified file 'Makefile'
--- Makefile	2019-03-21 11:33:58 +0000
+++ Makefile	2019-05-17 12:11:53 +0000
@@ -24,7 +24,7 @@
 
 lint: .venv
 	@echo Checking for Python syntax...
-	@python -m flake8 $(HOOKS_DIR) --extend-ignore=E123 --exclude=$(HOOKS_DIR)/charmhelpers
+	@python -m flake8 $(HOOKS_DIR) --ignore=E123 --max-line-length=120 --exclude=$(HOOKS_DIR)/charmhelpers
 
 sourcedeps:
 	@echo Updating source dependencies...
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2019-03-21 15:39:53 +0000
+++ hooks/hooks.py	2019-05-17 12:11:53 +0000
@@ -253,9 +253,8 @@
     # bind 1.2.3.5:234
     # bind 2001:db8::1:80
     # bind 1.2.3.4:123 ssl crt /foo/bar
-    bind_stanzas = re.findall(
-        r"\s+bind\s+([a-fA-F0-9\.:\*]+):(\d+).*\n\s+default_backend\s+([^\s]+)",
-        haproxy_config, re.M)
+    bind_stanzas = re.findall(r"\s+bind\s+([a-fA-F0-9\.:\*]+):(\d+).*\n\s+default_backend\s+([^\s]+)",
+                              haproxy_config, re.M)
     return (tuple(((service, addr, int(port))
                    for service, addr, port in listen_stanzas)) +
             tuple(((service, addr, int(port))
@@ -614,8 +613,19 @@
     # Handle relations which specify their own services clauses
     for relation_info in relation_data:
         if "services" in relation_info:
+            services_dict = parse_services_yaml(services_dict, relation_info['services'])
+        # apache2 charm uses "all_services" key instead of "services".
+        if "all_services" in relation_info and "services" not in relation_info:
             services_dict = parse_services_yaml(services_dict,
-                                                relation_info['services'])
+                                                relation_info['all_services'])
+            # Replace the backend server(2hops away) with the private-address.
+            for service_name in services_dict.keys():
+                if service_name == 'service' or 'servers' not in services_dict[service_name]:
+                    continue
+                servers = services_dict[service_name]['servers']
+                for i in range(len(servers)):
+                    servers[i][1] = relation_info['private-address']
+                    servers[i][2] = str(services_dict[service_name]['service_port'])
 
     if len(services_dict) == 0:
         log("No services configured, exiting.")
@@ -636,8 +646,7 @@
         relation_ok = True
         for required in ("port", "private-address"):
             if required not in relation_info:
-                log("No %s in relation data for '%s', skipping." %
-                    (required, unit))
+                log("No %s in relation data for '%s', skipping." % (required, unit))
                 relation_ok = False
                 break
 
@@ -655,8 +664,7 @@
             if relation_info['service_name'] in services_dict:
                 service_names.add(relation_info['service_name'])
             else:
-                log("Service '%s' does not exist." %
-                    relation_info['service_name'])
+                log("Service '%s' does not exist." % relation_info['service_name'])
                 continue
 
         if 'sitenames' in relation_info:
@@ -927,8 +935,7 @@
     if release == 'trusty':
         pkgs.append('python-ipaddr')
     apt_install(filter_installed_packages(pkgs), fatal=False)
-    ensure_package_status(service_affecting_packages,
-                          config_data['package_status'])
+    ensure_package_status(service_affecting_packages, config_data['package_status'])
     enable_haproxy()
 
 
 
=== modified file 'hooks/tests/test_install.py'
--- hooks/tests/test_install.py	2019-03-21 10:47:31 +0000
+++ hooks/tests/test_install.py	2019-05-17 12:11:53 +0000
@@ -50,8 +50,7 @@
         for package in calls[1][0][0]:
             self.assertIn(
                 package,
-                (['python-pyasn1', 'python-pyasn1-modules', 'python-apt',
-                 'python-openssl'],))
+                ['python-pyasn1', 'python-pyasn1-modules', 'python-apt', 'python-openssl'])
         self.assertEqual({'fatal': False}, calls[1][1])
 
     def test_add_source(self):
 
=== modified file 'hooks/tests/test_reverseproxy_hooks.py'
--- hooks/tests/test_reverseproxy_hooks.py	2015-09-01 13:41:44 +0000
+++ hooks/tests/test_reverseproxy_hooks.py	2019-05-17 12:11:53 +0000
@@ -503,7 +503,8 @@
             'service': {
                 'service_name': 'service',
                 'service_host': '0.0.0.0',
-                'service_port': 10002,
+                'service_options': ['balance leastconn'],
+                'service_port': 4242,
                 'servers': [
                     ['foo-0', '1.2.3.4', 4242, ["maxconn 4"]],
                     ]
@@ -648,3 +649,49 @@
             relation_settings={
                 "public-address": "1.2.3.4",
                 "ssl_cert": ssl_cert})
+
+    def test_relation_all_services(self):
+        self.get_config_services.return_value = {
+            None: {
+                "service_name": "service",
+                },
+            "service": {
+                "service_name": "service",
+                },
+            }
+        self.relations_of_type.return_value = [
+            {"port": 80,
+             "hostname": "blah.internal",
+             "private-address": "1.2.3.4",
+             "__unit__": "foo/0",
+             "all_services": '''
+                 - server_options: &id001 [check inter 2000 rise 2 fall 5 maxconn 500]
+                   servers:
+                   - - my-service-2-8082
+                     - 10.142.0.16
+                     - '8082'
+                     - *id001
+                   service_host: 0.0.0.0
+                   service_name: my-service
+                   service_options: [mode http, balance url_param waitid]
+                   service_port: 83
+             '''
+             },
+        ]
+
+        expected = {
+            'my-service': {
+                'server_options': ['check inter 2000 rise 2 fall 5 maxconn 500'],
+                'servers': [['my-service-2-8082', '1.2.3.4', '83', ['check inter 2000 rise 2 fall 5 maxconn 500']]],
+                'service_host': '0.0.0.0',
+                'service_name': 'my-service',
+                'service_options': ['mode http', 'balance url_param waitid'],
+                'service_port': 83},
+            'service': {
+                'servers': [('foo-0-80', '1.2.3.4', 80, [])],
+                'service_host': '0.0.0.0',
+                'service_name': 'service',
+                'service_port': 85}}
+
+        self.assertEqual(expected, hooks.create_services())
+        self.write_service_config.assert_called_with(expected)