Add port for token connector to nginx config

2 files changed, 8 insertions, 4 deletions

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/DataplaneProxyService.java b/container-disc/src/main/java/com/yahoo/container/jdisc/DataplaneProxyService.java
index 47050168b80..74e6954e1e1 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/DataplaneProxyService.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/DataplaneProxyService.java
@@ -103,7 +103,8 @@ public class DataplaneProxyService extends AbstractComponent {
                                                    proxyCredentialsKey,
                                                    serverCertificateFile,
                                                    serverKeyFile,
-                                                   config.port(),
+                                                   config.mtlsPort(),
+                                                   config.tokenPort(),
                                                    root
                                            ));
                 if (configChanged && state == NginxState.RUNNING) {
@@ -191,7 +192,8 @@ public class DataplaneProxyService extends AbstractComponent {
             Path clientKey,
             Path serverCert,
             Path serverKey,
-            int vespaPort,
+            int vespaMtlsPort,
+            int vespaTokenPort,
             Path root) {
 
         try {
@@ -200,7 +202,8 @@ public class DataplaneProxyService extends AbstractComponent {
             nginxTemplate = replace(nginxTemplate, "client_key", clientKey.toString());
             nginxTemplate = replace(nginxTemplate, "server_cert", serverCert.toString());
             nginxTemplate = replace(nginxTemplate, "server_key", serverKey.toString());
-            nginxTemplate = replace(nginxTemplate, "vespa_port", Integer.toString(vespaPort));
+            nginxTemplate = replace(nginxTemplate, "vespa_mtls_port", Integer.toString(vespaMtlsPort));
+            nginxTemplate = replace(nginxTemplate, "vespa_token_port", Integer.toString(vespaTokenPort));
             nginxTemplate = replace(nginxTemplate, "prefix", root.toString());
 
             // TODO: verify that all template vars have been expanded
diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/DataplaneProxyServiceTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/DataplaneProxyServiceTest.java
index 351890e2a3a..893a527e631 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/DataplaneProxyServiceTest.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/DataplaneProxyServiceTest.java
@@ -168,7 +168,8 @@ public class DataplaneProxyServiceTest {
     private DataplaneProxyConfig proxyConfig() {
         X509CertificateWithKey selfSigned = X509CertificateUtils.createSelfSigned("cn=test", Duration.ofMinutes(10));
         return new DataplaneProxyConfig.Builder()
-                .port(1234)
+                .mtlsPort(1234)
+                .tokenPort(1235)
                 .serverCertificate(X509CertificateUtils.toPem(selfSigned.certificate()))
                 .serverKey(KeyUtils.toPem(selfSigned.privateKey()))
                 .build();