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.

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

Jump to bottom

minor fixes #873

Merged
merged 5 commits into from
Sep 8, 2023
Merged

minor fixes #873

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eaee230
minor fixes
lillie-dae Sep 8, 2023
57ea02f
fixed namespaces
lillie-dae Sep 8, 2023
a33aafc
minor fixes
lillie-dae Sep 8, 2023
fc3afa8
fix ql issue
lillie-dae Sep 8, 2023
22b1f50
minor changes
lillie-dae Sep 8, 2023
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
4 changes: 2 additions & 2 deletions src/Common/Miscellaneous/ApiControllerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ public class ApiControllerBase : ControllerBase
/// Initializes a new instance of the <see cref="ApiControllerBase"/> class.
/// </summary>
/// <param name="options">Workflow manager options.</param>
public ApiControllerBase(IOptions<WorkflowManagerOptions> Options)
public ApiControllerBase(IOptions<WorkflowManagerOptions> options)
{
this.Options = Options ?? throw new ArgumentNullException(nameof(Options));
Options = options ?? throw new ArgumentNullException(nameof(options));
}

/// <summary>
Expand Down
76 changes: 40 additions & 36 deletions src/TaskManager/Plug-ins/Argo/ArgoClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,27 @@
var urlBuilder = new StringBuilder();
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}");

var Method = "POST";
var method = "POST";
var content = new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(body));
return await SendRequest<Workflow>(content, urlBuilder, Method, cancellationToken).ConfigureAwait(false);
return await SendRequest<Workflow>(content, urlBuilder, method, cancellationToken).ConfigureAwait(false);

}

public async Task<Workflow?> Argo_GetWorkflowAsync(string argoNamespace, string name, string? getOptions_resourceVersion, string? fields, CancellationToken cancellationToken)
public async Task<Workflow?> Argo_GetWorkflowAsync(string argoNamespace,
string name,
string? getOptionsResourceVersion,
string? fields,
CancellationToken cancellationToken)
{
Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace));
Guard.Against.Null(name, nameof(name));

var urlBuilder = new StringBuilder();
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}?");

if (getOptions_resourceVersion != null)
if (getOptionsResourceVersion != null)
{
urlBuilder.Append(Uri.EscapeDataString("getOptions.resourceVersion") + "=").Append(Uri.EscapeDataString(ConvertToString(getOptions_resourceVersion, CultureInfo.InvariantCulture))).Append('&');
urlBuilder.Append(Uri.EscapeDataString("getOptions.resourceVersion") + "=").Append(Uri.EscapeDataString(ConvertToString(getOptionsResourceVersion, CultureInfo.InvariantCulture))).Append('&');
}
if (fields != null)
{
Expand All @@ -71,9 +75,9 @@
var urlBuilder = new StringBuilder();
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}/stop");

var Method = "PUT";
const string method = "PUT";
var content = new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(body));
return await SendRequest<Workflow>(content, urlBuilder, Method, new CancellationToken()).ConfigureAwait(false);
return await SendRequest<Workflow>(content, urlBuilder, method, new CancellationToken()).ConfigureAwait(false);

}

Expand All @@ -86,22 +90,22 @@
var urlBuilder = new StringBuilder();
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}/terminate");

var Method = "PUT";
const string method = "PUT";
var content = new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(body));
return await SendRequest<Workflow>(content, urlBuilder, Method, new CancellationToken()).ConfigureAwait(false);
return await SendRequest<Workflow>(content, urlBuilder, method, new CancellationToken()).ConfigureAwait(false);
}

public async Task<WorkflowTemplate?> Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string? getOptions_resourceVersion)
public async Task<WorkflowTemplate?> Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string? getOptionsResourceVersion)
{
Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace));
Guard.Against.Null(name, nameof(name));

var urlBuilder = new StringBuilder();
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflow-templates/{argoNamespace}/{name}?");

if (getOptions_resourceVersion != null)
if (getOptionsResourceVersion != null)
{
urlBuilder.Append(Uri.EscapeDataString("getOptions.resourceVersion") + "=").Append(Uri.EscapeDataString(ConvertToString(getOptions_resourceVersion, CultureInfo.InvariantCulture))).Append('&');
urlBuilder.Append(Uri.EscapeDataString("getOptions.resourceVersion") + "=").Append(Uri.EscapeDataString(ConvertToString(getOptionsResourceVersion, CultureInfo.InvariantCulture))).Append('&');
}
urlBuilder.Length--;

Expand All @@ -116,7 +120,7 @@
return await GetRequest<Version>(urlBuilder).ConfigureAwait(false);
}

