Skip to content
This repository was archived by the owner on Feb 2, 2022. It is now read-only.

Commit 3be1483

Browse files
stishkinstas
stishkin
and
stas
authored
Dependencies update (#175)
Co-authored-by: stas <[email protected]>
1 parent b71accf commit 3be1483

File tree

9 files changed

+24
-11
lines changed

9 files changed

+24
-11
lines changed

‎cli/raft-tools/auth/node-js/msal/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"name" : "@nsv/raft-msal",
33
"version" : "1.0.0",
44
"dependencies" : {
5-
"@azure/msal-node": "^1.0.0-alpha.9"
5+
"@azure/msal-node": "^1.0.1"
66
}
77
}

‎cli/raft-tools/tools/Dredd/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name" : "@nsv/raft-dredd",
33
"version" : "1.0.0",
44
"dependencies" : {
5-
"@azure/service-bus": "^7.0.0",
5+
"@azure/service-bus": "^7.0.3",
66
"applicationinsights": "^1.8.8"
77
}
88
}

‎src/APIService/ApiService/APIService.fsproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,12 @@
4646
</ItemGroup>
4747

4848
<ItemGroup>
49-
<PackageReference Include="Azure.Core" Version="1.10.0" />
49+
<PackageReference Include="Azure.Core" Version="1.11.0" />
5050
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.6.0" />
5151
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.17.0" />
5252
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.17.0" />
5353
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="5.0.4" />
54+
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
5455
<PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
5556
<PackageReference Include="Microsoft.Azure.EventGrid" Version="3.2.0" />
5657
<PackageReference Include="Microsoft.Azure.Management.EventGrid" Version="6.0.0" />
@@ -61,14 +62,15 @@
6162
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
6263
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
6364
<PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.6" />
64-
<PackageReference Include="Microsoft.Identity.Web" Version="1.8.1" />
65+
<PackageReference Include="Microsoft.Identity.Web" Version="1.8.2" />
6566
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.2.3" />
6667
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.1" />
6768
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="6.1.0" />
6869
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.1.1" />
6970
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.1" />
7071
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.1.1" />
7172
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.1.1" />
73+
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
7274
<PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
7375
</ItemGroup>
7476

‎src/Agent/AzureAuth/AzureAuth.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.6" />
14-
<PackageReference Include="Microsoft.Identity.Client" Version="4.27.0" />
14+
<PackageReference Include="Microsoft.Identity.Client" Version="4.28.1" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎src/Agent/RESTlerAgent/RestlerAgent.fsproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
<ItemGroup>
2020
<PackageReference Include="FsCheck" Version="2.15.1" />
2121
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.17.0" />
22+
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
2223
<PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
2324
<PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.1.2" />
2425
<PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.6" />
26+
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
2527
</ItemGroup>
2628

2729
<ItemGroup>

‎src/Orchestrator/Orchestrator/Orchestrator.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
66
</PropertyGroup>
77
<ItemGroup>
8+
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
89
<PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
910
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.0.0" />
1011
<PackageReference Include="Microsoft.Azure.Functions.Worker.Core" Version="1.0.0" />
@@ -15,6 +16,7 @@
1516
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.0.1" />
1617
<PackageReference Include="Microsoft.Azure.Management.ContainerInstance.Fluent" Version="1.37.1" />
1718
<PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.1.2" />
19+
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
1820
</ItemGroup>
1921
<ItemGroup>
2022
<ProjectReference Include="..\OrchestratorLogic\OrchestratorLogic.fsproj" />

‎src/Orchestrator/OrchestratorLogic/Orchestrator.fs‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,21 +1312,21 @@ module ContainerInstances =
13121312
g.State = ContainerGroupStates.Stopped
13131313

13141314
let isJobProvisioningFailed (g:IContainerGroup) =
1315-
g.State = ContainerGroupStates.Failed || g.ProvisioningState = ContainerGroupStates.Failed
1315+
g.ProvisioningState = ContainerGroupStates.Failed
13161316

13171317
let stopJob (containerGroup : IContainerGroup) =
13181318
async {
13191319
if not (isJobManuallyStopped containerGroup || isJobProvisioningFailed containerGroup) then
13201320
do! containerGroup.StopAsync().ToAsync
13211321
}
13221322

