fix(webhook): Supply additional context when fetching RestTemplate (#…

…3045) This supports the use-case of needing a specific `RestTemplate` per url.
spinnaker · Jul 17, 2019 · 7141c02 · 7141c02
1 parent a966ce2
commit 7141c02
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...c/main/groovy/com/netflix/spinnaker/orca/webhook/service/DefaultRestTemplateProvider.java b/...c/main/groovy/com/netflix/spinnaker/orca/webhook/service/DefaultRestTemplateProvider.java
@@ -37,7 +37,7 @@ public boolean supports(String targetUrl) {
   }
 
   @Override
-  public RestTemplate getRestTemplate() {
+  public RestTemplate getRestTemplate(String targetUrl) {
     return restTemplate;
   }
 }
diff --git a/...hook/src/main/groovy/com/netflix/spinnaker/orca/webhook/service/RestTemplateProvider.java b/...hook/src/main/groovy/com/netflix/spinnaker/orca/webhook/service/RestTemplateProvider.java
@@ -35,5 +35,5 @@ default String getTargetUrl(String targetUrl) {
   }
 
   /** @return a configured {@code RestTemplate} */
-  RestTemplate getRestTemplate();
+  RestTemplate getRestTemplate(String targetUrl);
 }
diff --git a/...-webhook/src/main/groovy/com/netflix/spinnaker/orca/webhook/service/WebhookService.groovy b/...-webhook/src/main/groovy/com/netflix/spinnaker/orca/webhook/service/WebhookService.groovy
@@ -57,7 +57,7 @@ class WebhookService {
     )
     HttpHeaders headers = buildHttpHeaders(customHeaders)
     HttpEntity<Object> payloadEntity = new HttpEntity<>(payload, headers)
-    return restTemplateProvider.getRestTemplate().exchange(validatedUri, httpMethod, payloadEntity, Object)
+    return restTemplateProvider.getRestTemplate(url).exchange(validatedUri, httpMethod, payloadEntity, Object)
   }
 
   ResponseEntity<Object> getStatus(String url, Object customHeaders) {