Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply endpoint settings to dev/perf unconditionally #31739

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Apply endpoint settings to dev/perf unconditionally #31739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d232ef4
Apply endpoint settings to dev/perf unconditionally
jonmv Jun 27, 2024
936ff81
Update test
jonmv Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,7 @@ && instances().stream()
.anyMatch(endpoint -> ! endpoint.isPublicEndpoint()))) return ZoneEndpoint.privateEndpoint;

if (zone.environment().isManuallyDeployed())
return instance(instance).filter(spec -> spec.deploysTo(zone.environment(), zone.region()))
.map(spec -> spec.zoneEndpoints().getOrDefault(cluster, Map.of()).get(null))
return instance(instance).map(spec -> spec.zoneEndpoints().getOrDefault(cluster, Map.of()).get(null))
.orElse(ZoneEndpoint.defaultEndpoint);

if (zone.environment() != Environment.prod) return ZoneEndpoint.defaultEndpoint;
Expand Down
13 changes: 1 addition & 12 deletions config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,17 +1235,11 @@ public void someEndpoints() {
<dev />
</instance>
<instance id='other'>
<dev />
<perf />
<endpoints>
<endpoint container-id='pew' type='private' />
</endpoints>
</instance>
<instance id='last'>
<endpoints>
<endpoint container-id='pew' type='private' />
</endpoints>
</instance>
</deployment>""");

assertEquals(
Expand Down Expand Up @@ -1282,7 +1276,7 @@ public void someEndpoints() {

assertEquals(ZoneEndpoint.defaultEndpoint,
spec.zoneEndpoint(InstanceName.from("default"), perfZone, ClusterSpec.Id.from("bax")));
assertEquals(ZoneEndpoint.defaultEndpoint,
assertEquals(ZoneEndpoint.privateEndpoint,
spec.zoneEndpoint(InstanceName.from("default"), perfZone, ClusterSpec.Id.from("froz")));

assertEquals(new ZoneEndpoint(false, true, List.of(new AllowedUrn(AccessType.awsPrivateLink, "barn"),
Expand All @@ -1293,11 +1287,6 @@ public void someEndpoints() {
spec.zoneEndpoint(InstanceName.from("other"), devZone, ClusterSpec.Id.from("pew")));
assertEquals(new ZoneEndpoint(true, true, List.of()),
spec.zoneEndpoint(InstanceName.from("other"), perfZone, ClusterSpec.Id.from("pew")));

assertEquals(ZoneEndpoint.defaultEndpoint,
spec.zoneEndpoint(InstanceName.from("last"), devZone, ClusterSpec.Id.from("pew")));
assertEquals(ZoneEndpoint.defaultEndpoint,
spec.zoneEndpoint(InstanceName.from("last"), perfZone, ClusterSpec.Id.from("pew")));
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions ...ig-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ void load_balancers_can_be_set() throws IOException, SAXException {
"us",
ZoneEndpoint.defaultEndpoint);

// Various settings, but wrong environment
// Various settings, but wrong environment for private services
verifyAllowedUrns("""
<endpoint type='zone' container-id='default' enabled='false' />
<endpoint type='private' container-id='default'>
Expand All @@ -314,7 +314,7 @@ void load_balancers_can_be_set() throws IOException, SAXException {
""",
Environment.dev,
"eu",
ZoneEndpoint.defaultEndpoint);
ZoneEndpoint.privateEndpoint);
}

private void verifyAllowedUrns(String endpointsTag, Environment environment, String region, ZoneEndpoint expected) throws IOException, SAXException {
Expand Down