Merge lp:~bloodearnest/conn-check/ipv6 into lp:conn-check

[Simon Davy]

Use newer HostnameEndpoint api for tcp checks, which supports ipv6.

Note: udp checks still don't support ipv6, as that is more complex, and of less use, given that very few services (only txstatsd to my knowledge) support the response required.

[Wes Mason (wesmason)]

lgtm

review: Approve

[Tom Wardill (twom)]

review: Approve

[Otto Co-Pilot (otto-copilot)]

Project setup failed
https://jenkins.ols.canonical.com/online-services/job/conn-check/5/

[Otto Co-Pilot (otto-copilot)]

Project setup failed
https://jenkins.ols.canonical.com/online-services/job/conn-check/6/

[Otto Co-Pilot (otto-copilot)]

Project setup failed
https://jenkins.ols.canonical.com/online-services/job/conn-check/7/

[lp:~bloodearnest/conn-check/ipv6]

139. By Simon Davy on 2018-06-04

separte pip/setuptools upgrade

[Simon Davy (bloodearnest)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2018-01-29 17:27:38 +0000
+++ Makefile	2018-06-04 15:00:56 +0000
@@ -12,7 +12,8 @@
 	virtualenv $(ENV)
 
 build: $(ENV)
-	$(ENV)/bin/pip install -U setuptools pip
+	$(ENV)/bin/pip install -U pip
+	$(ENV)/bin/pip install -U setuptools
 	$(ENV)/bin/pip install -r devel-requirements.txt
 	$(ENV)/bin/python setup.py develop
 
 
=== modified file 'conn_check/checks.py'
--- conn_check/checks.py	2018-01-29 14:07:24 +0000
+++ conn_check/checks.py	2018-06-04 15:00:56 +0000
@@ -1,11 +1,10 @@
 from __future__ import print_function
 from future import standard_library
-standard_library.install_aliases()
-
-from io import StringIO
+standard_library.install_aliases()  # NOQA
 
 from email.mime.text import MIMEText
 import glob
+from io import StringIO
 import os
 from pkg_resources import resource_stream
 import sys
@@ -21,9 +20,12 @@
     Deferred,
     inlineCallbacks,
     )
+from twisted.internet.endpoints import HostnameEndpoint, wrapClientTLS
+from twisted.internet.ssl import optionsForClientTLS
 from twisted.internet.protocol import (
     ClientCreator,
     DatagramProtocol,
+    Factory,
     Protocol,
     )
 from twisted.mail.smtp import ESMTPSenderFactory
@@ -31,6 +33,7 @@
 
 from txrequests import Session
 from requests.auth import HTTPDigestAuth
+from requests.exceptions import ConnectionError, SSLError
 
 try:
     from requests.packages.urllib3 import disable_warnings
@@ -93,26 +96,21 @@
 def do_tcp_check(host, port, tls=False, tls_verify=True,
                  timeout=None):
     """Generic connection check function."""
-    if not isIPAddress(host):
-        try:
-            ip = yield reactor.resolve(host, timeout=(1, timeout))
-        except DNSLookupError:
-            raise ValueError("dns resolution failed")
-    else:
-        ip = host
-    creator = ClientCreator(reactor, TCPCheckProtocol)
+
     try:
+        endpoint = HostnameEndpoint(reactor, host, port, timeout=timeout)
+
         if tls:
-            context = VerifyingContextFactory(tls_verify, CA_CERTS)
-            yield creator.connectSSL(ip, port, context,
-                                     timeout=timeout)
-        else:
-            yield creator.connectTCP(ip, port, timeout=timeout)
+            endpoint = wrapClientTLS(
+                optionsForClientTLS(hostname=host),
+                endpoint,
+            )
+
+        yield endpoint.connect(Factory.forProtocol(TCPCheckProtocol))
+    except DNSLookupError:
+        raise ValueError("dns lookup error")
     except TimeoutError:
-        if ip == host:
-            raise ValueError("timed out")
-        else:
-            raise ValueError("timed out connecting to {}".format(ip))
+        raise ValueError("timed out connecting to {}".format(host))
 
 
 def make_tcp_check(host, port, timeout=None, **kwargs):
@@ -403,9 +401,9 @@
 def make_redis_check(host, port, password=None, timeout=None,
                      **kwargs):
     """Make a check for the configured redis server."""
-    if sys.version_info[0] >= 3:
+    if sys.version_info[0] >=3:
         print('Redis checks are not supported in python 3.\n'
-              'This may help: https://github.com/deldotdr/txRedis/pull/58')
+            'This may help: https://github.com/deldotdr/txRedis/pull/58')
     import txredis
     subchecks = []
     subchecks.append(make_tcp_check(host, port, timeout=timeout))