Skip to content

Commit bf94fe8

Browse files
lillie-daelillie-dae
authored
minor fixes (#873)
* minor fixes Signed-off-by: Lillie Dae <[email protected]> --------- Signed-off-by: Lillie Dae <[email protected]>
1 parent 195cccd commit bf94fe8

File tree

37 files changed

+201
-187
lines changed

37 files changed

+201
-187
lines changed

‎src/Common/Miscellaneous/ApiControllerBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ public class ApiControllerBase : ControllerBase
3737
/// Initializes a new instance of the <see cref="ApiControllerBase"/> class.
3838
/// </summary>
3939
/// <param name="options">Workflow manager options.</param>
40-
public ApiControllerBase(IOptions<WorkflowManagerOptions> Options)
40+
public ApiControllerBase(IOptions<WorkflowManagerOptions> options)
4141
{
42-
this.Options = Options ?? throw new ArgumentNullException(nameof(Options));
42+
Options = options ?? throw new ArgumentNullException(nameof(options));
4343
}
4444

4545
/// <summary>

‎src/TaskManager/Plug-ins/Argo/ArgoClient.cs

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,27 @@ public async Task<Workflow> Argo_CreateWorkflowAsync(string argoNamespace, Workf
3434
var urlBuilder = new StringBuilder();
3535
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}");
3636

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

4141
}
4242

43-
public async Task<Workflow?> Argo_GetWorkflowAsync(string argoNamespace, string name, string? getOptions_resourceVersion, string? fields, CancellationToken cancellationToken)
43+
public async Task<Workflow?> Argo_GetWorkflowAsync(string argoNamespace,
44+
string name,
45+
string? getOptionsResourceVersion,
46+
string? fields,
47+
CancellationToken cancellationToken)
4448
{
4549
Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace));
4650
Guard.Against.Null(name, nameof(name));
4751

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

51-
if (getOptions_resourceVersion != null)
55+
if (getOptionsResourceVersion != null)
5256
{
53-
urlBuilder.Append(Uri.EscapeDataString("getOptions.resourceVersion") + "=").Append(Uri.EscapeDataString(ConvertToString(getOptions_resourceVersion, CultureInfo.InvariantCulture))).Append('&');
57+
urlBuilder.Append(Uri.EscapeDataString("getOptions.resourceVersion") + "=").Append(Uri.EscapeDataString(ConvertToString(getOptionsResourceVersion, CultureInfo.InvariantCulture))).Append('&');
5458
}
5559
if (fields != null)
5660
{
@@ -71,9 +75,9 @@ public async Task<Workflow> Argo_StopWorkflowAsync(string argoNamespace, string
7175
var urlBuilder = new StringBuilder();
7276
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}/stop");
7377

74-
var Method = "PUT";
78+
const string method = "PUT";
7579
var content = new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(body));
76-
return await SendRequest<Workflow>(content, urlBuilder, Method, new CancellationToken()).ConfigureAwait(false);
80+
return await SendRequest<Workflow>(content, urlBuilder, method, new CancellationToken()).ConfigureAwait(false);
7781

7882
}
7983

@@ -86,22 +90,22 @@ public async Task<Workflow> Argo_TerminateWorkflowAsync(string argoNamespace, st
8690
var urlBuilder = new StringBuilder();
8791
urlBuilder.Append(CultureInfo.InvariantCulture, $"{FormattedBaseUrl}/api/v1/workflows/{argoNamespace}/{name}/terminate");
8892

89-
var Method = "PUT";
93+
const string method = "PUT";
9094
var content = new StringContent(Newtonsoft.Json.JsonConvert.SerializeObject(body));
91-
return await SendRequest<Workflow>(content, urlBuilder, Method, new CancellationToken()).ConfigureAwait(false);
95+
return await SendRequest<Workflow>(content, urlBuilder, method, new CancellationToken()).ConfigureAwait(false);
9296
}
9397

94-
public async Task<WorkflowTemplate?> Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string? getOptions_resourceVersion)
98+
public async Task<WorkflowTemplate?> Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string? getOptionsResourceVersion)
9599
{
96100
Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace));
97101
Guard.Against.Null(name, nameof(name));
98102

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

102-
if (getOptions_resourceVersion != null)
106+
if (getOptionsResourceVersion != null)
103107
{
104-
urlBuilder.Append(Uri.EscapeDataString("getOptions.resourceVersion") + "=").Append(Uri.EscapeDataString(ConvertToString(getOptions_resourceVersion, CultureInfo.InvariantCulture))).Append('&');
108+
urlBuilder.Append(Uri.EscapeDataString("getOptions.resourceVersion") + "=").Append(Uri.EscapeDataString(ConvertToString(getOptionsResourceVersion, CultureInfo.InvariantCulture))).Append('&');
105109
}
106110
urlBuilder.Length--;
107111

@@ -116,7 +120,7 @@ public async Task<Workflow> Argo_TerminateWorkflowAsync(string argoNamespace, st
116120
return await GetRequest<Version>(urlBuilder).ConfigureAwait(false);
117121
}
118122

