diff options
| author | Morten Tokle <morten.tokle@gmail.com> | 2019-01-04 09:31:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 09:31:20 +0100 |
| commit | d663c2ca20c91b1b36bf5b45fa3b0a6173049bff (patch) | |
| tree | 2c5fb3c1dc10b1e6a7853232923e9c96fb9fc4bf | |
| parent | 19dda9a6180432a2652165a036098f1176977f41 (diff) | |
| parent | 0e8c588e9d8b57c85ceed898f0fb2dd927002d2c (diff) | |
Merge pull request #8008 from vespa-engine/mortent/global-rotation-incluce-oathurl
Include Oath url in global rotations
4 files changed, 7 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index f2aabe70013..cfd36a25de8 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -450,6 +450,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { application.globalDnsName(controller.system()).ifPresent(rotation -> { globalRotationsArray.addString(rotation.url().toString()); globalRotationsArray.addString(rotation.secureUrl().toString()); + globalRotationsArray.addString(rotation.oathUrl().toString()); object.setString("rotationId", application.rotation().get().asString()); }); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json index 417fdce7550..9f65b5952e1 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json @@ -231,7 +231,8 @@ "compileVersion": "(ignore)", "globalRotations": [ "http://application1.tenant1.global.vespa.yahooapis.com:4080/", - "https://application1--tenant1.global.vespa.yahooapis.com:4443/" + "https://application1--tenant1.global.vespa.yahooapis.com:4443/", + "https://application1--tenant1.global.vespa.oath.cloud:4443/" ], "rotationId": "rotation-id-1", "instances": [ diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json index b0a6c6c4794..443a2c23b6a 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json @@ -219,7 +219,8 @@ "compileVersion": "(ignore)", "globalRotations": [ "http://application1.tenant1.global.vespa.yahooapis.com:4080/", - "https://application1--tenant1.global.vespa.yahooapis.com:4443/" + "https://application1--tenant1.global.vespa.yahooapis.com:4443/", + "https://application1--tenant1.global.vespa.oath.cloud:4443/" ], "rotationId": "rotation-id-1", "instances": [ diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json index 6200bd7cffa..64c92f9cde4 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json @@ -219,7 +219,8 @@ "compileVersion": "(ignore)", "globalRotations": [ "http://application1.tenant1.global.vespa.yahooapis.com:4080/", - "https://application1--tenant1.global.vespa.yahooapis.com:4443/" + "https://application1--tenant1.global.vespa.yahooapis.com:4443/", + "https://application1--tenant1.global.vespa.oath.cloud:4443/" ], "rotationId": "rotation-id-1", "instances": [ |