Skip to content

Commit e5e9010

Browse files
brendandburnsbrendandburns
committed
chore(deps): combine all open Dependabot updates with CI fixes
Squash all dependency updates and CI remediation changes into a single commit.
1 parent 0ff72d6 commit e5e9010

4 files changed

Lines changed: 28 additions & 24 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.7.1" />
1111
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.9" />
1212
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.9" />
13-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.7" />
13+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.9" />
1414
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
1515
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="18.6.0" />
1616
<PackageVersion Include="Moq" Version="4.20.72" />
1717
<PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
1818
<PackageVersion Include="Nito.AsyncEx.Coordination" Version="5.1.2" />
1919
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.16.0" />
20-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
20+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
2121
<PackageVersion Include="Portable.BouncyCastle" Version="1.9.0" />
2222
<PackageVersion Include="SharpZipLib" Version="1.4.2" />
2323
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.1" />
@@ -26,7 +26,7 @@
2626
<PackageVersion Include="System.Reactive" Version="6.1.0" />
2727
<PackageVersion Include="System.Text.Json" Version="10.0.9" />
2828
<PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="18.0.0" />
29-
<PackageVersion Include="Wiremock.Net" Version="1.12.0" />
29+
<PackageVersion Include="Wiremock.Net" Version="2.6.0" />
3030
<PackageVersion Include="xunit" Version="2.9.3" />
3131
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
3232
<PackageVersion Include="Xunit.StaFact" Version="1.2.69" />

‎examples/openTelemetryConsole/openTelemetryConsole.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10+
<PackageReference Include="Microsoft.Extensions.Logging" VersionOverride="10.0.9" />
1011
<PackageReference Include="OpenTelemetry.Exporter.Console" />
1112
<PackageReference Include="OpenTelemetry.Instrumentation.Http" />
12-
<PackageReference Include="System.Diagnostics.DiagnosticSource" VersionOverride="10.0.7" />
13+
<PackageReference Include="System.Diagnostics.DiagnosticSource" VersionOverride="10.0.9" />
1314
</ItemGroup>
1415

1516
</Project>

‎tests/E2E.Tests/MinikubeTests.cs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -752,23 +752,25 @@ await clientSet.CoreV1.Pod
752752

753753
// replace + get (retry on conflict due to Kubernetes optimistic concurrency)
754754
{
755-
var retries = 5;
756-
while (retries-- > 0)
755+
const int maxAttempts = 5;
756+
var updated = false;
757+
for (var attempt = 1; attempt <= maxAttempts; attempt++)
757758
{
759+
var pod = await clientSet.CoreV1.Pod.GetAsync(podName, namespaceParameter).ConfigureAwait(false);
760+
pod.Spec.Containers[0].Image = "httpd";
758761
try
759762
{
760-
var pod = await clientSet.CoreV1.Pod.GetAsync(podName, namespaceParameter).ConfigureAwait(false);
761-
pod.Spec.Containers[0].Image = "httpd";
762763
await clientSet.CoreV1.Pod.UpdateAsync(pod, podName, namespaceParameter).ConfigureAwait(false);
764+
updated = true;
763765
break;
764766
}
765-
catch (HttpOperationException e) when (e.Response.StatusCode == System.Net.HttpStatusCode.Conflict)
767+
catch (HttpOperationException e) when (e.Response.StatusCode == System.Net.HttpStatusCode.Conflict && attempt < maxAttempts)
766768
{
767-
if (retries == 0) throw;
768769
await Task.Delay(TimeSpan.FromSeconds(1)).ConfigureAwait(false);
769770
}
770771
}
771772

773+
Assert.True(updated, "Failed to update pod after retries due to conflicts.");
772774
var updatedPod = await clientSet.CoreV1.Pod.GetAsync(podName, namespaceParameter).ConfigureAwait(false);
773775
Assert.Equal("httpd", updatedPod.Spec.Containers[0].Image);
774776
}