public async Task<string?> Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string? podName, string logOptions_container)
public async Task<string?> Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string? podName, string logOptionsContainer)
{
Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace));
Guard.Against.Null(name, nameof(name));
Expand All @@ -128,9 +132,9 @@
{
urlBuilder.Append(Uri.EscapeDataString("podName") + "=").Append(Uri.EscapeDataString(ConvertToString(podName, CultureInfo.InvariantCulture))).Append('&');
}
if (logOptions_container != null)
if (logOptionsContainer != null)
{
urlBuilder.Append(Uri.EscapeDataString("logOptions.container") + "=").Append(Uri.EscapeDataString(ConvertToString(logOptions_container, CultureInfo.InvariantCulture))).Append('&');
urlBuilder.Append(Uri.EscapeDataString("logOptions.container") + "=").Append(Uri.EscapeDataString(ConvertToString(logOptionsContainer, CultureInfo.InvariantCulture))).Append('&');
}

urlBuilder.Length--;
Expand All @@ -152,8 +156,8 @@
var stringBody = Newtonsoft.Json.JsonConvert.SerializeObject(body);
var content = new StringContent(stringBody);

var _logger = NLog.LogManager.GetCurrentClassLogger();
_logger.Debug($"Sending content to Argo :{stringBody}");
var logger = NLog.LogManager.GetCurrentClassLogger();
logger.Debug($"Sending content to Argo :{stringBody}");
Fixed Show fixed Hide fixed
return await SendRequest<WorkflowTemplate>(content, urlBuilder, method, cancellationToken).ConfigureAwait(false);
}

Expand Down Expand Up @@ -250,22 +254,22 @@

try
{
var headers = Enumerable.ToDictionary(response.Headers, h_ => h_.Key, h_ => h_.Value);
var headers = Enumerable.ToDictionary(response.Headers, h => h.Key, h => h.Value);
if (response.Content != null && response.Content.Headers != null)
{
foreach (var item_ in response.Content.Headers)
headers[item_.Key] = item_.Value;
foreach (var item in response.Content.Headers)
headers[item.Key] = item.Value;
}

var status = (int)response.StatusCode;
if (status == 200)
{
var objectResponse_ = await ReadObjectResponseAsync<T>(response, headers).ConfigureAwait(false);
if (objectResponse_.Object == null)
var objectResponse = await ReadObjectResponseAsync<T>(response, headers).ConfigureAwait(false);
if (objectResponse.Object == null)
{
throw new ApiException("Response was null which was not expected.", status, objectResponse_.Text, headers, null);
throw new ApiException("Response was null which was not expected.", status, objectResponse.Text, headers, null);
}
return objectResponse_.Object;
return objectResponse.Object;
}
else
{
Expand Down Expand Up @@ -296,34 +300,34 @@
var response = await HttpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false);
try
{
var headers_ = Enumerable.ToDictionary(response.Headers, h_ => h_.Key, h_ => h_.Value);
var headers = Enumerable.ToDictionary(response.Headers, h => h.Key, h => h.Value) ?? throw new ArgumentNullException("Enumerable.ToDictionary(response.Headers, h_ => h_.Key, h_ => h_.Value)");
if (response.Content != null && response.Content.Headers != null)
{
foreach (var item_ in response.Content.Headers)
headers_[item_.Key] = item_.Value;
foreach (var item in response.Content.Headers)
headers[item.Key] = item.Value;
}

var status = (int)response.StatusCode;
if (status == 200)
{
ObjectResponseResult<T?> objectResponse_;
ObjectResponseResult<T?> objectResponse;

objectResponse_ = await ReadObjectResponseAsync<T>(response, headers_, isLogs).ConfigureAwait(false);
objectResponse = await ReadObjectResponseAsync<T>(response, headers, isLogs).ConfigureAwait(false);

if (objectResponse_.Object == null)
if (objectResponse.Object == null)
{
throw new ApiException("Response was null which was not expected.", status, objectResponse_.Text, headers_, null);
throw new ApiException("Response was null which was not expected.", status, objectResponse.Text, headers, null);
}
return objectResponse_.Object;
return objectResponse.Object;
}
else
{
var objectResponse_ = await ReadObjectResponseAsync<Error>(response, headers_, false).ConfigureAwait(false);
if (objectResponse_.Object == null)
var objectResponse = await ReadObjectResponseAsync<Error>(response, headers, false).ConfigureAwait(false);
if (objectResponse.Object == null)
{
throw new ApiException("Response was null which was not expected.", status, objectResponse_.Text, headers_, null);
throw new ApiException("Response was null which was not expected.", status, objectResponse.Text, headers, null);
}
throw new ApiException<Error>("An unexpected error response.", status, objectResponse_.Text, headers_, objectResponse_.Object, null);
throw new ApiException<Error>("An unexpected error response.", status, objectResponse.Text, headers, objectResponse.Object, null);
}
}
finally
Expand Down
1 change: 1 addition & 0 deletions src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,6 +818,7 @@ private async Task CopyTemplateSteps(ICollection<ParallelSteps> steps, WorkflowT
}
}

