Skip to content

Prevent multiple artifacts being added to the output array with duplicated names #457

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

Merged
samrooke merged 6 commits into from
Sep 27, 2022
Merged

Prevent multiple artifacts being added to the output array with duplicated names #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
39af4eb
AC-582: Add unique task output name validation
samrooke Sep 26, 2022
27d7d19
Added tests
RemakingEden Sep 27, 2022
8cd6088
AC-582: update order of validation
samrooke Sep 27, 2022
aedaeb0
Changed packages.lock back to develop
RemakingEden Sep 27, 2022
381d3fa
add tests to check for duplicate artifact names in the same task
samrooke Sep 27, 2022
509ce78
Merge branch 'develop' into AC-582
RemakingEden Sep 27, 2022
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
2 changes: 1 addition & 1 deletion src/TaskManager/Plug-ins/Argo/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,4 +573,4 @@
}
}
}
}
}
60 changes: 30 additions & 30 deletions src/TaskManager/TaskManager/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,8 +1001,8 @@
},
"System.IO.Abstractions": {
"type": "Transitive",
"resolved": "17.2.1",
"contentHash": "QiPMiZa6SP9FxvM4k2Tso4j7DHbdpZo5dcGnVD38XjXnm2fOsYg4BkHmADTa5Tq7Fc0OzUGvHhV5KePPCwxB8Q=="
"resolved": "17.2.3",
"contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ=="
},
"System.IO.FileSystem": {
"type": "Transitive",
Expand Down Expand Up @@ -1418,55 +1418,55 @@
"monai.deploy.workflowmanager.configuration": {
"type": "Project",
"dependencies": {
"Karambolo.Extensions.Logging.File": "[3.3.1, )",
"Microsoft.Extensions.Configuration": "[6.0.1, )",
"Microsoft.Extensions.Logging": "[6.0.0, )",
"Microsoft.Extensions.Options": "[6.0.0, )",
"Monai.Deploy.Messaging": "[0.1.6-rc0001, )",
"Monai.Deploy.Storage": "[0.2.5, )",
"Newtonsoft.Json": "[13.0.1, )",
"System.IO.Abstractions": "[17.2.1, )"
"Karambolo.Extensions.Logging.File": "3.3.1",
"Microsoft.Extensions.Configuration": "6.0.1",
"Microsoft.Extensions.Logging": "6.0.0",
"Microsoft.Extensions.Options": "6.0.0",
"Monai.Deploy.Messaging": "0.1.6-rc0001",
"Monai.Deploy.Storage": "0.2.5",
"Newtonsoft.Json": "13.0.1",
"System.IO.Abstractions": "17.2.3"
}
},
"monai.deploy.workflowmanager.taskmanager.api": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[0.1.6-rc0001, )",
"Monai.Deploy.Storage": "[0.2.5, )",
"MongoDB.Bson": "[2.17.1, )"
"Monai.Deploy.Messaging": "0.1.6-rc0001",
"Monai.Deploy.Storage": "0.2.5",
"MongoDB.Bson": "2.17.1"
}
},
"monai.deploy.workflowmanager.taskmanager.argo": {
"type": "Project",
"dependencies": {
"IdentityModel.OidcClient": "[5.0.2, )",
"KubernetesClient": "[7.2.19, )",
"Monai.Deploy.Messaging": "[0.1.6-rc0001, )",
"Monai.Deploy.Storage": "[0.2.5, )",
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )",
"Newtonsoft.Json": "[13.0.1, )"
"IdentityModel.OidcClient": "5.0.2",
"KubernetesClient": "7.2.19",
"Monai.Deploy.Messaging": "0.1.6-rc0001",
"Monai.Deploy.Storage": "0.2.5",
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
"Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0",
"Newtonsoft.Json": "13.0.1"
}
},
"monai.deploy.workflowmanager.taskmanager.database": {
"type": "Project",
"dependencies": {
"Ardalis.GuardClauses": "[4.0.1, )",
"Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )",
"Microsoft.Extensions.Options": "[6.0.0, )",
"Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )",
"MongoDB.Bson": "[2.17.1, )",
"MongoDB.Driver": "[2.17.1, )"
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Logging.Abstractions": "6.0.2",
"Microsoft.Extensions.Options": "6.0.0",
"Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0",
"MongoDB.Bson": "2.17.1",
"MongoDB.Driver": "2.17.1"
}
},
"monai.deploy.workflowmanager.taskmanager.docker": {
"type": "Project",
"dependencies": {
"Docker.DotNet": "[3.125.12, )",
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )"
"Docker.DotNet": "3.125.12",
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
"Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0"
}
}
}
}
}
}
102 changes: 51 additions & 51 deletions src/WorkflowManager/PayloadListener/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,93 +902,93 @@
"monai.deploy.workflowmanager.common": {
"type": "Project",
"dependencies": {
"Ardalis.GuardClauses": "[4.0.1, )",
"Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )",
"Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Database": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )"
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
"Monai.Deploy.WorkflowManager.Database": "1.0.0",
"Monai.Deploy.WorkflowManager.Storage": "1.0.0"
}
},
"monai.deploy.workflowmanager.conditionsresolver": {
"type": "Project",
"dependencies": {
"Ardalis.GuardClauses": "[4.0.1, )",
"Monai.Deploy.WorkflowManager.Common": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Database": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )"
"Ardalis.GuardClauses": "4.0.1",
"Monai.Deploy.WorkflowManager.Common": "1.0.0",
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
"Monai.Deploy.WorkflowManager.Database": "1.0.0",
"Monai.Deploy.WorkflowManager.Storage": "1.0.0"
}
},
"monai.deploy.workflowmanager.configuration": {
"type": "Project",
"dependencies": {
"Karambolo.Extensions.Logging.File": "[3.3.1, )",
"Microsoft.Extensions.Configuration": "[6.0.1, )",
"Microsoft.Extensions.Logging": "[6.0.0, )",
"Microsoft.Extensions.Options": "[6.0.0, )",
"Monai.Deploy.Messaging": "[0.1.6-rc0001, )",
"Monai.Deploy.Storage": "[0.2.5, )",
"Newtonsoft.Json": "[13.0.1, )",
"System.IO.Abstractions": "[17.2.3, )"
"Karambolo.Extensions.Logging.File": "3.3.1",
"Microsoft.Extensions.Configuration": "6.0.1",
"Microsoft.Extensions.Logging": "6.0.0",
"Microsoft.Extensions.Options": "6.0.0",
"Monai.Deploy.Messaging": "0.1.6-rc0001",
"Monai.Deploy.Storage": "0.2.5",
"Newtonsoft.Json": "13.0.1",
"System.IO.Abstractions": "17.2.3"
}
},
"monai.deploy.workflowmanager.contracts": {
"type": "Project",
"dependencies": {
"AWSSDK.SecurityToken": "[3.7.1.203, )",
"Microsoft.Extensions.Configuration": "[6.0.1, )",
"Monai.Deploy.Messaging": "[0.1.6-rc0001, )",
"MongoDB.Bson": "[2.17.1, )",
"Newtonsoft.Json": "[13.0.1, )"
"AWSSDK.SecurityToken": "3.7.1.203",
"Microsoft.Extensions.Configuration": "6.0.1",
"Monai.Deploy.Messaging": "0.1.6-rc0001",
"MongoDB.Bson": "2.17.1",
"Newtonsoft.Json": "13.0.1"
}
},
"monai.deploy.workflowmanager.database": {
"type": "Project",
"dependencies": {
"Ardalis.GuardClauses": "[4.0.1, )",
"Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )",
"Microsoft.Extensions.Options": "[6.0.0, )",
"Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )",
"MongoDB.Bson": "[2.17.1, )",
"MongoDB.Driver": "[2.17.1, )"
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Logging.Abstractions": "6.0.2",
"Microsoft.Extensions.Options": "6.0.0",
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
"Monai.Deploy.WorkflowManager.Logging": "1.0.0",
"MongoDB.Bson": "2.17.1",
"MongoDB.Driver": "2.17.1"
}
},
"monai.deploy.workflowmanager.logging": {
"type": "Project",
"dependencies": {
"Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )",
"Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )",
"Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
"Serilog": "[2.11.0, )"
"Microsoft.AspNetCore.Mvc.Core": "2.2.5",
"Microsoft.Extensions.Logging.Abstractions": "6.0.2",
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
"Serilog": "2.11.0"
}
},
"monai.deploy.workflowmanager.storage": {
"type": "Project",
"dependencies": {
"Ardalis.GuardClauses": "[4.0.1, )",
"Monai.Deploy.Storage": "[0.2.5, )",
"Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )"
"Ardalis.GuardClauses": "4.0.1",
"Monai.Deploy.Storage": "0.2.5",
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
"Monai.Deploy.WorkflowManager.Logging": "1.0.0"
}
},
"monai.deploy.workloadmanager.workfowexecuter": {
"type": "Project",
"dependencies": {
"AWSSDK.SecurityToken": "[3.7.1.203, )",
"Ardalis.GuardClauses": "[4.0.1, )",
"Monai.Deploy.Messaging": "[0.1.6-rc0001, )",
"Monai.Deploy.Storage": "[0.2.5, )",
"Monai.Deploy.WorkflowManager.Common": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Database": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )",
"Newtonsoft.Json": "[13.0.1, )"
"AWSSDK.SecurityToken": "3.7.1.203",
"Ardalis.GuardClauses": "4.0.1",
"Monai.Deploy.Messaging": "0.1.6-rc0001",
"Monai.Deploy.Storage": "0.2.5",
"Monai.Deploy.WorkflowManager.Common": "1.0.0",
"Monai.Deploy.WorkflowManager.ConditionsResolver": "1.0.0",
"Monai.Deploy.WorkflowManager.Configuration": "1.0.0",
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
"Monai.Deploy.WorkflowManager.Database": "1.0.0",
"Monai.Deploy.WorkflowManager.Logging": "1.0.0",
"Monai.Deploy.WorkflowManager.Storage": "1.0.0",
"Newtonsoft.Json": "13.0.1"
}
}
}
}
}
}
78 changes: 39 additions & 39 deletions src/WorkflowManager/WorkflowExecuter/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,76 +904,76 @@
"monai.deploy.workflowmanager.common": {
"type": "Project",
"dependencies": {
"Ardalis.GuardClauses": "[4.0.1, )",
"Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )",
"Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Database": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )"
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0",
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
"Monai.Deploy.WorkflowManager.Database": "1.0.0",
"Monai.Deploy.WorkflowManager.Storage": "1.0.0"
}
},
"monai.deploy.workflowmanager.conditionsresolver": {
"type": "Project",
"dependencies": {
"Ardalis.GuardClauses": "[4.0.1, )",
"Monai.Deploy.WorkflowManager.Common": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Database": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )"
"Ardalis.GuardClauses": "4.0.1",
"Monai.Deploy.WorkflowManager.Common": "1.0.0",
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
"Monai.Deploy.WorkflowManager.Database": "1.0.0",
"Monai.Deploy.WorkflowManager.Storage": "1.0.0"
}
},
"monai.deploy.workflowmanager.configuration": {
"type": "Project",
"dependencies": {
"Karambolo.Extensions.Logging.File": "[3.3.1, )",
"Microsoft.Extensions.Configuration": "[6.0.1, )",
"Microsoft.Extensions.Logging": "[6.0.0, )",
"Microsoft.Extensions.Options": "[6.0.0, )",
"Monai.Deploy.Messaging": "[0.1.6-rc0001, )",
"Monai.Deploy.Storage": "[0.2.5, )",
"Newtonsoft.Json": "[13.0.1, )",
"System.IO.Abstractions": "[17.2.3, )"
"Karambolo.Extensions.Logging.File": "3.3.1",
"Microsoft.Extensions.Configuration": "6.0.1",
"Microsoft.Extensions.Logging": "6.0.0",
"Microsoft.Extensions.Options": "6.0.0",
"Monai.Deploy.Messaging": "0.1.6-rc0001",
"Monai.Deploy.Storage": "0.2.5",
"Newtonsoft.Json": "13.0.1",
"System.IO.Abstractions": "17.2.3"
}
},
"monai.deploy.workflowmanager.contracts": {
"type": "Project",
"dependencies": {
"AWSSDK.SecurityToken": "[3.7.1.203, )",
"Microsoft.Extensions.Configuration": "[6.0.1, )",
"Monai.Deploy.Messaging": "[0.1.6-rc0001, )",
"MongoDB.Bson": "[2.17.1, )",
"Newtonsoft.Json": "[13.0.1, )"
"AWSSDK.SecurityToken": "3.7.1.203",
"Microsoft.Extensions.Configuration": "6.0.1",
"Monai.Deploy.Messaging": "0.1.6-rc0001",
"MongoDB.Bson": "2.17.1",
"Newtonsoft.Json": "13.0.1"
}
},
"monai.deploy.workflowmanager.database": {
"type": "Project",
"dependencies": {
"Ardalis.GuardClauses": "[4.0.1, )",
"Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )",
"Microsoft.Extensions.Options": "[6.0.0, )",
"Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )",
"MongoDB.Bson": "[2.17.1, )",
"MongoDB.Driver": "[2.17.1, )"
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Logging.Abstractions": "6.0.2",
"Microsoft.Extensions.Options": "6.0.0",
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
"Monai.Deploy.WorkflowManager.Logging": "1.0.0",
"MongoDB.Bson": "2.17.1",
"MongoDB.Driver": "2.17.1"
}
},
"monai.deploy.workflowmanager.logging": {
"type": "Project",
"dependencies": {
"Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )",
"Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )",
"Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
"Serilog": "[2.11.0, )"
"Microsoft.AspNetCore.Mvc.Core": "2.2.5",
"Microsoft.Extensions.Logging.Abstractions": "6.0.2",
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
"Serilog": "2.11.0"
}
},
"monai.deploy.workflowmanager.storage": {
"type": "Project",
"dependencies": {
"Ardalis.GuardClauses": "[4.0.1, )",
"Monai.Deploy.Storage": "[0.2.5, )",
"Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )"
"Ardalis.GuardClauses": "4.0.1",
"Monai.Deploy.Storage": "0.2.5",
"Monai.Deploy.WorkflowManager.Contracts": "1.0.0",
"Monai.Deploy.WorkflowManager.Logging": "1.0.0"
}
}
}
}
}
}
1 change: 0 additions & 1 deletion src/WorkflowManager/WorkflowManager/Controllers/WorkflowsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
Expand Down
Loading