‎tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using k8s.LeaderElection;
22
using Moq;
33
using System;
4+
using System.Collections.Concurrent;
45
using System.Collections.Generic;
56
using System.Linq;
67
using System.Threading;
@@ -84,8 +85,8 @@ public void SimpleLeaderElection()
8485
[Fact]
8586
public void LeaderElection()
8687
{
87-
var electionHistory = new List<string>();
88-
var leadershipHistory = new List<string>();
88+
var electionHistory = new ConcurrentQueue<string>();
89+
var leadershipHistory = new ConcurrentQueue<string>();
8990
var electionHistoryCountdown = new CountdownEvent(7);
9091

9192
var renewCountA = 3;
@@ -95,19 +96,19 @@ public void LeaderElection()
9596
{
9697
renewCountA--;
9798

98-
electionHistory.Add("A creates record");
99-
leadershipHistory.Add("A gets leadership");
99+
electionHistory.Enqueue("A creates record");
100+
leadershipHistory.Enqueue("A gets leadership");
100101
electionHistoryCountdown.Signal();
101102
};
102103

103104
mockLockA.OnUpdate += (_) =>
104105
{
105106
renewCountA--;
106-
electionHistory.Add("A updates record");
107+
electionHistory.Enqueue("A updates record");
107108
electionHistoryCountdown.Signal();
108109
};
109110

110-
mockLockA.OnChange += (_) => { leadershipHistory.Add("A gets leadership"); };
111+
mockLockA.OnChange += (_) => { leadershipHistory.Enqueue("A gets leadership"); };
111112

112113
var leaderElectionConfigA = new LeaderElectionConfig(mockLockA)
113114
{
@@ -123,19 +124,19 @@ public void LeaderElection()
123124
{
124125
renewCountB--;
125126

126-
electionHistory.Add("B creates record");
127+
electionHistory.Enqueue("B creates record");
127128
electionHistoryCountdown.Signal();
128-
leadershipHistory.Add("B gets leadership");
129+
leadershipHistory.Enqueue("B gets leadership");
129130
};
130131

131132
mockLockB.OnUpdate += (_) =>
132133
{
133134
renewCountB--;
134-
electionHistory.Add("B updates record");
135+
electionHistory.Enqueue("B updates record");
135136
electionHistoryCountdown.Signal();
136137
};
137138

138-
mockLockB.OnChange += (_) => { leadershipHistory.Add("B gets leadership"); };
139+
mockLockB.OnChange += (_) => { leadershipHistory.Enqueue("B gets leadership"); };
139140

140141
var leaderElectionConfigB = new LeaderElectionConfig(mockLockB)
141142
{
@@ -153,13 +154,13 @@ public void LeaderElection()
153154

154155
leaderElector.OnStartedLeading += () =>
155156
{
156-
leadershipHistory.Add("A starts leading");
157+
leadershipHistory.Enqueue("A starts leading");
157158
testLeaderElectionLatch.Signal();
158159
};
159160

160161
leaderElector.OnStoppedLeading += () =>
161162
{
162-
leadershipHistory.Add("A stops leading");
163+
leadershipHistory.Enqueue("A stops leading");
163164
testLeaderElectionLatch.Signal();
164165
lockAStopLeading.Set();
165166
};
@@ -176,13 +177,13 @@ public void LeaderElection()
176177

177178
leaderElector.OnStartedLeading += () =>
178179
{
179-
leadershipHistory.Add("B starts leading");
180+
leadershipHistory.Enqueue("B starts leading");
180181
testLeaderElectionLatch.Signal();
181182
};
182183

183184
leaderElector.OnStoppedLeading += () =>
184185
{
185-
leadershipHistory.Add("B stops leading");
186+
leadershipHistory.Enqueue("B stops leading");
186187
testLeaderElectionLatch.Signal();
187188
};
188189

0 commit comments

Comments
 (0)