diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/V2CanaryController.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/V2CanaryController.groovy index 7ada472fff..c2f093f45b 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/V2CanaryController.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/V2CanaryController.groovy @@ -103,10 +103,11 @@ class V2CanaryController { @RequestMapping(value = '/{application}/executions', method = RequestMethod.GET) List getCanaryResultsByApplication(@PathVariable String application, @RequestParam(value='limit') int limit, + @RequestParam(value='page', defaultValue='1') int page, @ApiParam('Comma-separated list of statuses, e.g.: RUNNING, SUCCEEDED, TERMINAL') @RequestParam(value='statuses', required = false) String statuses, @RequestParam(value='storageAccountName', required = false) String storageAccountName) { - v2CanaryService.getCanaryResultsByApplication(application, limit, statuses, storageAccountName) + v2CanaryService.getCanaryResultsByApplication(application, limit, page, statuses, storageAccountName) } // TODO(dpeach): remove this endpoint when a Kayenta endpoint for diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/V2CanaryService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/V2CanaryService.groovy index 33b61c2c46..bd897d27b9 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/V2CanaryService.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/V2CanaryService.groovy @@ -101,9 +101,9 @@ class V2CanaryService { } } - List getCanaryResultsByApplication(String application, int limit, String statuses, String storageAccountName) { + List getCanaryResultsByApplication(String application, int limit, int page, String statuses, String storageAccountName) { try { - return kayentaService.getCanaryResultsByApplication(application, limit, statuses, storageAccountName) + return kayentaService.getCanaryResultsByApplication(application, limit, page, statuses, storageAccountName) } catch (RetrofitError error) { throw classifyError(error) } diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/KayentaService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/KayentaService.groovy index 9df4b33be7..7d0a338be7 100644 --- a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/KayentaService.groovy +++ b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/internal/KayentaService.groovy @@ -74,6 +74,7 @@ interface KayentaService { @GET("/canary/executions") List getCanaryResultsByApplication(@Query("application") String application, @Query("limit") int limit, + @Query("page") int page, @Query("statuses") String statuses, @Query("storageAccountName") String storageAccountName)