119-
public async Task<string?> Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string? podName, string logOptions_container)
123+
public async Task<string?> Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string? podName, string logOptionsContainer)
120124
{
121125
Guard.Against.NullOrWhiteSpace(argoNamespace, nameof(argoNamespace));
122126
Guard.Against.Null(name, nameof(name));
@@ -128,9 +132,9 @@ public async Task<Workflow> Argo_TerminateWorkflowAsync(string argoNamespace, st
128132
{
129133
urlBuilder.Append(Uri.EscapeDataString("podName") + "=").Append(Uri.EscapeDataString(ConvertToString(podName, CultureInfo.InvariantCulture))).Append('&');
130134
}
131-
if (logOptions_container != null)
135+
if (logOptionsContainer != null)
132136
{
133-
urlBuilder.Append(Uri.EscapeDataString("logOptions.container") + "=").Append(Uri.EscapeDataString(ConvertToString(logOptions_container, CultureInfo.InvariantCulture))).Append('&');
137+
urlBuilder.Append(Uri.EscapeDataString("logOptions.container") + "=").Append(Uri.EscapeDataString(ConvertToString(logOptionsContainer, CultureInfo.InvariantCulture))).Append('&');
134138
}
135139

136140
urlBuilder.Length--;
@@ -152,8 +156,8 @@ public virtual async Task<WorkflowTemplate> Argo_CreateWorkflowTemplateAsync(str
152156
var stringBody = Newtonsoft.Json.JsonConvert.SerializeObject(body);
153157
var content = new StringContent(stringBody);
154158

155-
var _logger = NLog.LogManager.GetCurrentClassLogger();
156-
_logger.Debug($"Sending content to Argo :{stringBody}");
159+
var logger = NLog.LogManager.GetCurrentClassLogger();
160+
logger.Debug($"Sending content to Argo :{stringBody.Replace(Environment.NewLine, "")}");
157161
return await SendRequest<WorkflowTemplate>(content, urlBuilder, method, cancellationToken).ConfigureAwait(false);
158162
}
159163

@@ -250,22 +254,22 @@ protected async Task<T> SendRequest<T>(StringContent stringContent, StringBuilde
250254

251255
try
252256
{
253-
var headers = Enumerable.ToDictionary(response.Headers, h_ => h_.Key, h_ => h_.Value);
257+
var headers = Enumerable.ToDictionary(response.Headers, h => h.Key, h => h.Value);
254258
if (response.Content != null && response.Content.Headers != null)
255259
{
256-
foreach (var item_ in response.Content.Headers)
257-
headers[item_.Key] = item_.Value;
260+
foreach (var item in response.Content.Headers)
261+
headers[item.Key] = item.Value;
258262
}
259263

260264
var status = (int)response.StatusCode;
261265
if (status == 200)
262266
{
263-
var objectResponse_ = await ReadObjectResponseAsync<T>(response, headers).ConfigureAwait(false);
264-
if (objectResponse_.Object == null)
267+
var objectResponse = await ReadObjectResponseAsync<T>(response, headers).ConfigureAwait(false);
268+
if (objectResponse.Object == null)
265269
{
266-
throw new ApiException("Response was null which was not expected.", status, objectResponse_.Text, headers, null);
270+
throw new ApiException("Response was null which was not expected.", status, objectResponse.Text, headers, null);
267271
}
268-
return objectResponse_.Object;
272+
return objectResponse.Object;
269273
}
270274
else
271275
{
@@ -296,34 +300,34 @@ protected async Task<T> SendRequest<T>(StringContent stringContent, StringBuilde
296300
var response = await HttpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false);
297301
try
298302
{
299-
var headers_ = Enumerable.ToDictionary(response.Headers, h_ => h_.Key, h_ => h_.Value);
303+
var headers = Enumerable.ToDictionary(response.Headers, h => h.Key, h => h.Value);
300304
if (response.Content != null && response.Content.Headers != null)
301305
{
302-
foreach (var item_ in response.Content.Headers)
303-
headers_[item_.Key] = item_.Value;
306+
foreach (var item in response.Content.Headers)
307+
headers[item.Key] = item.Value;
304308
}
305309

306310
var status = (int)response.StatusCode;
307311
if (status == 200)
308312
{
309-
ObjectResponseResult<T?> objectResponse_;
313+
ObjectResponseResult<T?> objectResponse;
310314

311-
objectResponse_ = await ReadObjectResponseAsync<T>(response, headers_, isLogs).ConfigureAwait(false);
315+
objectResponse = await ReadObjectResponseAsync<T>(response, headers, isLogs).ConfigureAwait(false);
312316

313-
if (objectResponse_.Object == null)
317+
if (objectResponse.Object == null)
314318
{
315-
throw new ApiException("Response was null which was not expected.", status, objectResponse_.Text, headers_, null);
319+
throw new ApiException("Response was null which was not expected.", status, objectResponse.Text, headers, null);
316320
}
317-
return objectResponse_.Object;
321+
return objectResponse.Object;
318322
}
319323
else
320324
{
321-
var objectResponse_ = await ReadObjectResponseAsync<Error>(response, headers_, false).ConfigureAwait(false);
322-
if (objectResponse_.Object == null)
325+
var objectResponse = await ReadObjectResponseAsync<Error>(response, headers, false).ConfigureAwait(false);
326+
if (objectResponse.Object == null)
323327
{
324-
throw new ApiException("Response was null which was not expected.", status, objectResponse_.Text, headers_, null);
328+
throw new ApiException("Response was null which was not expected.", status, objectResponse.Text, headers, null);
325329
}
326-
throw new ApiException<Error>("An unexpected error response.", status, objectResponse_.Text, headers_, objectResponse_.Object, null);
330+
throw new ApiException<Error>("An unexpected error response.", status, objectResponse.Text, headers, objectResponse.Object, null);
327331
}
328332
}
329333
finally

‎src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -818,6 +818,7 @@ private async Task CopyTemplateSteps(ICollection<ParallelSteps> steps, WorkflowT
818818
}
819819
}
820820

821+
// ReSharper disable once InconsistentNaming
821822
private async Task<string> GenerateK8sSecretFrom(Messaging.Common.Storage storage, CancellationToken cancellationToken)
822823
{
823824
Guard.Against.Null(storage, nameof(storage));

‎src/TaskManager/Plug-ins/Argo/ArgoProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ public IArgoClient CreateClient(string baseUrl, string? apiToken, bool allowInse
4040

4141
_logger.CreatingArgoClient(baseUrl);
4242

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

45-
var httpClient = _httpClientFactory.CreateClient(ClientName);
45+
var httpClient = _httpClientFactory.CreateClient(clientName);
4646

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

‎src/TaskManager/Plug-ins/Argo/IArgoClient.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ public interface IArgoClient
2323
{
2424
Task<Workflow> Argo_CreateWorkflowAsync(string argoNamespace, WorkflowCreateRequest body, CancellationToken cancellationToken);
2525

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

28-
Task<WorkflowTemplate?> Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string? getOptions_resourceVersion);
28+
Task<WorkflowTemplate?> Argo_GetWorkflowTemplateAsync(string argoNamespace, string name, string? getOptionsResourceVersion);
2929

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

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

3434
Task<Version?> Argo_GetVersionAsync();
3535

36-
Task<string?> Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string? podName, string logOptions_container);
36+
Task<string?> Argo_Get_WorkflowLogsAsync(string argoNamespace, string name, string? podName, string logOptionsContainer);
3737

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

‎src/WorkflowManager/Common/Services/PayloadService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public PayloadService(
5252
_dicomService = dicomService ?? throw new ArgumentNullException(nameof(dicomService));
5353
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
5454

55-
var _serviceScopeFactory = serviceScopeFactory ?? throw new ArgumentNullException(nameof(serviceScopeFactory));
56-
var scope = _serviceScopeFactory.CreateScope();
55+
var scopeFactory = serviceScopeFactory ?? throw new ArgumentNullException(nameof(serviceScopeFactory));
56+
var scope = scopeFactory.CreateScope();
5757

5858
_storageService = scope.ServiceProvider.GetService<IStorageService>() ?? throw new ArgumentNullException(nameof(IStorageService));
5959
}

‎src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
using Monai.Deploy.WorkflowManager.Common.Miscellaneous.Interfaces;
2222
using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Constants;
2323
using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Extensions;
24-
using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Resolver;
2524
using Monai.Deploy.WorkflowManager.Common.Contracts.Models;
2625
using Monai.Deploy.WorkflowManager.Common.Logging;
2726
using Monai.Deploy.WorkflowManager.Common.Storage.Services;
27+
using Monai.Deploy.WorkflowManager.ConditionsResolver.Resovler;
2828

2929
namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Parser
3030
{

‎src/WorkflowManager/ConditionsResolver/Resovler/Conditional.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
using System.Globalization;
1818
using System.Text.RegularExpressions;
1919

20-
namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Resolver
20+
// ReSharper disable InconsistentNaming
21+
22+
namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Resovler
2123
{
2224
public sealed class Conditional
2325
{
@@ -314,7 +316,7 @@ private bool ContainsEvaluate()
314316
return arr.Any(p => CleanString(p).Equals(compare));
315317
}
316318

317-
private static string CleanString(string p) => p.Trim().Trim('\"').Trim('\'').Trim('“').Trim('”');
319+
private static string CleanString(string p) => p.Trim().Trim('\"').Trim('\'').Trim('�').Trim('�');
318320

319321
private static bool EqualsNullOrDefined(string str) =>
320322
str.Trim().Equals(NULL, StringComparison.InvariantCultureIgnoreCase)

‎src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using Ardalis.GuardClauses;
1919
using Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Extensions;
2020

21-
namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Resolver
21+
namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Resovler
2222
{
2323
public class ConditionalGroup
2424
{

‎src/WorkflowManager/ConditionsResolver/Resovler/Keyword.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
namespace Monai.Deploy.WorkflowManager.Common.ConditionsResolver.Resolver
17+
namespace Monai.Deploy.WorkflowManager.ConditionsResolver.Resovler
1818
{
1919
/// <summary>
2020
/// Group Keywords or Operators

0 commit comments

Comments
 (0)