Merge ~addyess/charm-thruk-agent:lp1849578-enable_https_without_http into charm-thruk-agent:master

[Adam Dyess]

symlink the thruk cookie to /etc/apache2/vhost.d/ so it can be included by nagios vhost config

[Adam Dyess (addyess)]

Couldn't lint the project --> Updated to support linting, fixed lint errors
Updated charmhelpers to support python 3.8.
Non-Standard Unit testing --> Updated to support pytest
Non-Standard Functional testing --> Updated to remove amulet tests
   Added two more tests to functional testing
   Extended to test xenial and bionic (not focal -- it doesn't work)

And FINALLY --
create a directory /etc/apache2/vhost.d/
so that subordinate charms can add *.include files in it -- then ssl vhost config can use those

[Adam Dyess (addyess)]

Please see: https://code.launchpad.net/~addyess/charm-nagios/+git/charm-nagios/+merge/387090

[Adam Dyess (addyess)]

CI like results: https://paste.ubuntu.com/p/WzN5N36Tty/

[Chris Sanders (chris.sanders)]

The change looks good, looking at that unit test. Is that a coverage report of the built in site-packages? Those should be excluded, but more importantly are there any local unit tests at all?

I don't think adding a completely missing unit test framework is in-scope for fixing this bug but wanted to be sure we were both in alignment that there doesn't appear to be any actual tests in that test output.

review: Needs Information

[Adam Dyess (addyess)]

Yes, you are correct that thruk-agent has an embarrassingly pitiful amount of unit test coverage.

There is one test, but it is not being correctly run under this environment. You can see that I fixed that in another MR (https://code.launchpad.net/~addyess/charm-thruk-agent/+git/charm-thruk-agent/+merge/387134) which has already been approved

[Chris Sanders (chris.sanders)]

Alright then, glad there's already another fix for the one existing test.

review: Approve

diff --git a/hooks/actions.py b/hooks/actions.py
index 440fa5b..00f8eb5 100644
--- a/hooks/actions.py
+++ b/hooks/actions.py
@@ -91,6 +91,25 @@ def notify_thrukmaster_relation(service_name):
         hookenv.relation_set(relation_id=rel_id, relation_settings=thruk_data)
 
 
+def install_cookie_into_apache2():
+    """Activate cookie in existing default virtual hosts."""
+    thruk_cookie = "/etc/apache2/vhost.d/thruk_cookie_auth.include"
+    try:
+        os.makedirs('/etc/apache2/vhost.d/')
+    except OSError:
+        pass
+
+    try:
+        os.remove(thruk_cookie)
+    except OSError:
+        pass
+
+    os.symlink(
+        "/usr/share/thruk/thruk_cookie_auth.include",
+        thruk_cookie
+    )
+
+
 def update_ppa(service_name):
     config = hookenv.config()
     prev_source = config.previous('source')
@@ -106,6 +125,7 @@ def update_ppa(service_name):
     pkgs_to_install = filter_installed_packages(PACKAGE_LIST)
     if pkgs_to_install:
         apt_install(packages=pkgs_to_install, fatal=True)
+    install_cookie_into_apache2()
 
 
 def update_status(service_name):