Skip to content

Commit 8e74bc9

Browse files
askptaskpt
authored
ci: Fix test execution locally (#394)
Signed-off-by: André Silva <[email protected]>
1 parent a32ab2d commit 8e74bc9

File tree

20 files changed

+135
-104
lines changed

20 files changed

+135
-104
lines changed

‎DotnetSdkContrib.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenFeature.Contrib.Provide
3131
EndProject
3232
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenFeature.Contrib.Providers.FeatureManagement.Test", "test\OpenFeature.Contrib.Providers.FeatureManagement.Test\OpenFeature.Contrib.Providers.FeatureManagement.Test.csproj", "{9EBB5E8F-9F05-4DFF-9E99-2BAA5D5325FB}"
3333
EndProject
34-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenFeature.Contrib.Providers.Flagd.E2e.Test", "test\OpenFeature.Contrib.Providers.Flagd.E2e.Test\OpenFeature.Contrib.Providers.Flagd.E2e.Test.csproj", "{4A2C6E0F-8A23-454F-8019-AE3DD91AA193}"
34+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenFeature.Contrib.Providers.Flagd.E2e.Common", "test\OpenFeature.Contrib.Providers.Flagd.E2e.Common\OpenFeature.Contrib.Providers.Flagd.E2e.Common.csproj", "{4A2C6E0F-8A23-454F-8019-AE3DD91AA193}"
3535
EndProject
3636
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenFeature.Contrib.Providers.Flagd.E2e.RpcTest", "test\OpenFeature.Contrib.Providers.Flagd.E2e.RpcTest\OpenFeature.Contrib.Providers.Flagd.E2e.RpcTest.csproj", "{2ACD9150-A8F4-450E-B49A-C628895992BF}"
3737
EndProject

‎build/Common.prod.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<PropertyGroup>
12-
<TargetFrameworks>netstandard2.0;net462;net8.0</TargetFrameworks>
12+
<TargetFrameworks>netstandard2.0;net462;net8.0;net9.0</TargetFrameworks>
1313
<RepositoryType>git</RepositoryType>
1414
<RepositoryUrl>https://github.com/open-feature/dotnet-sdk-contrib</RepositoryUrl>
1515
<Description>OpenFeature is an open specification that provides a vendor-agnostic,
@@ -27,4 +27,4 @@
2727
<None Include="$(MSBuildThisFileDirectory)openfeature-icon.png" Pack="true" PackagePath="\" />
2828
</ItemGroup>
2929

30-
</Project>
30+
</Project>

‎build/Common.tests.props‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
<Project>
2-
<Import Project=".\Common.props" />
2+
<Import Project=".\Common.props" />
33

4-
<PropertyGroup>
5-
<IsPackable>false</IsPackable>
6-
<TargetFrameworks>net8.0</TargetFrameworks>
7-
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
8-
</PropertyGroup>
4+
<PropertyGroup>
5+
<IsPackable>false</IsPackable>
6+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
8+
</PropertyGroup>
99

10-
<PropertyGroup Condition="$(MSBuildProjectName.EndsWith('.Test'))">
11-
<IsTestProject>true</IsTestProject>
12-
</PropertyGroup>
10+
<PropertyGroup Condition="$(MSBuildProjectName.EndsWith('Test'))">
11+
<IsTestProject>true</IsTestProject>
12+
</PropertyGroup>
1313

14-
<PropertyGroup>
15-
<NoWarn>$(NoWarn);CA2007</NoWarn>
16-
</PropertyGroup>
14+
<PropertyGroup>
15+
<NoWarn>$(NoWarn);CA2007</NoWarn>
16+
</PropertyGroup>
1717

18-
<ItemGroup Condition="$(MSBuildProjectName.EndsWith('.Tests'))">
19-
<Content
20-
Include="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'DotnetSdkContrib.sln'))\build\xunit.runner.json">
21-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
22-
</Content>
23-
</ItemGroup>
18+
<ItemGroup Condition="$(MSBuildProjectName.EndsWith('Test'))">
19+
<Content
20+
Include="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'DotnetSdkContrib.sln'))\build\xunit.runner.json">
21+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
22+
</Content>
23+
</ItemGroup>
2424

25-
<ItemGroup>
26-
<PackageReference Include="AutoFixture" Version="$(AutoFixtureVer)" />
27-
<PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVer)">
28-
<PrivateAssets>all</PrivateAssets>
29-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
30-
</PackageReference>
31-
<PackageReference Include="coverlet.msbuild" Version="$(CoverletCollectorVer)">
32-
<PrivateAssets>all</PrivateAssets>
33-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
34-
</PackageReference>
35-
<PackageReference Include="GitHubActionsTestLogger" Version="$(GitHubActionsTestLoggerVer)" />
36-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPkgVer)" />
37-
<PackageReference Include="NSubstitute" Version="$(NSubstituteVer)" />
38-
<PackageReference Include="xunit" Version="$(XUnitPkgVer)" />
39-
<PackageReference Include="xunit.runner.visualstudio"
40-
Version="$(XUnitRunnerVisualStudioPkgVer)">
41-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
42-
<PrivateAssets>all</PrivateAssets>
43-
</PackageReference>
25+
<ItemGroup>
26+
<PackageReference Include="AutoFixture" Version="$(AutoFixtureVer)" />
27+
<PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVer)">
28+
<PrivateAssets>all</PrivateAssets>
29+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
30+
</PackageReference>
31+
<PackageReference Include="coverlet.msbuild" Version="$(CoverletCollectorVer)">
32+
<PrivateAssets>all</PrivateAssets>
33+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
34+
</PackageReference>
35+
<PackageReference Include="GitHubActionsTestLogger" Version="$(GitHubActionsTestLoggerVer)" />
36+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPkgVer)" />
37+
<PackageReference Include="NSubstitute" Version="$(NSubstituteVer)" />
38+
<PackageReference Include="xunit" Version="$(XUnitPkgVer)" />
39+
<PackageReference Include="xunit.runner.visualstudio"
40+
Version="$(XUnitRunnerVisualStudioPkgVer)">
41+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
42+
<PrivateAssets>all</PrivateAssets>
43+
</PackageReference>
4444

