Skip to content

Commit

Permalink
fix: do not append colon in endpoint name for EL resolution
Browse files Browse the repository at this point in the history
A colon was appended to the endpoint name in the map used by EL
resolution. With Jeoffrey we didn't find why (we think it was copied
from the v3 engine)

This change is required to migrate the Traffic Shadowing policy for
reactive engine.
  • Loading branch information
jgiovaresco committed Jan 13, 2025
1 parent 5c0125b commit c932923
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@ private void createAndStartEndpoint(final ManagedEndpointGroup managedEndpointGr
final ManagedEndpoint managedEndpoint = new DefaultManagedEndpoint(endpoint, managedEndpointGroup, connector);
managedEndpointGroup.addManagedEndpoint(managedEndpoint);
endpointsByName.put(endpoint.getName(), managedEndpoint);
endpointVariables.put(endpoint.getName(), endpoint.getName() + ":");
endpointVariables.put(managedEndpointGroup.getDefinition().getName(), managedEndpointGroup.getDefinition().getName() + ":");
endpointVariables.put(endpoint.getName(), endpoint.getName());
endpointVariables.put(managedEndpointGroup.getDefinition().getName(), managedEndpointGroup.getDefinition().getName());

listeners.values().forEach(l -> l.accept(Event.ADD, managedEndpoint));
} catch (Exception e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,12 @@ void should_provide_endpoints_template_variable() throws Exception {
verify(templateContext).setVariable(eq("endpoints"), endpointsCaptor.capture());

assertThat(endpointsCaptor.getValue())
.containsEntry("group1", "group1:")
.containsEntry("endpoint1", "endpoint1:")
.containsEntry("endpoint2", "endpoint2:")
.containsEntry("group2", "group2:")
.containsEntry("endpoint3", "endpoint3:")
.containsEntry("endpoint4", "endpoint4:");
.containsEntry("group1", "group1")
.containsEntry("endpoint1", "endpoint1")
.containsEntry("endpoint2", "endpoint2")
.containsEntry("group2", "group2")
.containsEntry("endpoint3", "endpoint3")
.containsEntry("endpoint4", "endpoint4");
}

@Test
Expand Down

0 comments on commit c932923

Please sign in to comment.