tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-04-23 00:32:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/603-bad-gateway' of https://github.com/jlukawska/Ocelot into jlukawska-feature/603-bad-gateway

Browse Source
This commit is contained in:
TomPallister 2020-04-11 18:01:05 +01:00
commit 3dfcff822b
8 changed files with 70 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Ocelot/Errors/OcelotErrorCode.cs
View File

@ -40,5 +40,6 @@
CannotRemovePlaceholderError = 35,
QuotaExceededError = 36,
RequestCanceled = 37,
ConnectionToDownstreamServiceError = 38,
}
}

13
src/Ocelot/Requester/ConnectionToDownstreamServiceError.cs Normal file
View File

@ -0,0 +1,13 @@
using Ocelot.Errors;
using System;
namespace Ocelot.Requester
{
class ConnectionToDownstreamServiceError : Error
{
public ConnectionToDownstreamServiceError(Exception exception)
: base($"Error connecting to downstream service, exception: {exception}", OcelotErrorCode.ConnectionToDownstreamServiceError)
{
}
}
}

7
src/Ocelot/Requester/HttpExeptionToErrorMapper.cs
View File

@ -4,6 +4,8 @@ namespace Ocelot.Requester
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
using System.Net.Http;
using System.Net.Sockets;
public class HttpExeptionToErrorMapper : IExceptionToErrorMapper
{
@ -28,6 +30,11 @@ namespace Ocelot.Requester
return new RequestCanceledError(exception.Message);
}
if (type == typeof(HttpRequestException))
{
return new ConnectionToDownstreamServiceError(exception);
}
return new UnableToCompleteRequestError(exception);
}
}

5
src/Ocelot/Responder/ErrorsToHttpStatusCodeMapper.cs
View File

@ -40,6 +40,11 @@ namespace Ocelot.Responder
return 404;
}
if (errors.Any(e => e.Code == OcelotErrorCode.ConnectionToDownstreamServiceError))
{
return 502;
}
if (errors.Any(e => e.Code == OcelotErrorCode.UnableToCompleteRequestError))
{
return 500;

4
test/Ocelot.AcceptanceTests/HttpTests.cs
View File

@ -141,7 +141,7 @@ namespace Ocelot.AcceptanceTests
}
[Fact]
public void should_return_response_500_when_using_http_one_to_talk_to_server_running_http_two()
public void should_return_response_502_when_using_http_one_to_talk_to_server_running_http_two()
{
var port = RandomPortFinder.GetRandomPort();
@ -177,7 +177,7 @@ namespace Ocelot.AcceptanceTests
.And(x => _steps.GivenThereIsAConfiguration(configuration))
.And(x => _steps.GivenOcelotIsRunning())
.When(x => _steps.WhenIGetUrlOnTheApiGateway("/", httpContent))
.Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.InternalServerError))
.Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.BadGateway))
.BDDfy();
}

32
test/Ocelot.AcceptanceTests/ReturnsErrorTests.cs
View File

@ -18,6 +18,38 @@
_steps = new Steps();
}
[Fact]
public void should_return_bad_gateway_error_if_downstream_service_doesnt_respond()
{
var configuration = new FileConfiguration
{
ReRoutes = new List<FileReRoute>
{
new FileReRoute
{
DownstreamPathTemplate = "/",
UpstreamPathTemplate = "/",
UpstreamHttpMethod = new List<string> { "Get" },
DownstreamHostAndPorts = new List<FileHostAndPort>
{
new FileHostAndPort
{
Host = "localhost",
Port = 53877,
},
},
DownstreamScheme = "http",
},
},
};
this.Given(x => _steps.GivenThereIsAConfiguration(configuration))
.And(x => _steps.GivenOcelotIsRunning())
.When(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
.Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.BadGateway))
.BDDfy();
}
[Fact]
public void should_return_internal_server_error_if_downstream_service_returns_internal_server_error()
{

2
test/Ocelot.AcceptanceTests/SslTests.cs
View File

@ -89,7 +89,7 @@ namespace Ocelot.AcceptanceTests
.And(x => _steps.GivenThereIsAConfiguration(configuration))
.And(x => _steps.GivenOcelotIsRunning())
.When(x => _steps.WhenIGetUrlOnTheApiGateway("/"))
.Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.InternalServerError))
.Then(x => _steps.ThenTheStatusCodeShouldBe(HttpStatusCode.BadGateway))
.BDDfy();
}

9
test/Ocelot.UnitTests/Responder/ErrorsToHttpStatusCodeMapperTests.cs
View File

@ -52,6 +52,13 @@ namespace Ocelot.UnitTests.Responder
ShouldMapErrorToStatusCode(errorCode, HttpStatusCode.InternalServerError);
}
[Theory]
[InlineData(OcelotErrorCode.ConnectionToDownstreamServiceError)]
public void should_return_bad_gateway_error(OcelotErrorCode errorCode)
{
ShouldMapErrorToStatusCode(errorCode, HttpStatusCode.BadGateway);
}
[Theory]
[InlineData(OcelotErrorCode.CannotAddDataError)]
[InlineData(OcelotErrorCode.CannotFindDataError)]
@ -125,7 +132,7 @@ namespace Ocelot.UnitTests.Responder
// If this test fails then it's because the number of error codes has changed.
// You should make the appropriate changes to the test cases here to ensure
// they cover all the error codes, and then modify this assertion.
Enum.GetNames(typeof(OcelotErrorCode)).Length.ShouldBe(38, "Looks like the number of error codes has changed. Do you need to modify ErrorsToHttpStatusCodeMapper?");
Enum.GetNames(typeof(OcelotErrorCode)).Length.ShouldBe(39, "Looks like the number of error codes has changed. Do you need to modify ErrorsToHttpStatusCodeMapper?");
}
private void ShouldMapErrorToStatusCode(OcelotErrorCode errorCode, HttpStatusCode expectedHttpStatusCode)