fix(front50): Add SpinnakerRequestInterceptor to Front50 OkHttpClient (…

…#816)

* fix(front50): Add SpinnakerRequestInterceptor to Front50 OkHttpClient

Currently, Front50 OkHttpClient in Echo does not propagate the AuthenticationRequest Headers to Front50 on API calls. 

Reason for the above behaviour is due to Front50 Client created without SpinnakerRequestInterceptor. This interceptor ensures Auth Headers are propagated as part of request headers on Http calls.

* fix(igor): Use SpinnakerRequestInterceptor in Igor OkHttpClient

Co-authored-by: Deepak <deepak.ramakrishna@grabtaxi.com>

echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/config/IgorConfig.java

@@ -18,6 +18,7 @@
 
 import com.jakewharton.retrofit.Ok3Client;
 import com.netflix.spinnaker.echo.services.IgorService;
+import com.netflix.spinnaker.okhttp.SpinnakerRequestInterceptor;
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -26,7 +27,6 @@
 import org.springframework.context.annotation.Configuration;
 import retrofit.Endpoint;
 import retrofit.Endpoints;
-import retrofit.RequestInterceptor;
 import retrofit.RestAdapter.Builder;
 import retrofit.RestAdapter.LogLevel;
 import retrofit.converter.JacksonConverter;
@@ -45,7 +45,7 @@ public IgorService igorService(
       Endpoint igorEndpoint,
       Ok3Client ok3Client,
       LogLevel retrofitLogLevel,
-      RequestInterceptor spinnakerRequestInterceptor) {
+      SpinnakerRequestInterceptor spinnakerRequestInterceptor) {
     log.info("igor service loaded");
     return new Builder()
         .setEndpoint(igorEndpoint)

echo-web/src/main/java/com/netflix/spinnaker/echo/config/Front50Config.java

@@ -18,6 +18,7 @@
 
 import com.netflix.spinnaker.config.OkHttpClientConfiguration;
 import com.netflix.spinnaker.echo.services.Front50Service;
+import com.netflix.spinnaker.okhttp.SpinnakerRequestInterceptor;
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
 import com.squareup.okhttp.ConnectionPool;
 import com.squareup.okhttp.OkHttpClient;
@@ -64,13 +65,17 @@ public Endpoint front50Endpoint(@Value("${front50.base-url}") String front50Base
 
   @Bean
   public Front50Service front50Service(
-      Endpoint front50Endpoint, OkHttpClient okHttpClient, LogLevel retrofitLogLevel) {
+      Endpoint front50Endpoint,
+      OkHttpClient okHttpClient,
+      LogLevel retrofitLogLevel,
+      SpinnakerRequestInterceptor spinnakerRequestInterceptor) {
     log.info("front50 service loaded");
 
     return new Builder()
         .setEndpoint(front50Endpoint)
         .setConverter(new JacksonConverter())
         .setClient(new OkClient(okHttpClient))
+        .setRequestInterceptor(spinnakerRequestInterceptor)
         .setLogLevel(retrofitLogLevel)
         .setLog(new Slf4jRetrofitLogger(Front50Service.class))
         .build()