Merge branch 'develop' into AC-2010

Author: lillie-dae

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

@@ -467,7 +467,7 @@ private void AddLimit(Template2 template, ResourcesKey key)
                 value = bool.TryParse(value, out bool gpuRequired) && gpuRequired ? "1" : "0";
             }
 
-            template.Container.Resources.Limits.Add(key.ArgoKey, value);
+            template.Container.Resources.Limits[key.ArgoKey] = value;
         }
 
         private async Task AddMainWorkflowTemplate(Workflow workflow, CancellationToken cancellationToken)

src/TaskManager/Plug-ins/Argo/StaticValues/ResourcesKeys.cs

@@ -18,14 +18,10 @@ namespace Monai.Deploy.WorkflowManager.TaskManager.Argo.StaticValues
 {
     public static class ResourcesKeys
     {
-        public static readonly ResourcesKey MemoryReservation = new() { TaskKey = "memory_reservation", ArgoKey = "requests.memory" };
-
-        public static readonly ResourcesKey CpuReservation = new() { TaskKey = "cpu_reservation", ArgoKey = "requests.cpu" };
-
         public static readonly ResourcesKey GpuLimit = new() { TaskKey = "gpu_required", ArgoKey = "nvidia.com/gpu" };
 
-        public static readonly ResourcesKey MemoryLimit = new() { TaskKey = "memory_gb", ArgoKey = "limits.memory" };
+        public static readonly ResourcesKey MemoryLimit = new() { TaskKey = "memory_gb", ArgoKey = "memory" };
 
-        public static readonly ResourcesKey CpuLimit = new() { TaskKey = "cpu", ArgoKey = "limits.cpu" };
+        public static readonly ResourcesKey CpuLimit = new() { TaskKey = "cpu", ArgoKey = "cpu" };
     }
 }

src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs

@@ -355,6 +355,14 @@ private void ValidateArgoTask(TaskObject currentTask)
                 Errors.Add($"Task: '{currentTask.Id}' workflow_template_name must be specified{Comma}this corresponds to an Argo template name.");
             }
 
+            var validKeys = new string[] { WorkflowTemplateName, TaskPriorityClassName, Cpu, Memory, GpuRequired };
+            var invalidKeys = currentTask.Args.Keys.Where(k => !validKeys.Contains(k));
+            if (invalidKeys.Count() > 0)
+            {
+                Errors.Add($"Task: '{currentTask.Id}' args has invalid keys: {string.Join(", ", invalidKeys)}. Please only specify keys from the following list: {string.Join(", ", validKeys)}.");
+                return;
+            }
+
             if (currentTask.Args.ContainsKey(TaskPriorityClassName))
             {
                 switch (currentTask.Args[TaskPriorityClassName].ToLower())

tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs

@@ -371,9 +371,9 @@ private static void ValidateSimpleTemplate(TaskDispatchEvent message, Workflow w
             Assert.True(template.Container.Resources?.Limits is not null);
             var value = "";
 
-            Assert.True(template.Container.Resources?.Limits?.TryGetValue("limits.memory", out value));
+            Assert.True(template.Container.Resources?.Limits?.TryGetValue("memory", out value));
             Assert.True(value == "1");
-            Assert.True(template.Container.Resources?.Limits?.TryGetValue("limits.cpu", out value));
+            Assert.True(template.Container.Resources?.Limits?.TryGetValue("cpu", out value));
             Assert.True(value == "1");
             Assert.True(template.Container.Resources?.Limits?.TryGetValue("nvidia.com/gpu", out value));
             Assert.True(value == "1");

tests/UnitTests/WorkflowManager.Tests/Validators/WorkflowValidatorTests.cs

@@ -208,7 +208,6 @@ public async Task ValidateWorkflow_ValidatesAWorkflow_ReturnsErrorsAndHasCorrect
                         Type = "argo",
                         Description = "Test Argo Task",
                         Args = {
-                            { "example", "value" },
                             { "cpu", "0.1" },
                             { "memory_gb", "0.1" },
                             { "gpu_required", "2" }
@@ -325,12 +324,30 @@ public async Task ValidateWorkflow_ValidatesAWorkflow_ReturnsErrorsAndHasCorrect
                             new TaskDestination
                             {
                                 Name = "example-task"
+                            },
+                            new TaskDestination
+                            {
+                                Name = "invalid-key-argo-task"
                             }
                         }
                     },
 
                     #endregion SelfReferencingTasks
 
+                    new TaskObject
+                    {
+                        Id = "invalid-key-argo-task",
+                        Type = "argo",
+                        Description = "Invalid Key Argo Task",
+                        Args = {
+                            { "invalid_key", "value" },
+                            { "workflow_template_name" ,"spot"},
+                            { "cpu", "1" },
+                            { "memory_gb", "1" },
+                            { "gpu_required", "1" }
+                        }
+                    },
+
                     // Unreferenced task
                     new TaskObject {
                         Id = "taskdesc3",
@@ -354,7 +371,7 @@ public async Task ValidateWorkflow_ValidatesAWorkflow_ReturnsErrorsAndHasCorrect
 
             Assert.True(errors.Count > 0);
 
-            Assert.Equal(44, errors.Count);
+            Assert.Equal(46, errors.Count);
 
             var convergingTasksDestinations = "Converging Tasks Destinations in tasks: (test-clinical-review-2, example-task) on task: example-task";
             Assert.Contains(convergingTasksDestinations, errors);
@@ -418,6 +435,9 @@ public async Task ValidateWorkflow_ValidatesAWorkflow_ReturnsErrorsAndHasCorrect
 
             var invalidSourceName = "Data origin invalid_origin does not exists. Please review sources configuration management.";
             Assert.Contains(invalidSourceName, errors);
+
+            var invalidArgoKey = $"Task: 'invalid-key-argo-task' args has invalid keys: invalid_key. Please only specify keys from the following list: workflow_template_name, priority, cpu, memory_gb, gpu_required.";
+            Assert.Contains(invalidArgoKey, errors);
         }
 
         [Fact]