gh-196 update storage lib & fix warnings

mocsharp · mocsharp · commit d072dec17749 · 2022-07-22T08:46:11.000-07:00
Signed-off-by: Victor Chang &lt;vicchang@nvidia.com&gt;
diff --git a/src/TaskManager/Database/Monai.Deploy.WorkflowManager.TaskManager.Database.csproj b/src/TaskManager/Database/Monai.Deploy.WorkflowManager.TaskManager.Database.csproj
@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache License 2.0
   </PropertyGroup>
 
   <ItemGroup>
-    <AdditionalFiles Include="..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
+    <AdditionalFiles Include="..\..\.sonarlint\project-monai_monai-deploy-workflow-manager\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
   <ItemGroup>
@@ -32,7 +32,7 @@ SPDX-License-Identifier: Apache License 2.0
   <PropertyGroup>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
-    <CodeAnalysisRuleSet>..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   
 </Project>
diff --git a/src/TaskManager/Database/packages.lock.json b/src/TaskManager/Database/packages.lock.json
@@ -195,14 +195,14 @@
       },
       "Monai.Deploy.Storage": {
         "type": "Transitive",
-        "resolved": "0.1.2-vchang-unique-pa0019",
-        "contentHash": "eAoM+nqM+LF3iKHPIfeiotcn8pDmwVMvhZq47D9Kxgb11/jNdxIFJcc5ubvtx+kw5vZdhDfRxpANmOZqsDn1iw==",
+        "resolved": "0.2.0-rc0012",
+        "contentHash": "Ib7NQKYW8coarE8y5z9rNgU3Ry1/PSepr5yvm6ttdKmZ4+SS9D3UhnosLWIWNqNCID7VFXVRbgPmT1OJsKiAGw==",
         "dependencies": {
           "AWSSDK.SecurityToken": "3.7.1.165",
           "Ardalis.GuardClauses": "4.0.1",
           "Microsoft.Extensions.Configuration": "6.0.1",
           "Microsoft.Extensions.Logging": "6.0.0",
-          "Monai.Deploy.Storage.S3Policy": "0.1.2-vchang-unique-pa0019",
+          "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0012",
           "System.IO.Abstractions": "17.0.18"
         }
       },
@@ -222,8 +222,8 @@
       },
       "Monai.Deploy.Storage.S3Policy": {
         "type": "Transitive",
-        "resolved": "0.1.2-vchang-unique-pa0019",
-        "contentHash": "Cr+kGWx8qxueTd1ASm7/2O3q4TLh3n3m82ubK3uXfOeroVpxpI2MLGlxbdgSZuLu74OY8tTFqvCfmdT6rN11QQ==",
+        "resolved": "0.2.0-rc0012",
+        "contentHash": "K91EJk66ipEr1kvauMpr6GNIPMUmso+8KGWSI/6S5ps+gAHzCAbIsVecNslhaK804y0dM8btj8u6QBvqN4I/rQ==",
         "dependencies": {
           "Ardalis.GuardClauses": "4.0.1",
           "Newtonsoft.Json": "13.0.1"
@@ -916,7 +916,7 @@
         "dependencies": {
           "Monai.Deploy.Messaging": "0.1.3-rc0008",
           "Monai.Deploy.Messaging.RabbitMQ": "0.1.3-rc0008",
-          "Monai.Deploy.Storage": "0.1.2-vchang-unique-pa0019",
+          "Monai.Deploy.Storage": "0.2.0-rc0012",
           "Monai.Deploy.Storage.MinIO": "0.1.0",
           "mongodb.bson": "2.17.0"
         }
diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json
@@ -58,15 +58,15 @@
       },
       "Monai.Deploy.Storage": {
         "type": "Direct",
-        "requested": "[0.1.2-vchang-unique-pa0019, )",
-        "resolved": "0.1.2-vchang-unique-pa0019",
-        "contentHash": "eAoM+nqM+LF3iKHPIfeiotcn8pDmwVMvhZq47D9Kxgb11/jNdxIFJcc5ubvtx+kw5vZdhDfRxpANmOZqsDn1iw==",
+        "requested": "[0.2.0-rc0012, )",
+        "resolved": "0.2.0-rc0012",
+        "contentHash": "Ib7NQKYW8coarE8y5z9rNgU3Ry1/PSepr5yvm6ttdKmZ4+SS9D3UhnosLWIWNqNCID7VFXVRbgPmT1OJsKiAGw==",
         "dependencies": {
           "AWSSDK.SecurityToken": "3.7.1.165",
           "Ardalis.GuardClauses": "4.0.1",
           "Microsoft.Extensions.Configuration": "6.0.1",
           "Microsoft.Extensions.Logging": "6.0.0",
-          "Monai.Deploy.Storage.S3Policy": "0.1.2-vchang-unique-pa0019",
+          "Monai.Deploy.Storage.S3Policy": "0.2.0-rc0012",
           "System.IO.Abstractions": "17.0.18"
         }
       },
@@ -312,8 +312,8 @@
       },
       "Monai.Deploy.Storage.S3Policy": {
         "type": "Transitive",
-        "resolved": "0.1.2-vchang-unique-pa0019",
-        "contentHash": "Cr+kGWx8qxueTd1ASm7/2O3q4TLh3n3m82ubK3uXfOeroVpxpI2MLGlxbdgSZuLu74OY8tTFqvCfmdT6rN11QQ==",
+        "resolved": "0.2.0-rc0012",
+        "contentHash": "K91EJk66ipEr1kvauMpr6GNIPMUmso+8KGWSI/6S5ps+gAHzCAbIsVecNslhaK804y0dM8btj8u6QBvqN4I/rQ==",
         "dependencies": {
           "Ardalis.GuardClauses": "4.0.1",
           "Newtonsoft.Json": "13.0.1"
diff --git a/src/TaskManager/Plug-ins/TestPlugin/TestPlugin.cs b/src/TaskManager/Plug-ins/TestPlugin/TestPlugin.cs
@@ -30,7 +30,8 @@ public TestPlugin(
 
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _messageBrokerPublisherService = messageBrokerPublisherService ?? throw new ArgumentNullException(nameof(messageBrokerPublisherService));
-
+            _executeTaskStatus = string.Empty;
+            _getStatusStatus = string.Empty;
             ValidateEventAndInit();
             Initialize();
         }
@@ -64,40 +65,40 @@ private void ValidateEventAndInit()
             }
         }
 
