Merge lp:~simpoir/landscape-charm/pass_ping_through_https into lp:~landscape/landscape-charm/trunk

[Simon Poirier]

Add ping service to the https frontend in haproxy.

A few customers have strict no cleartext http policies.
Although not a security issue, the /ping endpoint was only exposed as http.

This branch changes that by also adding the backend to the https services
in haproxy, thus allowing that traffic to also go through https.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 402
Branch: lp:~simpoir/landscape-charm/pass_ping_through_https
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/1362/

review: Approve (test results)

[Daniel Manrique (roadmr)]

+1 thanks

review: Approve

=== modified file 'lib/relations/haproxy.py'
--- lib/relations/haproxy.py	2017-03-20 11:24:41 +0000
+++ lib/relations/haproxy.py	2020-05-15 22:18:31 +0000
@@ -43,10 +43,12 @@
         "acl attachment path_beg -i /attachment",
         "acl api path_beg -i /api",
         "acl prometheus_metrics path_beg -i /metrics",
+        "acl ping path_beg -i /ping",
         "http-request deny if prometheus_metrics",
         "use_backend landscape-message if message",
         "use_backend landscape-message if attachment",
         "use_backend landscape-api if api",
+        "use_backend landscape-ping if ping",
     ],
 }
 SERVER_BASE_PORTS = {

=== modified file 'lib/relations/tests/test_haproxy.py'
--- lib/relations/tests/test_haproxy.py	2017-03-20 11:29:10 +0000
+++ lib/relations/tests/test_haproxy.py	2020-05-15 22:18:31 +0000
@@ -107,10 +107,12 @@
                  "acl attachment path_beg -i /attachment",
                  "acl api path_beg -i /api",
                  "acl prometheus_metrics path_beg -i /metrics",
+                 "acl ping path_beg -i /ping",
                  "http-request deny if prometheus_metrics",
                  "use_backend landscape-message if message",
                  "use_backend landscape-message if attachment",
-                 "use_backend landscape-api if api"],
+                 "use_backend landscape-api if api",
+                 "use_backend landscape-ping if ping"],
              "errorfiles": expected_errorfiles,
              "crts": expected_certs,
              "servers": [
@@ -433,10 +435,12 @@
                 "acl attachment path_beg -i /attachment",
                 "acl api path_beg -i /api",
                 "acl prometheus_metrics path_beg -i /metrics",
+                "acl ping path_beg -i /ping",
                 "http-request deny if prometheus_metrics",
                 "use_backend landscape-message if message",
                 "use_backend landscape-message if attachment",
                 "use_backend landscape-api if api",
+                "use_backend landscape-ping if ping",
                 "acl pppa-proxy path_beg -i /archive",
                 "reqrep ^([^\\ ]*)\\ /archive/(.*) \\1\\ /\\2",
                 "use_backend landscape-pppa-proxy if pppa-proxy",
@@ -490,10 +494,12 @@
                 "acl attachment path_beg -i /attachment",
                 "acl api path_beg -i /api",
                 "acl prometheus_metrics path_beg -i /metrics",
+                "acl ping path_beg -i /ping",
                 "http-request deny if prometheus_metrics",
                 "use_backend landscape-message if message",
                 "use_backend landscape-message if attachment",
                 "use_backend landscape-api if api",
+                "use_backend landscape-ping if ping",
                 "acl pppa-proxy hdr(host) -i archive.landscape.dev",
                 "use_backend landscape-pppa-proxy if pppa-proxy",
             ],