diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2019-10-25 13:46:13 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2019-11-05 09:57:57 +0100 |
commit | 93d1a98d9663587bbe2ee1c7b920c6b5b40bf686 (patch) | |
tree | ad36882f7186e99e638908514328e4b5c8202702 /config-model-api | |
parent | efd8e1b51587ed04f8beeef7ccb60ff273c15b7a (diff) |
Remove legacy endpoints()
Diffstat (limited to 'config-model-api')
2 files changed, 0 insertions, 117 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java index f4877fe3494..4c50f9b4ab1 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java @@ -211,9 +211,6 @@ public class DeploymentSpec { // to have environment, instance or region variants on those. public Optional<AthenzService> athenzService() { return this.athenzService; } - // TODO: Remove after November 2019 - public List<Endpoint> endpoints() { return singleInstance().endpoints(); } - /** Returns the XML form of this spec, or null if it was not created by fromXml, nor is empty */ public String xmlForm() { return xmlForm; } diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java index 738e4759b0a..317a4224726 100644 --- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java +++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java @@ -352,118 +352,4 @@ public class DeploymentSpecDeprecatedAPITest { assertEquals(Optional.of("d-2-8-50"), spec.steps().get(2).zones().get(0).testerFlavor()); } - @Test - public void noEndpoints() { - assertEquals(Collections.emptyList(), DeploymentSpec.fromXml("<deployment />").endpoints()); - } - - @Test - public void emptyEndpoints() { - final var spec = DeploymentSpec.fromXml("<deployment><endpoints/></deployment>"); - assertEquals(Collections.emptyList(), spec.endpoints()); - } - - @Test - public void someEndpoints() { - final var spec = DeploymentSpec.fromXml("" + - "<deployment>" + - " <prod>" + - " <region active=\"true\">us-east</region>" + - " </prod>" + - " <endpoints>" + - " <endpoint id=\"foo\" container-id=\"bar\">" + - " <region>us-east</region>" + - " </endpoint>" + - " <endpoint id=\"nalle\" container-id=\"frosk\" />" + - " <endpoint container-id=\"quux\" />" + - " </endpoints>" + - "</deployment>"); - - assertEquals( - List.of("foo", "nalle", "default"), - spec.endpoints().stream().map(Endpoint::endpointId).collect(Collectors.toList()) - ); - - assertEquals( - List.of("bar", "frosk", "quux"), - spec.endpoints().stream().map(Endpoint::containerId).collect(Collectors.toList()) - ); - - assertEquals(Set.of(RegionName.from("us-east")), spec.endpoints().get(0).regions()); - } - @Test - public void invalidEndpoints() { - assertInvalid("<endpoint id='FOO' container-id='qrs'/>"); // Uppercase - assertInvalid("<endpoint id='123' container-id='qrs'/>"); // Starting with non-character - assertInvalid("<endpoint id='foo!' container-id='qrs'/>"); // Non-alphanumeric - assertInvalid("<endpoint id='foo.bar' container-id='qrs'/>"); - assertInvalid("<endpoint id='foo--bar' container-id='qrs'/>"); // Multiple consecutive dashes - assertInvalid("<endpoint id='foo-' container-id='qrs'/>"); // Trailing dash - assertInvalid("<endpoint id='foooooooooooo' container-id='qrs'/>"); // Too long - assertInvalid("<endpoint id='foo' container-id='qrs'/><endpoint id='foo' container-id='qrs'/>"); // Duplicate - } - - @Test - public void validEndpoints() { - assertEquals(List.of("default"), endpointIds("<endpoint container-id='qrs'/>")); - assertEquals(List.of("default"), endpointIds("<endpoint id='' container-id='qrs'/>")); - assertEquals(List.of("f"), endpointIds("<endpoint id='f' container-id='qrs'/>")); - assertEquals(List.of("foo"), endpointIds("<endpoint id='foo' container-id='qrs'/>")); - assertEquals(List.of("foo-bar"), endpointIds("<endpoint id='foo-bar' container-id='qrs'/>")); - assertEquals(List.of("foo", "bar"), endpointIds("<endpoint id='foo' container-id='qrs'/><endpoint id='bar' container-id='qrs'/>")); - assertEquals(List.of("fooooooooooo"), endpointIds("<endpoint id='fooooooooooo' container-id='qrs'/>")); - } - - @Test - public void endpointDefaultRegions() { - var spec = DeploymentSpec.fromXml("" + - "<deployment>" + - " <prod>" + - " <region active=\"true\">us-east</region>" + - " <region active=\"true\">us-west</region>" + - " </prod>" + - " <endpoints>" + - " <endpoint id=\"foo\" container-id=\"bar\">" + - " <region>us-east</region>" + - " </endpoint>" + - " <endpoint id=\"nalle\" container-id=\"frosk\" />" + - " <endpoint container-id=\"quux\" />" + - " </endpoints>" + - "</deployment>"); - - assertEquals(Set.of("us-east"), endpointRegions("foo", spec)); - assertEquals(Set.of("us-east", "us-west"), endpointRegions("nalle", spec)); - assertEquals(Set.of("us-east", "us-west"), endpointRegions("default", spec)); - } - - private static void assertInvalid(String endpointTag) { - try { - endpointIds(endpointTag); - fail("Expected exception for input '" + endpointTag + "'"); - } catch (IllegalArgumentException ignored) {} - } - - private static Set<String> endpointRegions(String endpointId, DeploymentSpec spec) { - return spec.endpoints().stream() - .filter(endpoint -> endpoint.endpointId().equals(endpointId)) - .flatMap(endpoint -> endpoint.regions().stream()) - .map(RegionName::value) - .collect(Collectors.toSet()); - } - - private static List<String> endpointIds(String endpointTag) { - var xml = "<deployment>" + - " <prod>" + - " <region active=\"true\">us-east</region>" + - " </prod>" + - " <endpoints>" + - endpointTag + - " </endpoints>" + - "</deployment>"; - - return DeploymentSpec.fromXml(xml).endpoints().stream() - .map(Endpoint::endpointId) - .collect(Collectors.toList()); - } - } |