-        public override async Task<ExecutionStatus> ExecuteTask(CancellationToken cancellationToken = default)
+        public override Task<ExecutionStatus> ExecuteTask(CancellationToken cancellationToken = default)
         {
             if (_executeTaskStatus.ToLower() == "succeeded")
             {
-                return new ExecutionStatus { Status = TaskExecutionStatus.Succeeded, FailureReason = FailureReason.None };
+                return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Succeeded, FailureReason = FailureReason.None });
             }
             else if (_executeTaskStatus.ToLower() == "failed")
             {
-                return new ExecutionStatus { Status = TaskExecutionStatus.Failed, FailureReason = FailureReason.PluginError };
+                return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Failed, FailureReason = FailureReason.PluginError });
             }
             else if (_executeTaskStatus.ToLower() == "cancelled")
             {
-                return new ExecutionStatus { Status = TaskExecutionStatus.Canceled, FailureReason = FailureReason.None };
+                return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Canceled, FailureReason = FailureReason.None });
             }
 
-            return new ExecutionStatus { Status = TaskExecutionStatus.Accepted, FailureReason = FailureReason.None };
+            return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Accepted, FailureReason = FailureReason.None });
         }
 
-        public override async Task<ExecutionStatus> GetStatus(string identity, CancellationToken cancellationToken = default)
+        public override Task<ExecutionStatus> GetStatus(string identity, CancellationToken cancellationToken = default)
         {
             if (_getStatusStatus.ToLower() == "accepted")
             {
-                return new ExecutionStatus { Status = TaskExecutionStatus.Accepted, FailureReason = FailureReason.None };
+                return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Accepted, FailureReason = FailureReason.None });
             }
             else if (_getStatusStatus.ToLower() == "failed")
             {
-                return new ExecutionStatus { Status = TaskExecutionStatus.Failed, FailureReason = FailureReason.PluginError };
+                return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Failed, FailureReason = FailureReason.PluginError });
             }
             else if (_getStatusStatus.ToLower() == "cancelled")
             {
-                return new ExecutionStatus { Status = TaskExecutionStatus.Canceled, FailureReason = FailureReason.None };
+                return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Canceled, FailureReason = FailureReason.None });
             }
 