1323-
13241323
/// Get a sequence of containers that terminated due to error
13251324
let getContainersExitedWithError (g: IContainerGroup) =
13261325
g.Containers |> Seq.filter(fun (KeyValue(_, v)) ->
13271326
if not <| isNull v.InstanceView then
13281327
let currentState = v.InstanceView.CurrentState
1329-
currentState.DetailStatus = ContainerInstancesStates.Error
1328+
currentState.DetailStatus = ContainerInstancesStates.Error ||
1329+
(currentState.State = ContainerInstancesStates.Terminated && currentState.ExitCode <> Nullable<int>(0))
13301330
else false)
13311331
|> Seq.map (fun (KeyValue(_, v)) -> v)
13321332

@@ -1635,6 +1635,7 @@ module ContainerInstances =
16351635
// if stopped it cannot be expired
16361636
false
16371637
else if isJobExpired logger containerGroup then
1638+
logInfo "Job Expired : %s" containerGroupName
16381639
true
16391640
else
16401641
false
@@ -1657,6 +1658,7 @@ module ContainerInstances =
16571658

16581659
let state, details =
16591660
if containerGroupFailedToProvision then
1661+
logInfo "Container group failed to provision : %s" containerGroupName
16601662
JobState.Error,
16611663
(Map.empty, containerGroup.Events |> List.ofSeq)
16621664
||> List.fold( fun details v ->
@@ -1666,12 +1668,15 @@ module ContainerInstances =
16661668
.Add("Type", v.Type)
16671669
)
16681670
else if isExpired then
1671+
logInfo "Job Expired : %s" containerGroupName
16691672
JobState.TimedOut, Map.empty
16701673
else if jobManuallyStopped then
1674+
logInfo "Job Manually stopped : %s" containerGroupName
16711675
JobState.ManuallyStopped, Map.empty
16721676
else if Seq.isEmpty instancesExitedWithError then
16731677
JobState.Completed, Map.empty
16741678
else
1679+
logInfo "At least one instance exited with an error : %s" containerGroupName
16751680
//There is at least one container that terminated with an error
16761681
JobState.Error,
16771682
(Map.empty, instancesExitedWithError |> List.ofSeq)
@@ -1692,7 +1697,7 @@ module ContainerInstances =
16921697
for v in instancesExitedWithError do
16931698
let! failedContainerLogs = containerGroup.GetLogContentAsync(v.Name).ToAsync
16941699

1695-
logInfo "[%s][%s][State:%A][DetailStatus: %A][ExitCode: %A] failed logs: %s\nEvents: %A"
1700+
logInfo "Instance Exited with Error: [%s][%s][State:%A][DetailStatus: %A][ExitCode: %A] failed logs: %s\nEvents: %A"
16961701
containerGroup.Name v.Name
16971702
v.InstanceView.CurrentState.State
16981703
v.InstanceView.CurrentState.DetailStatus

‎src/Orchestrator/OrchestratorLogic/OrchestratorLogic.fsproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,20 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Azure.Core" Version="1.10.0" />
18+
<PackageReference Include="Azure.Core" Version="1.11.0" />
1919
<PackageReference Include="Azure.Storage.Common" Version="12.7.0" />
2020
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.6.0" />
2121
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.17.0" />
2222
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.17.0" />
23+
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
2324
<PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
2425
<PackageReference Include="Microsoft.Azure.Management.ContainerInstance.Fluent" Version="1.37.1" />
2526
<PackageReference Include="Microsoft.Azure.Management.Fluent" Version="1.37.1" />
2627
<PackageReference Include="Microsoft.Azure.Management.ResourceManager.Fluent" Version="1.37.1" />
2728
<PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.1.2" />
2829
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
2930
<PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.6" />
31+
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
3032
</ItemGroup>
3133

3234
<ItemGroup>

‎src/Test/TestInfraLogic/TestInfraLogic.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Azure.Core" Version="1.10.0" />
17+
<PackageReference Include="Azure.Core" Version="1.11.0" />
1818
<PackageReference Include="Azure.Storage.Files.Shares" Version="12.6.0" />
1919
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.17.0" />
2020
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.17.0" />

0 commit comments

Comments
 (0)