Skip to content

Commit 4a9a094

Browse files
KielekKielek
authored
build: Enable NugetAudit (#361)
Signed-off-by: Piotr Kiełkowicz <[email protected]>
1 parent e12ebc3 commit 4a9a094

File tree

15 files changed

+219
-225
lines changed

15 files changed

+219
-225
lines changed

‎build/Common.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<PropertyGroup>
88
<LangVersion>latest</LangVersion>
99
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
10+
<NuGetAudit>true</NuGetAudit>
11+
<NuGetAuditMode>all</NuGetAuditMode>
12+
<NuGetAuditLevel>low</NuGetAuditLevel>
1013
</PropertyGroup>
1114

1215
<PropertyGroup Condition="'$(Configuration)'=='Debug'">

‎build/Common.tests.props‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,25 @@
3737
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3838
<PrivateAssets>all</PrivateAssets>
3939
</PackageReference>
40+
41+
<!-- Fare and System.Text.RegularExpressions are referenced directly to avoid indirect vulnerable packages from AutoFixture -->
42+
<PackageReference Include="Fare" Version="$(FareVer)" />
43+
<PackageReference Include="System.Text.RegularExpressions" Version="$(SystemTextRegularExpressionsVer)" />
4044
</ItemGroup>
4145

4246
<PropertyGroup Label="Package versions used in this repository">
4347
<!--
4448
Please sort alphabetically.
4549
Refer to https://docs.microsoft.com/nuget/concepts/package-versioning for semver syntax.
4650
-->
47-
<AutoFixtureVer>[4.17.0]</AutoFixtureVer>
51+
<AutoFixtureVer>[4.18.1]</AutoFixtureVer>
4852
<CoverletCollectorVer>[3.1.2]</CoverletCollectorVer>
53+
<FareVer>[2.2.1]</FareVer>
4954
<GitHubActionsTestLoggerVer>[2.3.3]</GitHubActionsTestLoggerVer>
50-
<MicrosoftNETTestSdkPkgVer>[17.3.2]</MicrosoftNETTestSdkPkgVer>
55+
<MicrosoftNETTestSdkPkgVer>[17.13.0]</MicrosoftNETTestSdkPkgVer>
5156
<NSubstituteVer>[5.0.0]</NSubstituteVer>
52-
<XUnitRunnerVisualStudioPkgVer>[2.4.3,3.0)</XUnitRunnerVisualStudioPkgVer>
53-
<XUnitPkgVer>[2.4.1,3.0)</XUnitPkgVer>
57+
<SystemTextRegularExpressionsVer>[4.3.1]</SystemTextRegularExpressionsVer>
58+
<XUnitRunnerVisualStudioPkgVer>[2.8.2,3.0)</XUnitRunnerVisualStudioPkgVer>
59+
<XUnitPkgVer>[2.9.3,3.0)</XUnitPkgVer>
5460
</PropertyGroup>
5561
</Project>

‎src/OpenFeature.Contrib.Providers.Flagd/Resolver/InProcess/InProcessResolver.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public Task Init()
5454
return Task.Run(() =>
5555
{
5656
var latch = new CountdownEvent(1);
57-
_handleEventsThread = new Thread(() => HandleEvents(latch))
57+
_handleEventsThread = new Thread(async () => await HandleEvents(latch))
5858
{
5959
IsBackground = true
6060
};
@@ -101,7 +101,7 @@ public Task<ResolutionDetails<Value>> ResolveStructureValueAsync(string flagKey,
101101
return Task.FromResult(_evaluator.ResolveStructureValueAsync(flagKey, defaultValue, context));
102102
}
103103

104-
private async void HandleEvents(CountdownEvent latch)
104+
private async Task HandleEvents(CountdownEvent latch)
105105
{
106106
CancellationToken token = _cancellationTokenSource.Token;
107107
while (!token.IsCancellationRequested)

‎test/OpenFeature.Contrib.Hooks.Otel.Test/MetricsHookTest.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using System.Threading.Tasks;
45
using OpenFeature.Model;
56
using OpenTelemetry;
67
using OpenTelemetry.Metrics;
@@ -26,7 +27,7 @@ public MetricsHookTest()
2627
}
2728

2829
[Fact]
29-
public async void After_Test()
30+
public async Task After_Test()
3031
{
3132
// Arrange
3233
const string metricName = "feature_flag.evaluation_success_total";
@@ -50,7 +51,7 @@ public async void After_Test()
5051
}
5152

5253
[Fact]
53-
public async void Error_Test()
54+
public async Task Error_Test()
5455
{
5556
// Arrange
5657
const string metricName = "feature_flag.evaluation_error_total";
@@ -74,7 +75,7 @@ public async void Error_Test()
7475
}
7576

7677
[Fact]
77-
public async void Finally_Test()
78+
public async Task Finally_Test()
7879
{
7980
// Arrange
8081
const string metricName = "feature_flag.evaluation_active_count";
@@ -98,7 +99,7 @@ public async void Finally_Test()
9899
}
99100

100101
[Fact]
101-
public async void Before_Test()
102+
public async Task Before_Test()
102103
{
103104

104105
// Arrange

‎test/OpenFeature.Contrib.Hooks.Otel.Test/TracingHookTest.cs‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,9 @@ public void TestAfter()
5858

5959
var tagsEnum = ev.Tags.GetEnumerator();
6060

61-
Assert.True(
62-
Enumerable.Contains<KeyValuePair<string, object>>(
63-
ev.Tags, new KeyValuePair<string, object>("feature_flag.key", "my-flag")
64-
)
65-
);
66-
Assert.True(
67-
Enumerable.Contains<KeyValuePair<string, object>>(
68-
ev.Tags, new KeyValuePair<string, object>("feature_flag.variant", "default")
69-
)
70-
);
71-
Assert.True(
72-
Enumerable.Contains<KeyValuePair<string, object>>(
73-
ev.Tags, new KeyValuePair<string, object>("feature_flag.provider_name", "my-provider")
74-
)
75-
);
61+
Assert.Contains(new KeyValuePair<string, object>("feature_flag.key", "my-flag"), ev.Tags);
62+
Assert.Contains(new KeyValuePair<string, object>("feature_flag.variant", "default"), ev.Tags);
63+
Assert.Contains(new KeyValuePair<string, object>("feature_flag.provider_name", "my-provider"), ev.Tags);
7664
}
7765

7866
[Fact]
@@ -150,11 +138,7 @@ public void TestError()
150138

151139
Assert.Equal("exception", ev.Name);
152140

153-
Assert.True(
154-
Enumerable.Contains<KeyValuePair<string, object>>(
155-
ev.Tags, new KeyValuePair<string, object>("exception.message", "unexpected error")
156-
)
157-
);
141+
Assert.Contains(new KeyValuePair<string, object>("exception.message", "unexpected error"), ev.Tags);
158142
}
159143

160144
[Fact]

‎test/OpenFeature.Contrib.Providers.ConfigCat.Test/ConfigCatProviderTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class ConfigCatProviderTest
5656

5757
[Theory]
5858
[AutoData]
59-
public async void CreateConfigCatProvider_WithSdkKey_CreatesProviderInstanceSuccessfully(string sdkKey)
59+
public async Task CreateConfigCatProvider_WithSdkKey_CreatesProviderInstanceSuccessfully(string sdkKey)
6060
{
6161
var configCatProvider =
6262
new ConfigCatProvider(sdkKey, options => { options.FlagOverrides = BuildFlagOverrides(); });

‎test/OpenFeature.Contrib.Providers.ConfigCat.Test/OpenFeature.Contrib.Providers.ConfigCat.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<ItemGroup>
4-
<PackageReference Include="AutoFixture.Xunit2" Version="4.17.0" />
4+
<PackageReference Include="AutoFixture.Xunit2" Version="4.18.1" />
55
<ProjectReference Include="..\..\src\OpenFeature.Contrib.Providers.ConfigCat\OpenFeature.Contrib.Providers.ConfigCat.csproj" />
66
</ItemGroup>
77

‎test/OpenFeature.Contrib.Providers.EnvVar.Test/OpenFeature.Contrib.Providers.EnvVar.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<ItemGroup>
4-
<PackageReference Include="AutoFixture.Xunit2" Version="4.17.0" />
4+
<PackageReference Include="AutoFixture.Xunit2" Version="4.18.1" />
55
<ProjectReference Include="..\..\src\OpenFeature.Contrib.Providers.EnvVar\OpenFeature.Contrib.Providers.EnvVar.csproj" />
66
</ItemGroup>
77

‎test/OpenFeature.Contrib.Providers.Flagd.E2e.Test/Steps/FlagdStepDefinitionBase.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void WhenAZero_ValueBooleanFlagWithKeyIsEvaluatedWithDefaultValue(string
9494
}
9595

9696
[Then(@"the resolved boolean zero-value should be ""(.*)""")]
97-
public async void ThenTheResolvedBooleanZero_ValueShouldBe(string expectedValue)
97+
public async Task ThenTheResolvedBooleanZero_ValueShouldBe(string expectedValue)
9898
{
9999
Assert.Equal(bool.Parse(expectedValue), await booleanZeroValue);
100100
}
@@ -183,7 +183,7 @@ public void WhenAContextContainingAKeyWithValue(string key, long val) // we have
183183
}
184184

185185
[Then(@"the returned value should be ""(.*)""")]
186-
public async void ThenTheReturnedValueShouldBe(string expectedValue)
186+
public async Task ThenTheReturnedValueShouldBe(string expectedValue)
187187
{
188188
var details = await client.GetStringDetailsAsync(stringFlagKey, stringDefaultValue, evaluationContext);
189189
Assert.Equal(expectedValue, details.Value);

‎test/OpenFeature.Contrib.Providers.Flagd.Test/CacheTest.cs‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System.Threading.Tasks;
12
using Xunit;
23

34
namespace OpenFeature.Contrib.Providers.Flagd.Test
@@ -17,23 +18,19 @@ public void TestCacheSetGet()
1718
Assert.Equal("my-value", value);
1819
}
1920
[Fact]
20-
public void TestCacheCapacity()
21+
public async Task TestCacheCapacity()
2122
{
2223
int capacity = 5;
2324
var cache = new LRUCache<string, string>(capacity);
2425

25-
var tasks = new System.Collections.Generic.List<System.Threading.Tasks.Task>();
26+
var tasks = new System.Collections.Generic.List<Task>(capacity);
2627

2728
for (int i = 0; i < capacity; i++)
2829
{
2930
cache.Add($"key-{i}", $"value-{i}");
3031
}
3132

32-
var e = tasks.GetEnumerator();
33-
while (e.MoveNext())
34-
{
35-
e.Current.Wait();
36-
}
33+
await Task.WhenAll(tasks);
3734

3835
string value;
3936
// verify that we can retrieve all items
@@ -55,29 +52,25 @@ public void TestCacheCapacity()
5552
}
5653

5754
[Fact]
58-
public void TestCacheCapacityMultiThreaded()
55+
public async Task TestCacheCapacityMultiThreaded()
5956
{
6057
int capacity = 5;
6158
var cache = new LRUCache<string, string>(capacity);
6259

63-
var tasks = new System.Collections.Generic.List<System.Threading.Tasks.Task>();
60+
var tasks = new System.Collections.Generic.List<Task>(capacity);
6461

6562
var counter = 0;
6663
for (int i = 0; i < capacity; i++)
6764
{
68-
tasks.Add(System.Threading.Tasks.Task.Run(() =>
65+
tasks.Add(Task.Run(() =>
6966
{
7067
var id = System.Threading.Interlocked.Increment(ref counter);
7168
cache.Add($"key-{id}", $"value-{id}");
7269
}));
7370
//cache.Add($"key-{i}", $"value-{i}");
7471
}
7572

76-
var e = tasks.GetEnumerator();
77-
while (e.MoveNext())
78-
{
79-
e.Current.Wait();
80-
}
73+
await Task.WhenAll(tasks);
8174

8275
string value;
8376
// verify that we can retrieve all items

0 commit comments

Comments
 (0)