arangodb · jsteemann · Jul 1, 2021 · Jun 29, 2021 · Jun 29, 2021 · Jun 29, 2021
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,9 @@
 devel
 -----
 
+* Removed redirects from /_admin/cluster* to /_admin/cluster/*. Adjusted
+  internal requests to use the new url.
+
 * Fix display of running and slow queries in web UI when there are multiple
   coordinators. Previously, the display order of queries was undefined, which
   could lead to queries from one coordinator being display on top once and

@@ -2,7 +2,7 @@
 @startDocuBlock get_cluster_statistics
 @brief allows to query the statistics of a DB-Server in the cluster
 
-@RESTHEADER{GET /_admin/clusterStatistics, Queries statistics of a DB-Server}
+@RESTHEADER{GET /_admin/cluster/statistics, Queries statistics of a DB-Server}
 
 @RESTQUERYPARAMETERS
 
@@ -13,10 +13,12 @@ Queries the statistics of the given DB-Server
 
 @RESTRETURNCODES
 
-@RESTRETURNCODE{200} is returned when everything went well.
+@RESTRETURNCODE{200} 
+is returned when everything went well.
 
-@RESTRETURNCODE{400} the parameter DBserver was not given or is not the
-ID of a DB-Server
+@RESTRETURNCODE{400} 
+the parameter DBserver was not given or is not the ID of a DB-Server
 
-@RESTRETURNCODE{403} server is not a Coordinator.
+@RESTRETURNCODE{403} 
+server is not a DB-Server.
 @endDocuBlock
diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt
@@ -714,7 +714,6 @@ set(LIB_ARANGOSERVER_SOURCES
   RestHandler/RestPleaseUpgradeHandler.cpp
   RestHandler/RestQueryCacheHandler.cpp
   RestHandler/RestQueryHandler.cpp
-  RestHandler/RestRedirectHandler.cpp
   RestHandler/RestShutdownHandler.cpp
   RestHandler/RestSimpleHandler.cpp
   RestHandler/RestSimpleQueryHandler.cpp

diff --git a/arangod/GeneralServer/GeneralServerFeature.cpp b/arangod/GeneralServer/GeneralServerFeature.cpp
@@ -82,7 +82,6 @@
 #include "RestHandler/RestPregelHandler.h"
 #include "RestHandler/RestQueryCacheHandler.h"
 #include "RestHandler/RestQueryHandler.h"
-#include "RestHandler/RestRedirectHandler.h"
 #include "RestHandler/RestShutdownHandler.h"
 #include "RestHandler/RestSimpleHandler.h"
 #include "RestHandler/RestSimpleQueryHandler.h"
@@ -631,22 +630,6 @@ void GeneralServerFeature::defineHandlers() {
 
   _handlerFactory->addPrefixHandler("/", RestHandlerCreator<RestActionHandler>::createNoData);
 
-  // ...........................................................................
-  // redirects
-  // ...........................................................................
-
-  // UGLY HACK INCOMING!
-
-#define ADD_REDIRECT(from, to) do{_handlerFactory->addPrefixHandler(from, \
-                                    RestHandlerCreator<RestRedirectHandler>::createData<const char*>, \
-                                    (void*) to);}while(0)
-
-  ADD_REDIRECT("/_admin/clusterNodeVersion", "/_admin/cluster/nodeVersion");
-  ADD_REDIRECT("/_admin/clusterNodeEngine", "/_admin/cluster/nodeEngine");
-  ADD_REDIRECT("/_admin/clusterNodeStats", "/_admin/cluster/nodeStatistics");
-  ADD_REDIRECT("/_admin/clusterStatistics", "/_admin/cluster/statistics");
-
-
   // engine specific handlers
   StorageEngine& engine = server().getFeature<EngineSelectorFeature>().engine();
   engine.addRestHandlers(*_handlerFactory);

diff --git a/arangod/RestHandler/RestRedirectHandler.cpp b/arangod/RestHandler/RestRedirectHandler.cpp
diff --git a/arangod/RestHandler/RestRedirectHandler.h b/arangod/RestHandler/RestRedirectHandler.h
@@ -129,7 +129,7 @@
         var stat = new window.Statistics({name: dbserver.id});
         stat.url = coord.get('protocol') + '://' +
         coord.get('address') +
-        '/_admin/clusterStatistics?DBserver=' +
+        '/_admin/cluster/statistics?DBserver=' +
         dbserver.get('name');
         self.statCollectDBS.add(stat);
       });

@@ -331,7 +331,7 @@
 
         stat.url = coord.get('protocol') + '://' +
         coord.get('address') +
-            '/_admin/clusterStatistics?DBserver=' +
+        '/_admin/cluster/statistics?DBserver=' +
         dbserver.get('name');
 
         statCollect.add(stat);

diff --git a/tests/js/client/authentication/admin-cluster-apis.js b/tests/js/client/authentication/admin-cluster-apis.js
@@ -51,31 +51,19 @@ function AuthSuite() {
   };
 
   let checkClusterNodeVersion = function() {
-    // this will just redirect to a new endpoint
-    let result = arango.GET('/_admin/clusterNodeVersion?ServerID=' + servers[0]);
-    assertEqual(308, result.code);
-
-    result = arango.GET('/_admin/cluster/nodeVersion?ServerID=' + servers[0]);
+    let result = arango.GET('/_admin/cluster/nodeVersion?ServerID=' + servers[0]);
     assertTrue(result.hasOwnProperty('server'), result);
     assertTrue(result.hasOwnProperty('license'), result);
     assertTrue(result.hasOwnProperty('version'), result);
   };
 
   let checkClusterNodeEngine = function() {
-    // this will just redirect to a new endpoint
-    let result = arango.GET('/_admin/clusterNodeEngine?ServerID=' + servers[0]);
-    assertEqual(308, result.code);
-
-    result = arango.GET('/_admin/cluster/nodeEngine?ServerID=' + servers[0]);
+    let result = arango.GET('/_admin/cluster/nodeEngine?ServerID=' + servers[0]);
     assertTrue(result.hasOwnProperty('name'), result);
   };
 
   let checkClusterNodeStats = function() {
-    // this will just redirect to a new endpoint
-    let result = arango.GET('/_admin/clusterNodeStats?ServerID=' + servers[0]);
-    assertEqual(308, result.code);
-
-    result = arango.GET('/_admin/cluster/nodeStatistics?ServerID=' + servers[0]);
+    let result = arango.GET('/_admin/cluster/nodeStatistics?ServerID=' + servers[0]);
     assertTrue(result.hasOwnProperty('time'), result);
     assertTrue(result.hasOwnProperty('system'), result);
   };

diff --git a/tests/js/server/shell/shell-readonly-mode-spec.js b/tests/js/server/shell/shell-readonly-mode-spec.js
@@ -153,10 +153,7 @@ describe('Readonly mode api', function() {
     }
 
     let server = setReadOnlyAndGetDBServer();
-    let resp = download(endpoint + '/_admin/clusterNodeVersion?ServerID=' + server);
-    expect(resp.code).to.equal(308);
-
-    resp = download(endpoint + '/_admin/cluster/nodeVersion?ServerID=' + server);
+    let resp = download(endpoint + '/_admin/cluster/nodeVersion?ServerID=' + server);
     expect(resp.code).to.equal(200);
   });
 
@@ -166,23 +163,17 @@ describe('Readonly mode api', function() {
     }
 
     let server = setReadOnlyAndGetDBServer();
-    let resp = download(endpoint + '/_admin/clusterNodeEngine?ServerID=' + server);
-    expect(resp.code).to.equal(308);
-
-    resp = download(endpoint + '/_admin/cluster/nodeEngine?ServerID=' + server);
+    let resp = download(endpoint + '/_admin/cluster/nodeEngine?ServerID=' + server);
     expect(resp.code).to.equal(200);
   });
 
-  it('can still access cluster/nodeStats API when readonly', function() {
+  it('can still access cluster/nodeStatistics API when readonly', function() {
     if (!isCluster) {
       return;
     }
 
     let server = setReadOnlyAndGetDBServer();
-    let resp = download(endpoint + '/_admin/clusterNodeStats?ServerID=' + server);
-    expect(resp.code).to.equal(308);
-
-    resp = download(endpoint + '/_admin/cluster/nodeStatistics?ServerID=' + server);
+    let resp = download(endpoint + '/_admin/cluster/nodeStatistics?ServerID=' + server);
     expect(resp.code).to.equal(200);
   });