-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
Add support for other HTTP verbs for aggregation aka UpstreamHttpMethod
enhancements
#1389
Open
crb02005
wants to merge
12
commits into
ThreeMammals:develop
Choose a base branch
from
crb02005:user/carl-aggregate-methods
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
d29a1fa
Add support for other verbs for aggregation, for consumers not follow…
crb02005 ca5511e
code review
raman-m d7dee73
Add required namespace
raman-m 8d74f21
EOL: src/Ocelot/Configuration/Creator/AggregatesCreator.cs
raman-m 2d8e212
EOL: test/Ocelot.AcceptanceTests/AggregateTests.cs
raman-m 02a3d99
@RaynaldM loves static fields
raman-m eccea0e
Refactor `FileAggregateRoute`:
raman-m 7c7bd77
Refactor `AggregatesCreatorTests`:
raman-m c416091
Refactor AggregatesCreatorTests
raman-m 98083a1
@RaynaldM is likely to appreciate this static property even more
raman-m 7e07193
Add unit tests
raman-m 9647062
Move unit tests
raman-m File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,28 @@ | ||
using Microsoft.AspNetCore.Http; | ||
namespace Ocelot.Configuration.File; | ||
|
||
public class FileAggregateRoute : IRoute | ||
{ | ||
public string Aggregator { get; set; } | ||
public int Priority { get; set; } | ||
public bool RouteIsCaseSensitive { get; set; } | ||
public List<string> RouteKeys { get; set; } | ||
public List<AggregateRouteConfig> RouteKeysConfig { get; set; } | ||
public IDictionary<string, string> UpstreamHeaderTemplates { get; set; } | ||
public string UpstreamHost { get; set; } | ||
public List<string> UpstreamHttpMethod { get; set; } | ||
public string UpstreamPathTemplate { get; set; } | ||
|
||
namespace Ocelot.Configuration.File | ||
{ | ||
public class FileAggregateRoute : IRoute | ||
public FileAggregateRoute() | ||
{ | ||
public List<string> RouteKeys { get; set; } | ||
public List<AggregateRouteConfig> RouteKeysConfig { get; set; } | ||
public string UpstreamPathTemplate { get; set; } | ||
public string UpstreamHost { get; set; } | ||
public bool RouteIsCaseSensitive { get; set; } | ||
public string Aggregator { get; set; } | ||
|
||
// Only supports GET..are you crazy!! POST, PUT WOULD BE CRAZY!! :) | ||
public List<string> UpstreamHttpMethod => new() { HttpMethods.Get }; | ||
public IDictionary<string, string> UpstreamHeaderTemplates { get; set; } | ||
public int Priority { get; set; } = 1; | ||
|
||
public FileAggregateRoute() | ||
{ | ||
RouteKeys = new(); | ||
RouteKeysConfig = new(); | ||
UpstreamHeaderTemplates = new Dictionary<string, string>(); | ||
} | ||
Priority = 1; | ||
RouteKeys = new(); | ||
RouteKeysConfig = new(); | ||
UpstreamHeaderTemplates = new Dictionary<string, string>(); | ||
UpstreamHttpMethod = new(); | ||
} | ||
|
||
/// <summary>This allows to override global default HTTP verb value.</summary> | ||
/// <remarks>Defaults: The <see cref="HttpMethod.Get"/> value.</remarks> | ||
/// <value>A <see cref="HttpMethod"/> value.</value> | ||
public static HttpMethod DefaultHttpMethod { get; set; } = HttpMethod.Get; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -653,6 +653,12 @@ public void Should_return_response_200_with_copied_form_sent_on_multiple_service | |
.BDDfy(); | ||
} | ||
|
||
[Fact] | ||
[Trait("Feat", "1389")] | ||
public void TODO() | ||
{ | ||
} | ||
Comment on lines
+656
to
+660
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Write acceptance tests |
||
|
||
private static string FormatFormCollection(IFormCollection reqForm) | ||
{ | ||
var sb = new StringBuilder() | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update docs with info about global static
DefaultHttpMethod