45-
<!-- Fare and System.Text.RegularExpressions are referenced directly to avoid indirect
45+
<!-- Fare and System.Text.RegularExpressions are referenced directly to avoid indirect
4646
vulnerable packages from AutoFixture -->
47-
<PackageReference Include="Fare" Version="$(FareVer)" />
48-
<PackageReference Include="System.Text.RegularExpressions"
49-
Version="$(SystemTextRegularExpressionsVer)" />
50-
</ItemGroup>
47+
<PackageReference Include="Fare" Version="$(FareVer)" />
48+
<PackageReference Include="System.Text.RegularExpressions"
49+
Version="$(SystemTextRegularExpressionsVer)" />
50+
</ItemGroup>
5151

52-
<PropertyGroup Label="Package versions used in this repository">
53-
<!--
52+
<PropertyGroup Label="Package versions used in this repository">
53+
<!--
5454
Please sort alphabetically.
5555
Refer to https://docs.microsoft.com/nuget/concepts/package-versioning for semver syntax.
5656
-->
57-
<AutoFixtureVer>[4.18.1]</AutoFixtureVer>
58-
<CoverletCollectorVer>[3.1.2]</CoverletCollectorVer>
59-
<FareVer>[2.2.1]</FareVer>
60-
<GitHubActionsTestLoggerVer>[2.3.3]</GitHubActionsTestLoggerVer>
61-
<MicrosoftNETTestSdkPkgVer>[17.13.0]</MicrosoftNETTestSdkPkgVer>
62-
<NSubstituteVer>[5.0.0]</NSubstituteVer>
63-
<SystemTextRegularExpressionsVer>[4.3.1]</SystemTextRegularExpressionsVer>
64-
<XUnitRunnerVisualStudioPkgVer>[2.8.2,3.0)</XUnitRunnerVisualStudioPkgVer>
65-
<XUnitPkgVer>[2.9.3,3.0)</XUnitPkgVer>
66-
</PropertyGroup>
57+
<AutoFixtureVer>[4.18.1]</AutoFixtureVer>
58+
<CoverletCollectorVer>[3.1.2]</CoverletCollectorVer>
59+
<FareVer>[2.2.1]</FareVer>
60+
<GitHubActionsTestLoggerVer>[2.3.3]</GitHubActionsTestLoggerVer>
61+
<MicrosoftNETTestSdkPkgVer>[17.13.0]</MicrosoftNETTestSdkPkgVer>
62+
<NSubstituteVer>[5.0.0]</NSubstituteVer>
63+
<SystemTextRegularExpressionsVer>[4.3.1]</SystemTextRegularExpressionsVer>
64+
<XUnitRunnerVisualStudioPkgVer>[2.8.2,3.0)</XUnitRunnerVisualStudioPkgVer>
65+
<XUnitPkgVer>[2.9.3,3.0)</XUnitPkgVer>
66+
</PropertyGroup>
6767
</Project>

