Dependencies update (#175)

Co-authored-by: stas <[email protected]>
microsoft · Mar 26, 2021 · 3be1483 · 3be1483
1 parent b71accf
commit 3be1483
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 11 deletions.
diff --git a/cli/raft-tools/auth/node-js/msal/package.json b/cli/raft-tools/auth/node-js/msal/package.json
@@ -2,6 +2,6 @@
     "name" : "@nsv/raft-msal",
     "version" : "1.0.0",
     "dependencies" : {
-        "@azure/msal-node": "^1.0.0-alpha.9"
+        "@azure/msal-node": "^1.0.1"
     }
 }
diff --git a/cli/raft-tools/tools/Dredd/package.json b/cli/raft-tools/tools/Dredd/package.json
@@ -2,7 +2,7 @@
     "name" : "@nsv/raft-dredd",
     "version" : "1.0.0",
     "dependencies" : {
-        "@azure/service-bus": "^7.0.0",
+        "@azure/service-bus": "^7.0.3",
         "applicationinsights": "^1.8.8"
     }
 }
diff --git a/src/APIService/ApiService/APIService.fsproj b/src/APIService/ApiService/APIService.fsproj
@@ -46,11 +46,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Core" Version="1.10.0" />
+    <PackageReference Include="Azure.Core" Version="1.11.0" />
     <PackageReference Include="Azure.Storage.Files.Shares" Version="12.6.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.17.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.17.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
     <PackageReference Include="Microsoft.Azure.EventGrid" Version="3.2.0" />
     <PackageReference Include="Microsoft.Azure.Management.EventGrid" Version="6.0.0" />
@@ -61,14 +62,15 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
     <PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.6" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="1.8.1" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="1.8.2" />
     <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.2.3" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="6.1.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.1.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.1.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.1.1" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
     <PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
   </ItemGroup>
 

diff --git a/src/Agent/AzureAuth/AzureAuth.fsproj b/src/Agent/AzureAuth/AzureAuth.fsproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.6" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.27.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.28.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Agent/RESTlerAgent/RestlerAgent.fsproj b/src/Agent/RESTlerAgent/RestlerAgent.fsproj
@@ -19,9 +19,11 @@
   <ItemGroup>
     <PackageReference Include="FsCheck" Version="2.15.1" />
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.17.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
     <PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.1.2" />
     <PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.6" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Orchestrator/Orchestrator/Orchestrator.csproj b/src/Orchestrator/Orchestrator/Orchestrator.csproj
@@ -5,6 +5,7 @@
     <AzureFunctionsVersion>v3</AzureFunctionsVersion>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.0.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Core" Version="1.0.0" />
@@ -15,6 +16,7 @@
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.0.1" />
     <PackageReference Include="Microsoft.Azure.Management.ContainerInstance.Fluent" Version="1.37.1" />
     <PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.1.2" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OrchestratorLogic\OrchestratorLogic.fsproj" />

diff --git a/src/Orchestrator/OrchestratorLogic/Orchestrator.fs b/src/Orchestrator/OrchestratorLogic/Orchestrator.fs
@@ -1312,21 +1312,21 @@ module ContainerInstances =
         g.State = ContainerGroupStates.Stopped
 
     let isJobProvisioningFailed (g:IContainerGroup) =
-        g.State = ContainerGroupStates.Failed || g.ProvisioningState = ContainerGroupStates.Failed
+        g.ProvisioningState = ContainerGroupStates.Failed
 
     let stopJob (containerGroup : IContainerGroup) =
         async {
             if not (isJobManuallyStopped containerGroup || isJobProvisioningFailed containerGroup) then
                 do! containerGroup.StopAsync().ToAsync
         }
 
-
     /// Get a sequence of containers that terminated due to error
     let getContainersExitedWithError (g: IContainerGroup) =
         g.Containers |> Seq.filter(fun (KeyValue(_, v)) ->
             if not <| isNull v.InstanceView then
                 let currentState = v.InstanceView.CurrentState
-                currentState.DetailStatus = ContainerInstancesStates.Error
+                currentState.DetailStatus = ContainerInstancesStates.Error ||
+                (currentState.State = ContainerInstancesStates.Terminated && currentState.ExitCode <> Nullable<int>(0))
             else false)
         |> Seq.map (fun (KeyValue(_, v)) -> v)
 
@@ -1635,6 +1635,7 @@ module ContainerInstances =
                             // if stopped it cannot be expired
                             false
                         else if isJobExpired logger containerGroup then
+                            logInfo "Job Expired : %s" containerGroupName
                             true
                         else
                             false
@@ -1657,6 +1658,7 @@ module ContainerInstances =
 
                         let state, details =
                             if containerGroupFailedToProvision then
+                                logInfo "Container group failed to provision : %s" containerGroupName
                                 JobState.Error, 
                                     (Map.empty, containerGroup.Events |> List.ofSeq)
                                     ||> List.fold( fun details v ->
@@ -1666,12 +1668,15 @@ module ContainerInstances =
                                             .Add("Type", v.Type)
                                     )
                             else if isExpired then
+                                logInfo "Job Expired : %s" containerGroupName
                                 JobState.TimedOut, Map.empty
                             else if jobManuallyStopped then
+                                logInfo "Job Manually stopped : %s" containerGroupName
                                 JobState.ManuallyStopped, Map.empty
                             else if Seq.isEmpty instancesExitedWithError then
                                 JobState.Completed, Map.empty
                             else
+                                logInfo "At least one instance exited with an error : %s" containerGroupName
                                 //There is at least one container that terminated with an error
                                 JobState.Error, 
                                     (Map.empty, instancesExitedWithError |> List.ofSeq)
@@ -1692,7 +1697,7 @@ module ContainerInstances =
                         for v in instancesExitedWithError do
                             let! failedContainerLogs = containerGroup.GetLogContentAsync(v.Name).ToAsync
 
-                            logInfo "[%s][%s][State:%A][DetailStatus: %A][ExitCode: %A] failed logs: %s\nEvents: %A" 
+                            logInfo "Instance Exited with Error: [%s][%s][State:%A][DetailStatus: %A][ExitCode: %A] failed logs: %s\nEvents: %A" 
                                         containerGroup.Name v.Name 
                                         v.InstanceView.CurrentState.State
                                         v.InstanceView.CurrentState.DetailStatus 

diff --git a/src/Orchestrator/OrchestratorLogic/OrchestratorLogic.fsproj b/src/Orchestrator/OrchestratorLogic/OrchestratorLogic.fsproj
@@ -15,18 +15,20 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Core" Version="1.10.0" />
+    <PackageReference Include="Azure.Core" Version="1.11.0" />
     <PackageReference Include="Azure.Storage.Common" Version="12.7.0" />
     <PackageReference Include="Azure.Storage.Files.Shares" Version="12.6.0" />
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.17.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.17.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
     <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
     <PackageReference Include="Microsoft.Azure.Management.ContainerInstance.Fluent" Version="1.37.1" />
     <PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.37.1" />
     <PackageReference Include="Microsoft.Azure.Management.ResourceManager.Fluent" Version="1.37.1" />
     <PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.6" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Test/TestInfraLogic/TestInfraLogic.fsproj b/src/Test/TestInfraLogic/TestInfraLogic.fsproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Core" Version="1.10.0" />
+    <PackageReference Include="Azure.Core" Version="1.11.0" />
     <PackageReference Include="Azure.Storage.Files.Shares" Version="12.6.0" />
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.17.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.17.0" />