Revert "API: url in zone info should be absolute"

This reverts commit 9df0238e1b567cdd7c48185b00160fb952c3e9f4.

See #5030

diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index e3d0ac96f69698c72cd37969450346f4a2b06286..c1fb9fad1b659cc881af14512c5c8bb596d826cb 100644 (file)
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -311,7 +311,7 @@ static Json::object getZoneInfo(const DomainInfo& di) {
   return Json::object {
     // id is the canonical lookup key, which doesn't actually match the name (in some cases)
     { "id", zoneId },
-    { "url", "/api/v1/servers/localhost/zones/" + zoneId },
+    { "url", "api/v1/servers/localhost/zones/" + zoneId },
     { "name", di.zone.toString() },
     { "kind", di.getKindString() },
     { "dnssec", dk.isSecuredZone(di.zone) },

diff --git a/regression-tests.api/test_Zones.py b/regression-tests.api/test_Zones.py
index 5ebb4d1624bba74c017bd7538329dd5da20c8a57..72aa59e480f96df98ea0fd2a746951f76dfcdbcb 100644 (file)
--- a/regression-tests.api/test_Zones.py
+++ b/regression-tests.api/test_Zones.py
@@ -337,13 +337,6 @@ class AuthZones(ApiTestCase, AuthZonesHelperMixin):
             headers={'content-type': 'application/json'})
         self.assertEquals(r.status_code, 422)
 
-    def test_zone_absolute_url(self):
-        name, payload, data = self.create_zone()
-        r = self.session.get(self.url("/api/v1/servers/localhost/zones"))
-        rdata = r.json()
-        print(rdata[0])
-        self.assertTrue(rdata[0]['url'].startswith('/api/v'))
-
     def test_create_slave_zone(self):
         # Test that nameservers can be absent for slave zones.
         name, payload, data = self.create_zone(kind='Slave', nameservers=None, masters=['127.0.0.2'])