/*
 *
 *  * Copyright 2017 Lookout, Inc.
 *  *
 *  * Licensed under the Apache License, Version 2.0 (the "License");
 *  * you may not use this file except in compliance with the License.
 *  * You may obtain a copy of the License at
 *  *
 *  *    http://www.apache.org/licenses/LICENSE-2.0
 *  *
 *  * Unless required by applicable law or agreed to in writing, software
 *  * distributed under the License is distributed on an "AS IS" BASIS,
 *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *  * See the License for the specific language governing permissions and
 *  * limitations under the License.
 *
 */

package com.netflix.spinnaker.clouddriver.ecs.controllers;

import com.netflix.spinnaker.clouddriver.ecs.provider.view.EcsServerClusterProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

@RestController
public class EcsClusterController {

  EcsServerClusterProvider ecsServerClusterProvider;

  @Autowired
  public EcsClusterController(EcsServerClusterProvider ecsServerClusterProvider) {
    this.ecsServerClusterProvider = ecsServerClusterProvider;
  }


  @RequestMapping(value = "/ecs/{account}/{region}/ecscluster")
  public List<String> findEcsClusters(String account, String region) {
    return ecsServerClusterProvider.getEcsClusters(account, region);
  }

}

@@ -843,16 +843,77 @@
 owired;%0A
+import org.springframework.web.bind.annotation.PathVariable;%0A
 import o
@@ -1432,23 +1432,110 @@
 ers(
-String account,
+@PathVariable(%22account%22) String account,%0A                                      @PathVariable(%22region%22)
  Str

Fix merge issues