fix tests for workflow validation

Signed-off-by: Sam Rooke <[email protected]>

Author: samrooke

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/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs

@@ -350,16 +350,17 @@ private void ValidateInputs(TaskObject currentTask)
 
         private void ValidateArgoTask(TaskObject currentTask)
         {
-            var validKeys = new string[] { WorkflowTemplateName, TaskPriorityClassName, Cpu, Memory, GpuRequired };
-            if (currentTask.Args.Keys.Any(k => !validKeys.Contains(k)))
+            if (!currentTask.Args.ContainsKey(WorkflowTemplateName))
             {
-                Errors.Add($"Task: '{currentTask.Id}' args has invalid keys. Please only specify keys from the following list: {string.Join(", ", validKeys)}.");
-                return;
+                Errors.Add($"Task: '{currentTask.Id}' workflow_template_name must be specified{Comma}this corresponds to an Argo template name.");
             }
 
-            if (!currentTask.Args.ContainsKey(WorkflowTemplateName))
+            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}' workflow_template_name must be specified{Comma}this corresponds to an Argo template name.");
+                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))

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

@@ -340,7 +340,7 @@ public async Task ValidateWorkflow_ValidatesAWorkflow_ReturnsErrorsAndHasCorrect
                         Type = "argo",
                         Description = "Invalid Key Argo Task",
                         Args = {
-                            { "invalid", "key" },
+                            { "invalid_key", "value" },
                             { "workflow_template_name" ,"spot"},
                             { "cpu", "1" },
                             { "memory_gb", "1" },
@@ -436,7 +436,7 @@ 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. Please only specify keys from the following list: workflow_template_name, priority, cpu, memory_gb, gpu_required.";
+            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);
         }