// ReSharper disable once InconsistentNaming
private async Task<string> GenerateK8sSecretFrom(Messaging.Common.Storage storage, CancellationToken cancellationToken)
{
Guard.Against.Null(storage, nameof(storage));
Expand Down
4 changes: 2 additions & 2 deletions src/TaskManager/Plug-ins/Argo/ArgoProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ public IArgoClient CreateClient(string baseUrl, string? apiToken, bool allowInse

_logger.CreatingArgoClient(baseUrl);

var ClientName = allowInsecure is true ? "Argo-Insecure" : "Argo";
var clientName = allowInsecure ? "Argo-Insecure" : "Argo";

var httpClient = _httpClientFactory.CreateClient(ClientName);
var httpClient = _httpClientFactory.CreateClient(clientName);

Guard.Against.Null(httpClient, nameof(httpClient));

Expand Down
6 changes: 3 additions & 3 deletions src/TaskManager/Plug-ins/Argo/IArgoClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ public interface IArgoClient
{
Task<Workflow> Argo_CreateWorkflowAsync(string argoNamespace, WorkflowCreateRequest body, CancellationToken cancellationToken);

Task<Workflow?> Argo_GetWorkflowAsync(string argoNamespace, string name, string? getOptions_resourceVersion, string? fields, CancellationToken cancellationToken);
Task<Workflow?> Argo_GetWorkflowAsync(string argoNamespace, string name, string? getOptionsResourceVersion, string? fields, CancellationToken cancellationToken);

Task<WorkflowTemplate?> Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string? getOptions_resourceVersion);
Task<WorkflowTemplate?> Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string? getOptionsResourceVersion);

Task<Workflow> Argo_StopWorkflowAsync(string argoNamespace, string name, WorkflowStopRequest body);

Task<Workflow> Argo_TerminateWorkflowAsync(string argoNamespace, string name, WorkflowTerminateRequest body);

Task<Version?> Argo_GetVersionAsync();

Task<string?> Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string? podName, string logOptions_container);
Task<string?> Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string? podName, string logOptionsContainer);

Task<WorkflowTemplate> Argo_CreateWorkflowTemplateAsync(string argoNamespace, WorkflowTemplateCreateRequest body, CancellationToken cancellationToken);

Expand Down
4 changes: 2 additions & 2 deletions src/WorkflowManager/Common/Services/PayloadService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public PayloadService(
_dicomService = dicomService ?? throw new ArgumentNullException(nameof(dicomService));
_logger = logger ?? throw new ArgumentNullException(nameof(logger));

var _serviceScopeFactory = serviceScopeFactory ?? throw new ArgumentNullException(nameof(serviceScopeFactory));
var scope = _serviceScopeFactory.CreateScope();
var scopeFactory = serviceScopeFactory ?? throw new ArgumentNullException(nameof(serviceScopeFactory));
var scope = scopeFactory.CreateScope();

_storageService = scope.ServiceProvider.GetService<IStorageService>() ?? throw new ArgumentNullException(nameof(IStorageService));
}
Expand Down
10 changes: 5 additions & 5 deletions src/WorkflowManager/Database/Interfaces/ITaskExecutionStatsRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ public interface ITaskExecutionStatsRepository
/// <summary>
/// Creates a task dispatch event in the database.
/// </summary>
/// <param name="TaskExecutionInfo"></param>
/// <param name="taskExecutionInfo"></param>
/// <param name="workflowId">workflow id.</param>
/// <param name="correlationId">task id.</param>
/// <returns></returns>
Task CreateAsync(TaskExecution TaskExecutionInfo, string workflowId, string correlationId);
Task CreateAsync(TaskExecution taskExecutionInfo, string workflowId, string correlationId);

/// <summary>
/// Updates status of a task dispatch event in the database.
Expand All @@ -57,12 +57,12 @@ public interface ITaskExecutionStatsRepository
/// </summary>
/// <param name="startTime">start of the range.</param>
/// <param name="endTime">end of the range.</param>
/// <param name="PageSize"></param>
/// <param name="PageNumber"></param>
/// <param name="pageSize"></param>
/// <param name="pageNumber"></param>
/// <param name="workflowId">optional workflow id.</param>
/// <param name="taskId">optional task id.</param>
/// <returns>a collections of stats</returns>
Task<IEnumerable<ExecutionStats>> GetStatsAsync(DateTime startTime, DateTime endTime, int PageSize = 10, int PageNumber = 1, string workflowId = "", string taskId = "");
Task<IEnumerable<ExecutionStats>> GetStatsAsync(DateTime startTime, DateTime endTime, int pageSize = 10, int pageNumber = 1, string workflowId = "", string taskId = "");

/// <summary>
/// Return the count of the entries with this status, or all if no status given.
Expand Down
Loading
Loading