feat(selector): select based on kork's RequestContext (#1038)

* feat(selector): select based on kork's RequestContext

* chore(context): RequestContext is now unused, delete it

* fix(selector): fix typo and add log statement

.editorconfig

@@ -7,3 +7,4 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = space
 indent_size = 2
+continuation_indent_size = 4

gate-web/src/main/groovy/com/netflix/spinnaker/gate/config/GateConfig.groovy

@@ -37,6 +37,8 @@ import com.netflix.spinnaker.gate.retrofit.Slf4jRetrofitLogger
 import com.netflix.spinnaker.gate.services.EurekaLookupService
 import com.netflix.spinnaker.gate.services.internal.*
 import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService
+import com.netflix.spinnaker.kork.web.context.AuthenticatedRequestContextProvider
+import com.netflix.spinnaker.kork.web.context.RequestContextProvider
 import com.netflix.spinnaker.kork.web.selector.DefaultServiceSelector
 import com.netflix.spinnaker.kork.web.selector.SelectableService
 import com.netflix.spinnaker.kork.web.selector.ServiceSelector
@@ -161,8 +163,13 @@ class GateConfig extends RedisHttpSessionConfiguration {
   }
 
   @Bean
-  OrcaServiceSelector orcaServiceSelector(OkHttpClient okHttpClient) {
-    return new OrcaServiceSelector(createClientSelector("orca", OrcaService, okHttpClient))
+  RequestContextProvider requestContextProvider() {
+    return new AuthenticatedRequestContextProvider();
+  }
+
+  @Bean
+  OrcaServiceSelector orcaServiceSelector(OkHttpClient okHttpClient, RequestContextProvider contextProvider) {
+    return new OrcaServiceSelector(createClientSelector("orca", OrcaService, okHttpClient), contextProvider)
   }
 
   @Bean
@@ -191,7 +198,9 @@ class GateConfig extends RedisHttpSessionConfiguration {
   ClouddriverServiceSelector clouddriverServiceSelector(ClouddriverService defaultClouddriverService,
                                                         OkHttpClient okHttpClient,
                                                         DynamicConfigService dynamicConfigService,
-                                                        DynamicRoutingConfigProperties properties) {
+                                                        DynamicRoutingConfigProperties properties,
+                                                        RequestContextProvider contextProvider
+  ) {
     if (serviceConfiguration.getService("clouddriver").getConfig().containsKey("dynamicEndpoints")) {
       def endpoints = (Map<String, String>) serviceConfiguration.getService("clouddriver").getConfig().get("dynamicEndpoints")
       // translates the following config:
@@ -217,11 +226,12 @@ class GateConfig extends RedisHttpSessionConfiguration {
         selectors << new ByUserOriginSelector(service, 2, sourceApp)
       }
 
-      return new ClouddriverServiceSelector(new SelectableService(selectors + defaultSelector), dynamicConfigService)
+      return new ClouddriverServiceSelector(
+          new SelectableService(selectors + defaultSelector), dynamicConfigService, contextProvider)
     }
 
     SelectableService selectableService = createClientSelector("clouddriver", ClouddriverService, okHttpClient)
-    return new ClouddriverServiceSelector(selectableService, dynamicConfigService)
+    return new ClouddriverServiceSelector(selectableService, dynamicConfigService, contextProvider)
   }
 
   //---- semi-optional components:
@@ -347,6 +357,7 @@ class GateConfig extends RedisHttpSessionConfiguration {
 
         def selectorClass = it.config?.selectorClass as Class<ServiceSelector>
         if (selectorClass) {
+          log.debug("Initializing selector class {} with baseUrl={}, priority={}, config={}", selectorClass, it.baseUrl, it.priority, it.config)
           selector = selectorClass.getConstructors()[0].newInstance(
             selector.service, it.priority, it.config
           )

gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/CapabilitiesController.java

@@ -16,13 +16,14 @@
 
 package com.netflix.spinnaker.gate.controllers;
 
-import com.netflix.spinnaker.gate.security.RequestContext;
 import com.netflix.spinnaker.gate.services.internal.OrcaServiceSelector;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/capabilities")
@@ -34,14 +35,14 @@ public class CapabilitiesController {
   @ApiOperation(value = "Retrieve the list configured deployment monitors", response = List.class)
   @GetMapping(value = "/deploymentMonitors")
   List<Object> getDeploymentMonitors() {
-    return orcaService.withContext(RequestContext.get()).getDeploymentMonitors();
+    return orcaService.select().getDeploymentMonitors();
   }
 
   @ApiOperation(
       value = "Retrieve the SpEL expression capabilities (e.g. registered functions, etc)",
       response = Map.class)
   @GetMapping(value = "/expressions")
   Map getExpressionCapabilities() {
-    return orcaService.withContext(RequestContext.get()).getExpressionCapabilities();
+    return orcaService.select().getExpressionCapabilities();
   }
 }

gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/ConcourseController.java

@@ -16,7 +16,6 @@
 
 package com.netflix.spinnaker.gate.controllers;
 
-import com.netflix.spinnaker.gate.security.RequestContext;
 import com.netflix.spinnaker.gate.services.internal.IgorService;
 import com.netflix.spinnaker.gate.services.internal.OrcaServiceSelector;
 import io.swagger.annotations.ApiOperation;
@@ -81,8 +80,6 @@ void stageExecution(
       @RequestParam("stageId") String stageId,
       @RequestParam("job") String job,
       @RequestParam("buildNumber") Integer buildNumber) {
-    orcaService
-        .withContext(RequestContext.get())
-        .concourseStageExecution(stageId, job, buildNumber, "");
+    orcaService.select().concourseStageExecution(stageId, job, buildNumber, "");
   }
 }

gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/ExecutionsController.java

@@ -15,18 +15,13 @@
  */
 package com.netflix.spinnaker.gate.controllers;
 
-import com.netflix.spinnaker.gate.security.RequestContext;
 import com.netflix.spinnaker.gate.services.internal.OrcaServiceSelector;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import java.util.Collections;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-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;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 public class ExecutionsController {
@@ -74,7 +69,7 @@ List getLatestExecutionsByConfigIds(
     }
 
     return orcaServiceSelector
-        .withContext(RequestContext.get())
+        .select()
         .getSubsetOfExecutions(pipelineConfigIds, executionIds, limit, statuses, expand);
   }
 
@@ -151,7 +146,7 @@ List searchForPipelineExecutionsByTrigger(
           @RequestParam(value = "expand", defaultValue = "false")
           boolean expand) {
     return orcaServiceSelector
-        .withContext(RequestContext.get())
+        .select()
         .searchForPipelineExecutionsByTrigger(
             application,
             triggerTypes,

gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/PipelineConfigController.groovy

@@ -17,7 +17,7 @@
 
 package com.netflix.spinnaker.gate.controllers
 
-import com.netflix.spinnaker.gate.security.RequestContext
+
 import com.netflix.spinnaker.gate.services.commands.HystrixFactory
 import com.netflix.spinnaker.gate.services.internal.Front50Service
 import com.netflix.spinnaker.gate.services.internal.OrcaServiceSelector
@@ -67,7 +67,7 @@ class PipelineConfigController {
     if (pipelineConfig == null) {
       throw new NotFoundException("Pipeline config '${pipelineConfigId}' could not be found")
     }
-    String template = orcaServiceSelector.withContext(RequestContext.get()).convertToPipelineTemplate(pipelineConfig).body.in().text
+    String template = orcaServiceSelector.select().convertToPipelineTemplate(pipelineConfig).body.in().text
     return template
   }
 }

gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/SubnetController.groovy

@@ -30,8 +30,7 @@ class SubnetController {
 
   @ApiOperation(value = "Retrieve a list of subnets for a given cloud provider", response = List.class)
   @RequestMapping(value = "/{cloudProvider}", method = RequestMethod.GET)
-  List<Map> allByCloudProvider(@PathVariable String cloudProvider,
-                               @RequestHeader(value = "X-RateLimit-App", required = false) String sourceApp) {
-    clouddriverServiceSelector.select(sourceApp).getSubnets(cloudProvider)
+  List<Map> allByCloudProvider(@PathVariable String cloudProvider) {
+    clouddriverServiceSelector.select().getSubnets(cloudProvider)
   }
 }

gate-web/src/main/groovy/com/netflix/spinnaker/gate/interceptors/RequestIdInterceptor.java

@@ -16,7 +16,7 @@
 
 package com.netflix.spinnaker.gate.interceptors;
 
-import static com.netflix.spinnaker.security.AuthenticatedRequest.Header.REQUEST_ID;
+import static com.netflix.spinnaker.kork.common.Header.REQUEST_ID;
 
 import com.netflix.spinnaker.security.AuthenticatedRequest;
 import javax.servlet.http.HttpServletRequest;

gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/ArtifactService.java

@@ -66,16 +66,14 @@ private static HystrixCommand<Map<String, Object>> mapCommand(
 
   public List<Map> getArtifactCredentials(String selectorKey) {
     return mapListCommand(
-            "artifactCredentials",
-            clouddriverServiceSelector.select(selectorKey)::getArtifactCredentials)
+            "artifactCredentials", clouddriverServiceSelector.select()::getArtifactCredentials)
         .execute();
   }
 
   public List<String> getArtifactNames(String selectorKey, String accountName, String type) {
     return stringListCommand(
             "artifactNames",
-            () ->
-                clouddriverServiceSelector.select(selectorKey).getArtifactNames(accountName, type))
+            () -> clouddriverServiceSelector.select().getArtifactNames(accountName, type))
         .execute();
   }
 
@@ -85,7 +83,7 @@ public List<String> getArtifactVersions(
             "artifactVersions",
             () ->
                 clouddriverServiceSelector
-                    .select(selectorKey)
+                    .select()
                     .getArtifactVersions(accountName, type, artifactName))
         .execute();
   }
@@ -96,7 +94,7 @@ public Void getArtifactContents(
             "artifactContents",
             () -> {
               Response contentResponse =
-                  clouddriverServiceSelector.select(selectorKey).getArtifactContent(artifact);
+                  clouddriverServiceSelector.select().getArtifactContent(artifact);
               IOUtils.copy(contentResponse.getBody().in(), outputStream);
               return null;
             })

gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/CertificateService.groovy

@@ -44,13 +44,13 @@ class CertificateService {
 
   List<Map> getCertificates(String selectorKey) {
     listCommand("certificates") {
-      clouddriverServiceSelector.select(selectorKey).getCertificates()
+      clouddriverServiceSelector.select().getCertificates()
     } execute()
   }
 
   List<Map> getCertificates(String cloudProvider, String selectorKey) {
     listCommand("certificates-$cloudProvider") {
-      clouddriverServiceSelector.select(selectorKey).getCertificates(cloudProvider)
+      clouddriverServiceSelector.select().getCertificates(cloudProvider)
     } execute()
   }
 }

gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/CloudMetricService.groovy

@@ -33,14 +33,14 @@ class CloudMetricService {
 
   List<Map> findAll(String cloudProvider, String account, String region, Map<String, String> filters, String selectorKey) {
     HystrixFactory.newListCommand(GROUP, "$GROUP:$account:$region:findAll") {
-      clouddriverServiceSelector.select(selectorKey).findAllCloudMetrics(cloudProvider, account, region, filters)
+      clouddriverServiceSelector.select().findAllCloudMetrics(cloudProvider, account, region, filters)
     } execute()
   }
 
   Map getStatistics(String cloudProvider, String account, String region, String metricName,
                     Long startTime, Long endTime, Map<String, String> filters, String selectorKey) {
     HystrixFactory.newMapCommand(GROUP, "$GROUP:$account:$region:getStatistics") {
-      clouddriverServiceSelector.select(selectorKey).getCloudMetricStatistics(cloudProvider, account, region, metricName, startTime, endTime, filters)
+      clouddriverServiceSelector.select().getCloudMetricStatistics(cloudProvider, account, region, metricName, startTime, endTime, filters)
     } execute()
   }
 }

gate-web/src/main/groovy/com/netflix/spinnaker/gate/services/ClusterService.groovy

@@ -40,20 +40,20 @@ class ClusterService {
 
   Map getClusters(String app, String selectorKey) {
     HystrixFactory.newMapCommand(GROUP, "getClustersForApplication") {
-      clouddriverServiceSelector.select(selectorKey).getClusters(app)
+      clouddriverServiceSelector.select().getClusters(app)
     } execute()
   }
 
   List<Map> getClustersForAccount(String app, String account, String selectorKey) {
     HystrixFactory.newListCommand(GROUP, "getClustersForApplicationInAccount-${providerLookupService.providerForAccount(account)}") {
-      clouddriverServiceSelector.select(selectorKey).getClustersForAccount(app, account)
+      clouddriverServiceSelector.select().getClustersForAccount(app, account)
     } execute()
   }
 
   Map getCluster(String app, String account, String clusterName, String selectorKey) {
     HystrixFactory.newMapCommand(GROUP, "getCluster-${providerLookupService.providerForAccount(account)}") {
       try {
-        clouddriverServiceSelector.select(selectorKey).getCluster(app, account, clusterName)?.getAt(0) as Map
+        clouddriverServiceSelector.select().getCluster(app, account, clusterName)?.getAt(0) as Map
       } catch (RetrofitError e) {
         if (e.response?.status == 404) {
           return [:]
@@ -70,14 +70,14 @@ class ClusterService {
 
   List<Map> getScalingActivities(String app, String account, String clusterName, String serverGroupName, String provider, String region, String selectorKey) {
     HystrixFactory.newListCommand(GROUP, "getScalingActivitiesForCluster-${providerLookupService.providerForAccount(account)}") {
-      clouddriverServiceSelector.select(selectorKey).getScalingActivities(app, account, clusterName, provider, serverGroupName, region)
+      clouddriverServiceSelector.select().getScalingActivities(app, account, clusterName, provider, serverGroupName, region)
     } execute()
   }
 
   Map getTargetServerGroup(String app, String account, String clusterName, String cloudProviderType, String scope, String target, Boolean onlyEnabled, Boolean validateOldest, String selectorKey) {
     HystrixFactory.newMapCommand(GROUP, "getTargetServerGroup-${providerLookupService.providerForAccount(account)}") {
       try {
-        return clouddriverServiceSelector.select(selectorKey).getTargetServerGroup(app, account, clusterName, cloudProviderType, scope, target, onlyEnabled, validateOldest)
+        return clouddriverServiceSelector.select().getTargetServerGroup(app, account, clusterName, cloudProviderType, scope, target, onlyEnabled, validateOldest)
       } catch (RetrofitError re) {
         if (re.kind == RetrofitError.Kind.HTTP && re.response?.status == 404) {
           throw new ServerGroupNotFound("unable to find $target in $cloudProviderType/$account/$scope/$clusterName")