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.

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

Overload ReassignProxyRequest to also accept a route update #1760

Merged
merged 6 commits into from
Jun 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions src/ReverseProxy/Model/HttpContextFeaturesExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,24 @@ public static void ReassignProxyRequest(this HttpContext context, ClusterState c
};
context.Features.Set<IReverseProxyFeature>(newFeature);
}

// ReassignProxyRequest overload to also replace the route when updating IReverseProxyFeature
/// <summary>
/// Replaces the assigned route, cluster, and destinations in <see cref="IReverseProxyFeature"/> with the new <see cref="RouteModel"/>
/// and new <see cref="ClusterState"/>, causing the request to be sent using the new route to the new cluster.
/// </summary>
public static void ReassignProxyRequest(this HttpContext context, RouteModel route, ClusterState cluster)
Tratcher marked this conversation as resolved.
Show resolved Hide resolved
{
var oldFeature = context.GetReverseProxyFeature();
var destinations = cluster.DestinationsState;
var newFeature = new ReverseProxyFeature()
{
Route = route,
Cluster = cluster.Model,
AllDestinations = destinations.AllDestinations,
AvailableDestinations = destinations.AvailableDestinations,
ProxiedDestination = oldFeature.ProxiedDestination,
};
context.Features.Set<IReverseProxyFeature>(newFeature);
}
}
12 changes: 12 additions & 0 deletions test/ReverseProxy.Tests/Model/HttpContextFeaturesExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,17 @@ public void ReassignProxyRequest_Success()
Assert.Same(d1, newFeature.ProxiedDestination); // Copied unmodified.
Assert.Same(cm2, newFeature.Cluster);
Assert.Same(r1, newFeature.Route);

// Begin testing ReassignProxyRequest(route, cluster) overload
var r2 = new RouteModel(new RouteConfig() { RouteId = "r2" }, cs2, HttpTransformer.Empty);
context.ReassignProxyRequest(r2, cs2);

var newFeatureOverload = context.GetReverseProxyFeature();
Assert.NotSame(newFeature, newFeatureOverload);
Assert.Same(d2, newFeatureOverload.AllDestinations); // Unmodified
Assert.Same(d2, newFeatureOverload.AvailableDestinations); // Unmodified
Assert.Same(d1, newFeatureOverload.ProxiedDestination); // Unmodified
Assert.Same(cm2, newFeatureOverload.Cluster); // Unmodified
Assert.Same(r2, newFeatureOverload.Route); // Asset route update
}
}