powerdns: Fix monitor URL publication

Test has been updated, as it was not really testing parameter given to the
user. Currently the situation is not perfect, but good enough.

Real test would require full monitor URL implicit usage understanding which
is out of scope of this test.

software/powerdns/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = 20c37ea06a8fa405bc02470d5115fd11
 
 [template-dns-replicate]
 _update_hash_filename_ = instance-powerdns-replicate.cfg.jinja2
-md5sum = 72ce30bee3b8a9da8ac9be7eb65d83a2
+md5sum = 504d15f0bbf0e515d5ff16070f1ac802
 
 [iso-list]
 _update_hash_filename_ = template/zz.countries.nexedi.dk.rbldnsd

software/powerdns/instance-powerdns-replicate.cfg.jinja2

@@ -122,22 +122,16 @@ config-monitor-username = admin
 config-monitor-password = ${monitor-htpasswd:passwd}
 
 [publish-information]
+<= monitor-publish
 recipe = slapos.cookbook:publish
 slave-amount = {{ slave_instance_list | length }}
 ns-record = {{ ns_record }}
-monitor-url = ${monitor-publish-parameters:monitor-url}
-monitor-user = ${monitor-publish-parameters:monitor-user}
-monitor-password = ${monitor-publish-parameters:monitor-password}
 {% for dns_name, dns_section in zip(dns_list, dns_section_list) -%}
 {%   set dns_ipv6 = '${' ~ dns_section ~ ':connection-powerdns-ipv6}' -%}
 {%   set dns_port = '${' ~ dns_section ~ ':connection-powerdns-port}' -%}
 {{ dns_name }}-ipv6 = {{ dns_ipv6 }}
 {{ dns_name }}-port = {{ dns_port }}
 {% endfor -%}
-{% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
-{% if monitor_interface_url -%}
-monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}
-{%   endif -%}
 
 [buildout]
 

software/powerdns/test/test.py

@@ -32,6 +32,7 @@ import http.client
 import os
 import requests
 import unittest
+import urllib
 
 from slapos.recipe.librecipe import generateHashFromFiles
 from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
@@ -130,11 +131,19 @@ class TestMonitorAccess(PowerDNSTestCase):
   def test(self):
     connection_parameter_dict = self.requestDefaultInstance()\
       .getConnectionParameterDict()
-    monitor_base_url = connection_parameter_dict.get('monitor-url')
+    # special parsing of monitor-setup-url as the URLs there are not really
+    # still, this test does not really check the real monitor-setup-url
+    # but this seems good enough
+    monitor_setup_url = connection_parameter_dict['monitor-setup-url']
+    monitor_base_url = connection_parameter_dict['monitor-base-url']
+    monitor_url_with_auth = 'https' + monitor_setup_url.split('https')[2]
+    parsed_monitor_url = urllib.parse.urlparse(monitor_url_with_auth)
+    auth = urllib.parse.parse_qs(parsed_monitor_url.path)
+
     result = requests.get(
       monitor_base_url, verify=False, auth=(
-        connection_parameter_dict.get('monitor-user'),
-        connection_parameter_dict.get('monitor-password')
+        auth['username'][0],
+        auth['password'][0]
       )
     )