summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2022-06-30 14:25:32 +0200
committerGitHub <noreply@github.com>2022-06-30 14:25:32 +0200
commit6049047d68a0d355c1438a7b79205cfb9c8a0e48 (patch)
tree45d7178ee3d9e2d7aa47a1e4f00d000c60900e09 /controller-server
parent44b2f5114416254d5eb859ea02f436c4b0dfaf0a (diff)
parent1cc350883d80872a67cb6d9e5ff549d5c00e969e (diff)
Merge pull request #23139 from vespa-engine/andreer/java-17-examples
Java 17 examples
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java19
1 files changed, 11 insertions, 8 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java
index 1691f902358..4b6d802260e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/certificate/EndpointCertificatesTest.java
@@ -211,14 +211,17 @@ public class EndpointCertificatesTest {
@Test
public void includes_zones_in_deployment_spec_when_deploying_to_staging() {
DeploymentSpec deploymentSpec = new DeploymentSpecXmlReader(true).read(
- "<deployment version=\"1.0\">\n" +
- " <instance id=\"default\">\n" +
- " <prod>\n" +
- " <region active=\"true\">aws-us-east-1a</region>\n" +
- " <region active=\"true\">ap-northeast-1</region>\n" +
- " </prod>\n" +
- " </instance>\n" +
- "</deployment>\n");
+ """
+ <deployment version="1.0">
+ <instance id="default">
+ <prod>
+ <region active="true">aws-us-east-1a</region>
+ <region active="true">ap-northeast-1</region>
+ </prod>
+ </instance>
+ </deployment>
+ """
+ );
ZoneId testZone = tester.zoneRegistry().zones().all().in(Environment.staging).zones().stream().findFirst().orElseThrow().getId();
Optional<EndpointCertificateMetadata> endpointCertificateMetadata = endpointCertificates.getMetadata(testInstance, testZone, deploymentSpec);