‎src/OpenFeature.Contrib.Providers.Flagd/FlagdConfig.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ public string SourceSelector
162162

163163
internal FlagdConfig()
164164
{
165-
_host = Environment.GetEnvironmentVariable(EnvVarHost) ?? "localhost";
165+
_host = string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable(EnvVarHost)) ? "localhost" : Environment.GetEnvironmentVariable(EnvVarHost);
166166
_port = int.TryParse(Environment.GetEnvironmentVariable(EnvVarPort), out var port) ? port : 8013;
167-
_useTLS = bool.Parse(Environment.GetEnvironmentVariable(EnvVarTLS) ?? "false");
167+
_useTLS = bool.TryParse(Environment.GetEnvironmentVariable(EnvVarTLS), out var useTLS) ? useTLS : false;
168168
_cert = Environment.GetEnvironmentVariable(EnvCertPart) ?? "";
169169
_socketPath = Environment.GetEnvironmentVariable(EnvVarSocketPath) ?? "";
170170
_sourceSelector = Environment.GetEnvironmentVariable(EnvVarSourceSelector) ?? "";
@@ -173,8 +173,8 @@ internal FlagdConfig()
173173
if (string.Equals(cacheStr, LruCacheValue, StringComparison.OrdinalIgnoreCase))
174174
{
175175
_cache = true;
176-
_maxCacheSize = int.Parse(Environment.GetEnvironmentVariable(EnvVarMaxCacheSize) ?? $"{CacheSizeDefault}");
177-
_maxEventStreamRetries = int.Parse(Environment.GetEnvironmentVariable(EnvVarMaxEventStreamRetries) ?? "3");
176+
_maxCacheSize = int.TryParse(Environment.GetEnvironmentVariable(EnvVarMaxCacheSize), out var maxCacheSize) ? maxCacheSize : CacheSizeDefault;
177+
_maxEventStreamRetries = int.TryParse(Environment.GetEnvironmentVariable(EnvVarMaxEventStreamRetries), out var maxEventStreamRetries) ? maxEventStreamRetries : 3;
178178
}
179179

180180
var resolverTypeStr = Environment.GetEnvironmentVariable(EnvVarResolverType) ?? "RPC";
@@ -200,8 +200,8 @@ internal FlagdConfig(Uri url)
200200
if (string.Equals(cacheStr, LruCacheValue, StringComparison.OrdinalIgnoreCase))
201201
{
202202
_cache = true;
203-
_maxCacheSize = int.Parse(Environment.GetEnvironmentVariable(EnvVarMaxCacheSize) ?? $"{CacheSizeDefault}");
204-
_maxEventStreamRetries = int.Parse(Environment.GetEnvironmentVariable(EnvVarMaxEventStreamRetries) ?? "3");
203+
_maxCacheSize = int.TryParse(Environment.GetEnvironmentVariable(EnvVarMaxCacheSize), out var maxCacheSize) ? maxCacheSize : CacheSizeDefault;
204+
_maxEventStreamRetries = int.TryParse(Environment.GetEnvironmentVariable(EnvVarMaxEventStreamRetries), out var maxEventStreamRetries) ? maxEventStreamRetries : 3;
205205
}
206206

207207
var resolverTypeStr = Environment.GetEnvironmentVariable(EnvVarResolverType) ?? "RPC";

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,19 @@
77
#if NET462_OR_GREATER
88
using System.Linq;
99
using System.Net.Security;
10-
#endif
1110
using System.Security.Cryptography.X509Certificates;
11+
#endif
1212
using Grpc.Net.Client;
1313
#if NET8_0_OR_GREATER
14+
using System.Security.Cryptography.X509Certificates;
1415
using System.Net.Sockets; // needed for unix sockets
1516
#endif
1617
using System.Threading;
1718
using Grpc.Core;
1819
using Value = OpenFeature.Model.Value;
1920
using System.Threading.Channels;
2021
using OpenFeature.Constant;
22+
using OpenFeature.Contrib.Providers.Flagd.Utils;
2123

2224
namespace OpenFeature.Contrib.Providers.Flagd.Resolver.InProcess;
2325

