Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace AeFinder.GraphQL;
public interface IGraphQLAppService
{
Task<HttpResponseMessage> RequestForwardAsync(string appId, string version, string kubernetesOriginName,
GraphQLQueryInput input);
string appNameSpace, GraphQLQueryInput input);
Task<string> GetAppCurrentVersionCacheNameAsync(string appId);
Task CacheAppCurrentVersionAsync(string appId, string currentVersion);
Task<string> GetAppCurrentVersionCacheAsync(string appId);
Expand Down
21 changes: 17 additions & 4 deletions src/AeFinder.Application/GraphQL/GraphQLAppService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,11 @@ public GraphQLAppService(IHttpClientFactory httpClientFactory,
}

public async Task<HttpResponseMessage> RequestForwardAsync(string appId, string version,
string kubernetesOriginName, GraphQLQueryInput input)
string kubernetesOriginName,string appNameSpace, GraphQLQueryInput input)
{
var serverUrl = "";
string originName = kubernetesOriginName.TrimEnd('/');

string currentVersion = await EnsureCurrentVersion(appId, version);

var currentVersion = await EnsureCurrentVersion(appId, version);
if (currentVersion == null)
{
var exceptionResponse = new HttpResponseMessage(HttpStatusCode.NotFound)
Expand All @@ -52,6 +51,9 @@ public async Task<HttpResponseMessage> RequestForwardAsync(string appId, string
return exceptionResponse;
}

var originName = !string.IsNullOrWhiteSpace(kubernetesOriginName)
? kubernetesOriginName.TrimEnd('/')
: GetAppServiceHost(appId, currentVersion, appNameSpace);
serverUrl = $"{originName}/{appId}/{currentVersion}/graphql";

_logger.LogDebug("RequestForward:" + serverUrl);
Expand All @@ -63,6 +65,17 @@ public async Task<HttpResponseMessage> RequestForwardAsync(string appId, string

return response;
}

private string GetAppServiceName(string appId, string version)
{
appId = appId.Replace("_", "-");
return $"service-{appId}-{version}".ToLower();
}

private string GetAppServiceHost(string appId, string version, string appNameSpace)
{
return $"http://{GetAppServiceName(appId, version)}.{appNameSpace}.svc";
}

private async Task<string> EnsureCurrentVersion(string appId, string version)
{
Expand Down
2 changes: 1 addition & 1 deletion src/AeFinder.HttpApi/Controllers/GraphqlController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public virtual async Task<IActionResult> GraphqlForward([FromBody] GraphQLQueryI
string version = null)
{
var response =
await _graphQLAppService.RequestForwardAsync(appId, version, _kubernetesOption.OriginName, input);
await _graphQLAppService.RequestForwardAsync(appId, version, _kubernetesOption.OriginName, _kubernetesOption.AppNameSpace, input);

if (response.IsSuccessStatusCode)
{
Expand Down
Loading