Merge lp:~hasanammar/conn-check/amqp-defaults into lp:~ubuntuone-hackers/conn-check/configs

[Hasan Ammar]

Add default values for AMQP connection

Add default values for AMQP connection to ensure valid values are always passed to conn-check if any are missing.

Default values are taken from: https://github.com/celery/py-amqp/blob/master/amqp/connection.py

[Daniel Manrique (roadmr)]

LGTM

review: Approve

=== modified file 'conn_check_configs/django.py'
--- conn_check_configs/django.py	2019-11-19 19:31:10 +0000
+++ conn_check_configs/django.py	2019-11-25 22:58:33 +0000
@@ -121,6 +121,37 @@
     return checks
 
 
+def _get_broker_checks(url_dict):
+    # Use default kombu values if the user hasn't provided values for any
+    # connection setting.
+    # Default kombu options:
+    # https://kombu.readthedocs.io/en/master/userguide/connections.html#urls
+    # Default AMQP values:
+    # https://github.com/celery/py-amqp/blob/master/amqp/connection.py
+
+    conn_type = url_dict['transport']
+    conn_defaults = {
+        'host': 'localhost'
+    }
+
+    if conn_type == 'amqp':
+        conn_defaults['port'] = 5672
+        conn_defaults['username'] = 'guest'
+        conn_defaults['password'] = 'guest'
+        conn_defaults['vhost'] = '/'
+    elif conn_type == 'redis':
+        conn_defaults['port'] = 6379
+
+    return {
+        'type': conn_type,
+        'host': url_dict.get('hostname') or conn_defaults.get('host'),
+        'port': url_dict.get('port') or conn_defaults.get('port'),
+        'username': url_dict.get('userid') or conn_defaults.get('username'),
+        'password': url_dict.get('password') or conn_defaults.get('password'),
+        'vhost': url_dict.get('virtual_host') or conn_defaults.get('vhost'),
+    }
+
+
 def make_celery_broker_url_checks(settings, options):
     checks = []
 
@@ -133,17 +164,7 @@
         if broker_url:
             url_dict = kombo_parse_url(broker_url)
             if url_dict['transport'] in ('amqp', 'redis'):
-                check = {
-                    'type': url_dict['transport'],
-                    'host': url_dict['hostname'],
-                    'port': url_dict['port'],
-                    'username': url_dict['userid'],
-                    'password': url_dict['password'],
-                }
-                vhost = url_dict['virtual_host']
-                if vhost:
-                    check['vhost'] = vhost
-                checks.append(check)
+                checks.append(_get_broker_checks(url_dict))
 
     return checks
 
 
=== modified file 'tests.py'
--- tests.py	2019-11-19 19:48:33 +0000
+++ tests.py	2019-11-25 22:58:33 +0000
@@ -10,10 +10,11 @@
     VALID_URL_TEST_MAP = {
         "amqp://": {
             'type': 'amqp',
-            'host': None,
-            'port': None,
-            'username': None,
-            'password': None,
+            'host': 'localhost',
+            'port': 5672,
+            'username': 'guest',
+            'password': 'guest',
+            'vhost': '/',
         },
         "redis://localhost:6379/": {
             'type': 'redis',
@@ -21,13 +22,14 @@
             'port': 6379,
             'username': None,
             'password': None,
+            'vhost': None,
         },
         "amqp://localhost//foo": {
             'type': 'amqp',
             'host': 'localhost',
-            'port': None,
-            'username': None,
-            'password': None,
+            'port': 5672,
+            'username': 'guest',
+            'password': 'guest',
             'vhost': '/foo',
         },
         "amqp://guest:guest@localhost:5672/foo": {