Merge lp:~suligap/conn-check/proxy_url-fix into lp:conn-check

[Przemysław Suliga]

Fixed tcp subcheck creation for the http check if proxy_url is set

Fixed handling of the proxy_url http check setting. It now correctly creates its tcp subcheck, pointed at the configured proxy instead of the target url host.

[Maximiliano Bertacchini (maxiberta)]

LGTM!

review: Approve

=== modified file 'CHANGELOG'
--- CHANGELOG	2018-06-13 16:39:38 +0000
+++ CHANGELOG	2021-02-17 11:29:08 +0000
@@ -1,6 +1,13 @@
 ChangeLog for conn-check
 ========================
 
+1.5.2 (TBD)
+------------------
+
+ - Fixed handling of the proxy_url http check setting. It now correctly creates
+   its tcp subcheck, pointed at the configured proxy instead of the target url
+   host.
+
 1.5.1 (2018-06-07)
 ------------------
 
 
=== modified file 'conn_check/checks.py'
--- conn_check/checks.py	2018-06-04 09:26:14 +0000
+++ conn_check/checks.py	2021-02-17 11:29:08 +0000
@@ -222,6 +222,9 @@
     timeout = kwargs.get('timeout', None)
     expected_code = int(expected_code)
 
+    if proxy_url:
+        proxy_host, proxy_port, _ = extract_host_port(proxy_url)
+
     if proxy_host:
         subchecks.append(make_tcp_check(proxy_host, proxy_port,
                                         timeout=timeout))
 
=== modified file 'conn_check/version.txt'
--- conn_check/version.txt	2018-06-13 16:39:38 +0000
+++ conn_check/version.txt	2021-02-17 11:29:08 +0000
@@ -1,1 +1,1 @@
-1.5.1
+1.5.2
 
=== modified file 'tests.py'
--- tests.py	2018-06-04 14:15:00 +0000
+++ tests.py	2021-02-17 11:29:08 +0000
@@ -149,6 +149,49 @@
         self.assertThat(wrapped.subchecks[1],
                 FunctionCheckMatcher('', 'GET https://localhost/'))
 
+    def test_make_http_check_proxy_url(self):
+        result = make_http_check(
+            'http://localhost/', proxy_url='http://my.proxy:3128/')
+        self.assertIsInstance(result, PrefixCheckWrapper)
+        self.assertEqual(result.prefix, 'http:http://localhost/:')
+        wrapped = result.wrapped
+        self.assertIsInstance(wrapped, MultiCheck)
+        self.assertIs(wrapped.strategy, sequential_strategy)
+        self.assertEqual(len(wrapped.subchecks), 2)
+        self.assertThat(wrapped.subchecks[0],
+                FunctionCheckMatcher('tcp:my.proxy:3128', 'my.proxy:3128'))
+        self.assertThat(wrapped.subchecks[1],
+                FunctionCheckMatcher('', 'GET http://localhost/'))
+
+    def test_make_http_check_proxy_host_port(self):
+        result = make_http_check(
+            'http://localhost/', proxy_host='my.proxy', proxy_port='8080')
+        self.assertIsInstance(result, PrefixCheckWrapper)
+        self.assertEqual(result.prefix, 'http:http://localhost/:')
+        wrapped = result.wrapped
+        self.assertIsInstance(wrapped, MultiCheck)
+        self.assertIs(wrapped.strategy, sequential_strategy)
+        self.assertEqual(len(wrapped.subchecks), 2)
+        self.assertThat(wrapped.subchecks[0],
+                FunctionCheckMatcher('tcp:my.proxy:8080', 'my.proxy:8080'))
+        self.assertThat(wrapped.subchecks[1],
+                FunctionCheckMatcher('', 'GET http://localhost/'))
+
+    def test_make_http_check_proxy_url_overrides_proxy_host_port(self):
+        result = make_http_check(
+            'http://localhost/', proxy_url='http://my.proxy:3128/',
+            proxy_host='host-proxy', proxy_port=8080)
+        self.assertIsInstance(result, PrefixCheckWrapper)
+        self.assertEqual(result.prefix, 'http:http://localhost/:')
+        wrapped = result.wrapped
+        self.assertIsInstance(wrapped, MultiCheck)
+        self.assertIs(wrapped.strategy, sequential_strategy)
+        self.assertEqual(len(wrapped.subchecks), 2)
+        self.assertThat(wrapped.subchecks[0],
+                FunctionCheckMatcher('tcp:my.proxy:3128', 'my.proxy:3128'))
+        self.assertThat(wrapped.subchecks[1],
+                FunctionCheckMatcher('', 'GET http://localhost/'))
+
     def test_make_amqp_check(self):
         result = make_amqp_check('localhost', 8080, 'foo',
                                  'bar', use_tls=True, vhost='/')