Merge pull request #4287 from vespa-engine/freva/add-https-bindings

Add HTTPS bindings in configserver-app services.xml

2 files changed, 34 insertions, 1 deletions

diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml
index fbab854ae9e..eddba1ee768 100644
--- a/configserver/src/main/resources/configserver-app/services.xml
+++ b/configserver/src/main/resources/configserver-app/services.xml
@@ -73,64 +73,96 @@
 
     <handler id='com.yahoo.vespa.config.server.http.HttpGetConfigHandler' bundle='configserver'>
       <binding>http://*/config/v1/*/*</binding>
+      <binding>https://*/config/v1/*/*</binding>
       <binding>http://*/config/v1/*</binding>
+      <binding>https://*/config/v1/*</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.HttpListConfigsHandler' bundle='configserver'>
       <binding>http://*/config/v1/</binding>
+      <binding>https://*/config/v1/</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.HttpListNamedConfigsHandler' bundle='configserver'>
       <binding>http://*/config/v1/*/</binding>
+      <binding>https://*/config/v1/*/</binding>
       <binding>http://*/config/v1/*/*/</binding>
+      <binding>https://*/config/v1/*/*/</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.TenantHandler' bundle='configserver'>
       <binding>http://*/application/v2/tenant/</binding>
+      <binding>https://*/application/v2/tenant/</binding>
       <binding>http://*/application/v2/tenant/*</binding>
+      <binding>https://*/application/v2/tenant/*</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.SessionCreateHandler' bundle='configserver'>
       <binding>http://*/application/v2/tenant/*/session</binding>
+      <binding>https://*/application/v2/tenant/*/session</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.SessionPrepareHandler' bundle='configserver'>
       <binding>http://*/application/v2/tenant/*/session/*/prepared</binding>
+      <binding>https://*/application/v2/tenant/*/session/*/prepared</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.SessionActiveHandler' bundle='configserver'>
       <binding>http://*/application/v2/tenant/*/session/*/active</binding>
+      <binding>https://*/application/v2/tenant/*/session/*/active</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.SessionContentHandler' bundle='configserver'>
       <binding>http://*/application/v2/tenant/*/session/*/content/*</binding>
+      <binding>https://*/application/v2/tenant/*/session/*/content/*</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.ListApplicationsHandler' bundle='configserver'>
       <binding>http://*/application/v2/tenant/*/application/</binding>
+      <binding>https://*/application/v2/tenant/*/application/</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.ApplicationHandler' bundle='configserver'>
       <!-- WARNING: THIS LIST *MUST* MATCH THE ONE IN ApplicationHandler::getBindingMatch -->
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/content/*</binding>
+      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/content/*</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/restart</binding>
+      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/restart</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/log</binding>
+      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/log</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/converge</binding>
+      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/converge</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/serviceconverge</binding>
+      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/serviceconverge</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/serviceconverge/*</binding>
+      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/serviceconverge/*</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/clustercontroller/*/status/*</binding>
+      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*/clustercontroller/*/status/*</binding>
       <binding>http://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*</binding>
+      <binding>https://*/application/v2/tenant/*/application/*/environment/*/region/*/instance/*</binding>
       <binding>http://*/application/v2/tenant/*/application/*</binding>
+      <binding>https://*/application/v2/tenant/*/application/*</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.HttpGetConfigHandler' bundle='configserver'>
       <binding>http://*/config/v2/tenant/*/application/*/*</binding>
+      <binding>https://*/config/v2/tenant/*/application/*/*</binding>
       <binding>http://*/config/v2/tenant/*/application/*/*/*</binding>
+      <binding>https://*/config/v2/tenant/*/application/*/*/*</binding>
       <binding>http://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*</binding>
+      <binding>https://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*</binding>
       <binding>http://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*/*</binding>
+      <binding>https://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*/*</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.HttpListConfigsHandler' bundle='configserver'>
       <binding>http://*/config/v2/tenant/*/application/*/</binding>
+      <binding>https://*/config/v2/tenant/*/application/*/</binding>
       <binding>http://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/</binding>
+      <binding>https://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.HttpListNamedConfigsHandler' bundle='configserver'>
       <binding>http://*/config/v2/tenant/*/application/*/*/</binding>
+      <binding>https://*/config/v2/tenant/*/application/*/*/</binding>
       <binding>http://*/config/v2/tenant/*/application/*/*/*/</binding>
+      <binding>https://*/config/v2/tenant/*/application/*/*/*/</binding>
       <binding>http://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*/</binding>
+      <binding>https://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*/</binding>
       <binding>http://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*/*/</binding>
+      <binding>https://*/config/v2/tenant/*/application/*/environment/*/region/*/instance/*/*/*/</binding>
     </handler>
     <handler id='com.yahoo.vespa.config.server.http.v2.HostHandler' bundle='configserver'>
-       <binding>http://*/application/v2/host/*</binding>
+      <binding>http://*/application/v2/host/*</binding>
+      <binding>https://*/application/v2/host/*</binding>
     </handler>
 
     <http>
diff --git a/node-repository/src/main/config/node-repository.xml b/node-repository/src/main/config/node-repository.xml
index 72f9c44c8d8..d4b677cb0bb 100644
--- a/node-repository/src/main/config/node-repository.xml
+++ b/node-repository/src/main/config/node-repository.xml
@@ -11,6 +11,7 @@
 
 <handler id="com.yahoo.vespa.hosted.provision.restapi.v2.NodesApiHandler" bundle="node-repository">
     <binding>http://*/nodes/v2/*</binding>
+    <binding>https://*/nodes/v2/*</binding>
 </handler>
 
 <preprocess:include file="node-flavors.xml" required="false" />