8000 Fix UpstreamHost checking when reroutes duplicate validation by duszekmestre · Pull Request #864 · ThreeMammals/Ocelot · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix UpstreamHost checking when reroutes duplicate validation #864

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

Merged
merged 1 commit into from
May 4, 2019
Merged

Fix UpstreamHost checking when reroutes duplicate validation #864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Ocelot/Configuration/Validator/FileConfigurationFluentValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ private static bool IsNotDuplicateIn(FileReRoute reRoute,
{
var matchingReRoutes = reRoutes
.Where(r => r.UpstreamPathTemplate == reRoute.UpstreamPathTemplate
&& (r.UpstreamHost != reRoute.UpstreamHost || reRoute.UpstreamHost == null))
&& (r.UpstreamHost == reRoute.UpstreamHost || reRoute.UpstreamHost == null))
.ToList();

if (matchingReRoutes.Count == 1)
Expand Down
2 changes: 1 addition & 1 deletion test/Ocelot.UnitTests/Configuration/Validation/FileConfigurationFluentValidatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ public void configuration_is_valid_with_duplicate_reroutes_all_verbs_but_differe
Host = "bb.co.uk"
}
},
UpstreamHost = "host1"
UpstreamHost = "host2"
}
}
}))
Expand Down
0