1 files changed, 21 insertions, 0 deletions
diff --git a/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/FeedClientBuilder.java b/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/FeedClientBuilder.java
index 02dabaf9ef8..b5b6874ded9 100644
--- a/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/FeedClientBuilder.java
+++ b/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/FeedClientBuilder.java
@@ -69,6 +69,9 @@ public interface FeedClientBuilder {
     /** Sets {@link HostnameVerifier} instance (e.g for disabling default SSL hostname verification). */
     FeedClientBuilder setHostnameVerifier(HostnameVerifier verifier);
 
+    /** Sets {@link HostnameVerifier} instance for proxy (e.g for disabling default SSL hostname verification). */
+    FeedClientBuilder setProxyHostnameVerifier(HostnameVerifier verifier);
+
     /** Turns off benchmarking. Attempting to get {@link FeedClient#stats()} will result in an exception. */
     FeedClientBuilder noBenchmarking();
 
@@ -81,6 +84,15 @@ public interface FeedClientBuilder {
      */
     FeedClientBuilder addRequestHeader(String name, Supplier<String> valueSupplier);
 
+    /** Adds HTTP request header to all proxy requests. */
+    FeedClientBuilder addProxyRequestHeader(String name, String value);
+
+    /**
+     * Adds HTTP request header to all proxy requests. Value {@link Supplier} is invoked for each HTTP request,
+     * i.e. value can be dynamically updated for each new proxy connection.
+     */
+    FeedClientBuilder addProxyRequestHeader(String name, Supplier<String> valueSupplier);
+
     /**
      * Overrides default retry strategy.
      * @see FeedClient.RetryStrategy
@@ -114,9 +126,18 @@ public interface FeedClientBuilder {
      */
     FeedClientBuilder setCaCertificatesFile(Path caCertificatesFile);
 
+    /**
+     * Overrides JVM default SSL truststore for proxy
+     * @param caCertificatesFile Path to PEM encoded file containing trusted certificates
+     */
+    FeedClientBuilder setProxyCaCertificatesFile(Path caCertificatesFile);
+
     /** Overrides JVM default SSL truststore */
     FeedClientBuilder setCaCertificates(Collection<X509Certificate> caCertificates);
 
+    /** Overrides JVM default SSL truststore for proxy */
+    FeedClientBuilder setProxyCaCertificates(Collection<X509Certificate> caCertificates);
+
     /** Overrides endpoint URIs for this client */
     FeedClientBuilder setEndpointUris(List<URI> endpoints);