Skip to content

Commit d7f3452

Browse files
authored
Merge pull request #471 from serverlessworkflow/fix-cluster-resource-patch
Fixed the ClusterResourceController by removing `namespace` path parameter from patch actions
2 parents 05d0a43 + 9c2786f commit d7f3452

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/api/Synapse.Api.Http/ClusterResourceController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public virtual async Task<IActionResult> MonitorResourceUsingSSE(string name, Ca
174174
/// <param name="resourceVersion">The expected resource version, if any, used for optimistic concurrency</param>
175175
/// <param name="cancellationToken">A <see cref="CancellationToken"/></param>
176176
/// <returns>A new <see cref="IActionResult"/></returns>
177-
[HttpPatch("{namespace}/{name}")]
177+
[HttpPatch("{name}")]
178178
[ProducesResponseType(typeof(Resource), (int)HttpStatusCode.OK)]
179179
[ProducesErrorResponseType(typeof(Neuroglia.ProblemDetails))]
180180
public virtual async Task<IActionResult> PatchResource(string name, [FromBody] Patch patch, string? resourceVersion = null, CancellationToken cancellationToken = default)
@@ -191,7 +191,7 @@ public virtual async Task<IActionResult> PatchResource(string name, [FromBody] P
191191
/// <param name="resourceVersion">The expected resource version, if any, used for optimistic concurrency</param>
192192
/// <param name="cancellationToken">A <see cref="CancellationToken"/></param>
193193
/// <returns>A new <see cref="IActionResult"/></returns>
194-
[HttpPatch("{namespace}/{name}/status")]
194+
[HttpPatch("{name}/status")]
195195
[ProducesResponseType(typeof(Resource), (int)HttpStatusCode.OK)]
196196
[ProducesErrorResponseType(typeof(Neuroglia.ProblemDetails))]
197197
public virtual async Task<IActionResult> PatchResourceStatus(string name, [FromBody] Patch patch, string? resourceVersion = null, CancellationToken cancellationToken = default)

src/core/Synapse.Core/Extensions/TaskDefinitionVersionMapExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ public static class TaskDefinitionVersionMapExtensions
2626
/// </summary>
2727
/// <param name="definitions">An <see cref="IEnumerable{T}"/> containing the <see cref="TaskDefinition"/>s to get the latest of</param>
2828
/// <returns>The latest <see cref="TaskDefinition"/></returns>
29-
public static TaskDefinition GetLatest(this Map<string, TaskDefinition> definitions) => definitions.OrderByDescending(kvp => SemVersion.Parse(kvp.Key, SemVersionStyles.Strict)).First().Value;
29+
public static TaskDefinition GetLatest(this Map<string, TaskDefinition> definitions) => definitions.OrderByDescending(kvp => SemVersion.Parse(kvp.Key, SemVersionStyles.Strict), SemVersion.PrecedenceComparer).First().Value;
3030

3131
/// <summary>
3232
/// Gets the latest version of the <see cref="TaskDefinition"/>
3333
/// </summary>
3434
/// <param name="definitions">An <see cref="IEnumerable{T}"/> containing the <see cref="TaskDefinition"/>s to get the latest of</param>
3535
/// <returns>The latest version</returns>
36-
public static string GetLatestVersion(this Map<string, TaskDefinition> definitions) => definitions.OrderByDescending(kvp => SemVersion.Parse(kvp.Key, SemVersionStyles.Strict)).First().Key;
36+
public static string GetLatestVersion(this Map<string, TaskDefinition> definitions) => definitions.OrderByDescending(kvp => SemVersion.Parse(kvp.Key, SemVersionStyles.Strict), SemVersion.PrecedenceComparer).First().Key;
3737

3838
/// <summary>
3939
/// Gets the specified <see cref="TaskDefinition"/> version

0 commit comments

Comments
 (0)