-            return new ExecutionStatus { Status = TaskExecutionStatus.Succeeded, FailureReason = FailureReason.None };
+            return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Succeeded, FailureReason = FailureReason.None });
         }
         ~TestPlugin() => Dispose(disposing: false);
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,8 @@ public TestPlugin(`
`30`	`30`
`31`	`31`	`_logger = logger ?? throw new ArgumentNullException(nameof(logger));`
`32`	`32`	`_messageBrokerPublisherService = messageBrokerPublisherService ?? throw new ArgumentNullException(nameof(messageBrokerPublisherService));`
`33`		`-`
	`33`	`+ _executeTaskStatus = string.Empty;`
	`34`	`+ _getStatusStatus = string.Empty;`
`34`	`35`	`ValidateEventAndInit();`
`35`	`36`	`Initialize();`
`36`	`37`	`}`
`@@ -64,40 +65,40 @@ private void ValidateEventAndInit()`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`
`67`		`- public override async Task<ExecutionStatus> ExecuteTask(CancellationToken cancellationToken = default)`
	`68`	`+ public override Task<ExecutionStatus> ExecuteTask(CancellationToken cancellationToken = default)`
`68`	`69`	`{`
`69`	`70`	`if (_executeTaskStatus.ToLower() == "succeeded")`
`70`	`71`	`{`
`71`		`- return new ExecutionStatus { Status = TaskExecutionStatus.Succeeded, FailureReason = FailureReason.None };`
	`72`	`+ return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Succeeded, FailureReason = FailureReason.None });`
`72`	`73`	`}`
`73`	`74`	`else if (_executeTaskStatus.ToLower() == "failed")`
`74`	`75`	`{`
`75`		`- return new ExecutionStatus { Status = TaskExecutionStatus.Failed, FailureReason = FailureReason.PluginError };`
	`76`	`+ return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Failed, FailureReason = FailureReason.PluginError });`
`76`	`77`	`}`
`77`	`78`	`else if (_executeTaskStatus.ToLower() == "cancelled")`
`78`	`79`	`{`
`79`		`- return new ExecutionStatus { Status = TaskExecutionStatus.Canceled, FailureReason = FailureReason.None };`
	`80`	`+ return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Canceled, FailureReason = FailureReason.None });`
`80`	`81`	`}`
`81`	`82`
`82`		`- return new ExecutionStatus { Status = TaskExecutionStatus.Accepted, FailureReason = FailureReason.None };`
	`83`	`+ return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Accepted, FailureReason = FailureReason.None });`
`83`	`84`	`}`
`84`	`85`
`85`		`- public override async Task<ExecutionStatus> GetStatus(string identity, CancellationToken cancellationToken = default)`
	`86`	`+ public override Task<ExecutionStatus> GetStatus(string identity, CancellationToken cancellationToken = default)`
`86`	`87`	`{`
`87`	`88`	`if (_getStatusStatus.ToLower() == "accepted")`
`88`	`89`	`{`
`89`		`- return new ExecutionStatus { Status = TaskExecutionStatus.Accepted, FailureReason = FailureReason.None };`
	`90`	`+ return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Accepted, FailureReason = FailureReason.None });`
`90`	`91`	`}`
`91`	`92`	`else if (_getStatusStatus.ToLower() == "failed")`
`92`	`93`	`{`
`93`		`- return new ExecutionStatus { Status = TaskExecutionStatus.Failed, FailureReason = FailureReason.PluginError };`
	`94`	`+ return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Failed, FailureReason = FailureReason.PluginError });`
`94`	`95`	`}`
`95`	`96`	`else if (_getStatusStatus.ToLower() == "cancelled")`
`96`	`97`	`{`
`97`		`- return new ExecutionStatus { Status = TaskExecutionStatus.Canceled, FailureReason = FailureReason.None };`
	`98`	`+ return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Canceled, FailureReason = FailureReason.None });`
`98`	`99`	`}`
`99`	`100`
`100`		`- return new ExecutionStatus { Status = TaskExecutionStatus.Succeeded, FailureReason = FailureReason.None };`
	`101`	`+ return Task.FromResult(new ExecutionStatus { Status = TaskExecutionStatus.Succeeded, FailureReason = FailureReason.None });`
`101`	`102`	`}`
`102`	`103`	`~TestPlugin() => Dispose(disposing: false);`
`103`	`104`