feat(v2-canary): add application query param to config list endpoint

spinnaker · Oct 27, 2017 · beadc6e · beadc6e
1 parent c43ebf5
commit beadc6e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/...eb/src/main/groovy/com/netflix/spinnaker/gate/controllers/V2CanaryConfigController.groovy b/...eb/src/main/groovy/com/netflix/spinnaker/gate/controllers/V2CanaryConfigController.groovy
@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestMethod
+import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 
 @RestController
@@ -36,8 +37,8 @@ class V2CanaryConfigController {
 
   @ApiOperation(value = "Retrieve a list of canary configurations")
   @RequestMapping(method = RequestMethod.GET)
-  List getCanaryConfigs() {
-    canaryConfigService.getCanaryConfigs()
+  List getCanaryConfigs(@RequestParam(value = "application", required = false) String application) {
+    canaryConfigService.getCanaryConfigs(application)
   }
 
   @ApiOperation(value = "Retrieve a canary configuration by id")

diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/CanaryConfigService.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/CanaryConfigService.groovy
@@ -17,7 +17,7 @@
 package com.netflix.spinnaker.gate.services
 
 interface CanaryConfigService {
-  List getCanaryConfigs()
+  List getCanaryConfigs(String application)
   Map getCanaryConfig(String id)
   String createCanaryConfig(Map config)
   String updateCanaryConfig(String id, Map config)

diff --git a/...web/src/main/groovy/com/netflix/spinnaker/gate/services/KayentaCanaryConfigService.groovy b/...web/src/main/groovy/com/netflix/spinnaker/gate/services/KayentaCanaryConfigService.groovy
@@ -37,9 +37,9 @@ class KayentaCanaryConfigService implements CanaryConfigService {
   @Autowired
   KayentaService kayentaService
 
-  List getCanaryConfigs() {
+  List getCanaryConfigs(String application) {
     HystrixFactory.newListCommand(GROUP, "getCanaryConfigs") {
-      kayentaService.getCanaryConfigs()
+      kayentaService.getCanaryConfigs(application)
     } execute()
   }
 

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
@@ -24,7 +24,7 @@ interface KayentaService {
   List getCredentials()
 
   @GET("/canaryConfig")
-  List getCanaryConfigs()
+  List getCanaryConfigs(@Query("application") String application)
 
   @GET("/canaryConfig/{id}")
   Map getCanaryConfig(@Path("id") String id)