@@ -190,8 +192,9 @@ private T BuildClient<T>(FlagdConfig config, Func<GrpcChannel, T> constructorFun
190192
{
191193
if (File.Exists(config.CertificatePath))
192194
{
193-
X509Certificate2 certificate = new X509Certificate2(config.CertificatePath);
194-
#if NET5_0_OR_GREATER
195+
var certificate = CertificateLoader.LoadCertificate(config.CertificatePath);
196+
197+
#if NET8_0_OR_GREATER
195198
handler.ServerCertificateCustomValidationCallback = (message, cert, chain, _) => {
196199
// the the custom cert to the chain, Build returns a bool if valid.
197200
chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
@@ -269,7 +272,7 @@ private FlagSyncService.FlagSyncServiceClient BuildClientForPlatform(FlagdConfig
269272
{
270273
if (File.Exists(config.CertificatePath))
271274
{
272-
X509Certificate2 certificate = new X509Certificate2(config.CertificatePath);
275+
var certificate = CertificateLoader.LoadCertificate(config.CertificatePath);
273276
#if NET5_0_OR_GREATER
274277
handler.ServerCertificateCustomValidationCallback = (message, cert, chain, _) => {
275278
// the the custom cert to the chain, Build returns a bool if valid.

‎src/OpenFeature.Contrib.Providers.Flagd/Resolver/Rpc/RpcResolver.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Grpc.Core;
99
using Grpc.Net.Client;
1010
using OpenFeature.Constant;
11+
using OpenFeature.Contrib.Providers.Flagd.Utils;
1112
using OpenFeature.Error;
1213
using OpenFeature.Flagd.Grpc.Evaluation;
1314
using OpenFeature.Model;
@@ -449,7 +450,7 @@ private Service.ServiceClient BuildClientForPlatform(FlagdConfig config)
449450
{
450451
if (File.Exists(config.CertificatePath))
451452
{
452-
System.Security.Cryptography.X509Certificates.X509Certificate2 certificate = new System.Security.Cryptography.X509Certificates.X509Certificate2(config.CertificatePath);
453+
var certificate = CertificateLoader.LoadCertificate(config.CertificatePath);
453454
#if NET5_0_OR_GREATER
454455
handler.ServerCertificateCustomValidationCallback = (message, cert, chain, _) => {
455456
// the the custom cert to the chain, Build returns a bool if valid.

‎src/OpenFeature.Contrib.Providers.Flagd/Utils/CertificateLoader.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
using System.IO;
2+
using System.Security.Cryptography.X509Certificates;
3+
4+
namespace OpenFeature.Contrib.Providers.Flagd.Utils;
5+
6+
internal static class CertificateLoader
7+
{
8+
internal static X509Certificate2 LoadCertificate(string certificatePath)
9+
{
10+
if (string.IsNullOrWhiteSpace(certificatePath))
11+
{
12+
return null;
13+
}
14+
15+
if (!File.Exists(certificatePath))
16+
{
17+
throw new FileNotFoundException($"Certificate file not found: {certificatePath}");
18+
}
19+
20+
#if NET9_0_OR_GREATER
21+
return X509CertificateLoader.LoadCertificateFromFile(certificatePath);
22+
#else
23+
return new X509Certificate2(certificatePath);
24+
#endif
25+
}
26+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public MetricsHookTest()
2020
{
2121
exportedItems = new List<Metric>();
2222
meterProvider = Sdk.CreateMeterProviderBuilder()
23-
.AddMeter("*")
23+
.AddMeter("OpenFeature.Contrib.Hooks.Otel")
2424
.ConfigureResource(r => r.AddService("openfeature"))
2525
.AddInMemoryExporter(exportedItems)
2626
.Build();

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<IsPackable>false</IsPackable>
5-
<IsTestProject>true</IsTestProject>
65
</PropertyGroup>
76

87
<ItemGroup>

‎test/OpenFeature.Contrib.Providers.Flagd.E2e.Common/OpenFeature.Contrib.Providers.Flagd.E2e.Common.csproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<IsTestProject>false</IsTestProject>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<ProjectReference
9+
Include="..\..\src\OpenFeature.Contrib.Providers.Flagd\OpenFeature.Contrib.Providers.Flagd.csproj" />
10+
</ItemGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="Reqnroll.xUnit" Version="2.4.0" />
14+
</ItemGroup>
15+
16+
</Project>

0 commit comments

Comments
 (0)