Skip to content

Commit 632631b

Browse files
w1amw1am
committed
Remove unused target frameworks and pass certificate in healthcheck
1 parent 2cdf1f0 commit 632631b

File tree

6 files changed

+41
-69
lines changed

6 files changed

+41
-69
lines changed

‎.github/workflows/base.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
framework: [ net6.0, net7.0, net8.0 ]
28+
framework: [ net8.0 ]
2929
os: [ ubuntu-latest ]
3030
configuration: [ release ]
3131
runs-on: ${{ matrix.os }}
@@ -52,8 +52,6 @@ jobs:
5252
uses: actions/setup-dotnet@v3
5353
with:
5454
dotnet-version: |
55-
6.0.x
56-
7.0.x
5755
8.0.x
5856
- name: Run Tests
5957
shell: bash

‎.github/workflows/publish.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
framework: [ net6.0, net7.0, net8.0 ]
17+
framework: [ net8.0 ]
1818
os: [ ubuntu-latest, windows-latest ]
1919
runs-on: ${{ matrix.os }}
2020
name: scan-vulnerabilities/${{ matrix.os }}/${{ matrix.framework }}
@@ -25,8 +25,6 @@ jobs:
2525
uses: actions/setup-dotnet@v3
2626
with:
2727
dotnet-version: |
28-
6.0.x
29-
7.0.x
3028
8.0.x
3129
- name: Scan for Vulnerabilities
3230
shell: bash
@@ -100,7 +98,7 @@ jobs:
10098
strategy:
10199
fail-fast: false
102100
matrix:
103-
framework: [ net6.0, net7.0, net8.0 ]
101+
framework: [ net8.0 ]
104102
os: [ ubuntu-latest, windows-latest ]
105103
configuration: [ release ]
106104
runs-on: ${{ matrix.os }}
@@ -115,8 +113,6 @@ jobs:
115113
uses: actions/setup-dotnet@v3
116114
with:
117115
dotnet-version: |
118-
6.0.x
119-
7.0.x
120116
8.0.x
121117
- name: Compile
122118
shell: bash
@@ -167,8 +163,6 @@ jobs:
167163
uses: actions/setup-dotnet@v3
168164
with:
169165
dotnet-version: |
170-
6.0.x
171-
7.0.x
172166
8.0.x
173167
- name: Dotnet Pack
174168
shell: bash

‎samples/Samples.sln

-21
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "quick-start", "quick-start\
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{EBB93BBC-42A7-48E4-B1EA-0EA3953D347C}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Client.Streams", "..\src\EventStore.Client.Streams\EventStore.Client.Streams.csproj", "{A32CE3CB-AB71-45C6-A1B2-CD94BE2D2B28}"
11-
EndProject
1210
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Client", "..\src\EventStore.Client\EventStore.Client.csproj", "{A71A13F7-8480-4E48-B88D-A2364F7C95B6}"
1311
EndProject
1412
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "connecting-to-a-cluster", "connecting-to-a-cluster\connecting-to-a-cluster.csproj", "{C4CA324A-450D-4621-82F1-B4ECD18216B6}"
@@ -29,10 +27,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "server-side-filtering", "se
2927
EndProject
3028
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "persistent-subscriptions", "persistent-subscriptions\persistent-subscriptions.csproj", "{A5A5EF0D-1AE4-4647-823D-FA172E8858F2}"
3129
EndProject
32-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Client.PersistentSubscriptions", "..\src\EventStore.Client.PersistentSubscriptions\EventStore.Client.PersistentSubscriptions.csproj", "{7200BB01-A405-45D5-A6E8-A8FA8DE39DA0}"
33-
EndProject
34-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventStore.Client.ProjectionManagement", "..\src\EventStore.Client.ProjectionManagement\EventStore.Client.ProjectionManagement.csproj", "{79992D7B-C311-4E8A-856F-896C1EA61042}"
35-
EndProject
3630
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "projection-management", "projection-management\projection-management.csproj", "{9DEA2684-C38B-465C-91A6-ED2AB67A4338}"
3731
EndProject
3832
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "diagnostics", "diagnostics\diagnostics.csproj", "{546496AD-E355-4C20-930C-30D0FC76D26F}"
@@ -51,10 +45,6 @@ Global
5145
{521987E5-4394-4EE0-B217-E3DC9DB0D327}.Debug|Any CPU.Build.0 = Debug|Any CPU
5246
{521987E5-4394-4EE0-B217-E3DC9DB0D327}.Release|Any CPU.ActiveCfg = Release|Any CPU
5347
{521987E5-4394-4EE0-B217-E3DC9DB0D327}.Release|Any CPU.Build.0 = Release|Any CPU
54-
{A32CE3CB-AB71-45C6-A1B2-CD94BE2D2B28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55-
{A32CE3CB-AB71-45C6-A1B2-CD94BE2D2B28}.Debug|Any CPU.Build.0 = Debug|Any CPU
56-
{A32CE3CB-AB71-45C6-A1B2-CD94BE2D2B28}.Release|Any CPU.ActiveCfg = Release|Any CPU
57-
{A32CE3CB-AB71-45C6-A1B2-CD94BE2D2B28}.Release|Any CPU.Build.0 = Release|Any CPU
5848
{A71A13F7-8480-4E48-B88D-A2364F7C95B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5949
{A71A13F7-8480-4E48-B88D-A2364F7C95B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
6050
{A71A13F7-8480-4E48-B88D-A2364F7C95B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -95,14 +85,6 @@ Global
9585
{A5A5EF0D-1AE4-4647-823D-FA172E8858F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
9686
{A5A5EF0D-1AE4-4647-823D-FA172E8858F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
9787
{A5A5EF0D-1AE4-4647-823D-FA172E8858F2}.Release|Any CPU.Build.0 = Release|Any CPU
98-
{7200BB01-A405-45D5-A6E8-A8FA8DE39DA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
99-
{7200BB01-A405-45D5-A6E8-A8FA8DE39DA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
100-
{7200BB01-A405-45D5-A6E8-A8FA8DE39DA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
101-
{7200BB01-A405-45D5-A6E8-A8FA8DE39DA0}.Release|Any CPU.Build.0 = Release|Any CPU
102-
{79992D7B-C311-4E8A-856F-896C1EA61042}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
103-
{79992D7B-C311-4E8A-856F-896C1EA61042}.Debug|Any CPU.Build.0 = Debug|Any CPU
104-
{79992D7B-C311-4E8A-856F-896C1EA61042}.Release|Any CPU.ActiveCfg = Release|Any CPU
105-
{79992D7B-C311-4E8A-856F-896C1EA61042}.Release|Any CPU.Build.0 = Release|Any CPU
10688
{9DEA2684-C38B-465C-91A6-ED2AB67A4338}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10789
{9DEA2684-C38B-465C-91A6-ED2AB67A4338}.Debug|Any CPU.Build.0 = Debug|Any CPU
10890
{9DEA2684-C38B-465C-91A6-ED2AB67A4338}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -124,10 +106,7 @@ Global
124106
HideSolutionNode = FALSE
125107
EndGlobalSection
126108
GlobalSection(NestedProjects) = preSolution
127-
{A32CE3CB-AB71-45C6-A1B2-CD94BE2D2B28} = {EBB93BBC-42A7-48E4-B1EA-0EA3953D347C}
128109
{A71A13F7-8480-4E48-B88D-A2364F7C95B6} = {EBB93BBC-42A7-48E4-B1EA-0EA3953D347C}
129-
{7200BB01-A405-45D5-A6E8-A8FA8DE39DA0} = {EBB93BBC-42A7-48E4-B1EA-0EA3953D347C}
130-
{79992D7B-C311-4E8A-856F-896C1EA61042} = {EBB93BBC-42A7-48E4-B1EA-0EA3953D347C}
131110
{29E3F07A-6676-45C1-805C-46BDF6CF325B} = {EBB93BBC-42A7-48E4-B1EA-0EA3953D347C}
132111
EndGlobalSection
133112
GlobalSection(ExtensibilityGlobals) = postSolution

‎samples/Samples.sln.DotSettings

+1
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@
390390
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
391391
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
392392
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
393+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
393394
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
394395
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
395396
<s:Boolean x:Key="/Default/UserDictionary/Words/=acked/@EntryIndexedValue">True</s:Boolean>

‎test/EventStore.Client.Tests.Common/EventStore.Client.Tests.Common.csproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" Condition="'$(TargetFramework)' == 'net48'"/>
2525
</ItemGroup>
2626

27-
<!-- &lt;!&ndash; Vulnerable Transitive Packages &ndash;&gt;-->
28-
<!-- <ItemGroup>-->
29-
<!-- &lt;!&ndash; https://github.com/advisories/GHSA-7jgj-8wvc-jh57 &ndash;&gt;-->
30-
<!-- <PackageReference Include="System.Net.Http " Version="4.3.4"/>-->
31-
<!-- &lt;!&ndash; https://github.com/advisories/GHSA-cmhx-cq75-c4mj &ndash;&gt;-->
32-
<!-- <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1"/>-->
33-
<!-- </ItemGroup>-->
27+
<!-- Vulnerable Transitive Packages -->
28+
<ItemGroup>
29+
<!-- https://github.com/advisories/GHSA-7jgj-8wvc-jh57 -->
30+
<PackageReference Include="System.Net.Http" Version="4.3.4"/>
31+
<!-- https://github.com/advisories/GHSA-cmhx-cq75-c4mj -->
32+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1"/>
33+
</ItemGroup>
3434

3535
<ItemGroup>
3636
<Content Include="..\..\certs\**\*">
@@ -63,4 +63,4 @@
6363
<ItemGroup>
6464
<None Remove="EventStore.Client.Tests.Common.csproj.DotSettings"/>
6565
</ItemGroup>
66-
</Project>
66+
</Project>

‎test/EventStore.Client.Tests.Common/Fixtures/EventStoreTestNode.cs

+29-29
Original file line numberDiff line numberDiff line change
@@ -81,40 +81,40 @@ protected override ContainerBuilder Configure() {
8181
.WithEnvironment(env)
8282
.MountVolume(certsPath, "/etc/eventstore/certs", MountType.ReadOnly)
8383
.ExposePort(port, 2113)
84-
//.KeepContainer().KeepRunning().ReuseIfExists()
84+
// .KeepContainer().KeepRunning().ReuseIfExists()
8585
.WaitUntilReadyWithConstantBackoff(1_000, 60, service => {
86-
var output = service.ExecuteCommand("curl -o - -I http://admin:changeit@localhost:2113/health/live");
86+
var output = service.ExecuteCommand("curl -u admin:changeit --cacert /etc/eventstore/certs/ca/ca.crt https://localhost:2113/health/live");
8787
if (!output.Success)
8888
throw new Exception(output.Error);
8989
});
9090
}
9191

92-
/// <summary>
93-
/// max of 30 seconds (300 * 100ms)
94-
/// </summary>
95-
static readonly IEnumerable<TimeSpan> DefaultBackoffDelay = Backoff.ConstantBackoff(FromMilliseconds(100), 300);
96-
97-
protected override async Task OnServiceStarted() {
98-
using var http = new HttpClient(
99-
#if NET
100-
new SocketsHttpHandler { SslOptions = { RemoteCertificateValidationCallback = delegate { return true; } } }
101-
#else
102-
new WinHttpHandler { ServerCertificateValidationCallback = delegate { return true; } }
103-
#endif
104-
) {
105-
BaseAddress = Options.ClientSettings.ConnectivitySettings.Address
106-
};
107-
108-
await Policy.Handle<Exception>()
109-
.WaitAndRetryAsync(DefaultBackoffDelay)
110-
.ExecuteAsync(
111-
async () => {
112-
using var response = await http.GetAsync("/health/live", CancellationToken.None);
113-
if (response.StatusCode >= HttpStatusCode.BadRequest)
114-
throw new FluentDockerException($"Health check failed with status code: {response.StatusCode}.");
115-
}
116-
);
117-
}
92+
// /// <summary>
93+
// /// max of 30 seconds (300 * 100ms)
94+
// /// </summary>
95+
// static readonly IEnumerable<TimeSpan> DefaultBackoffDelay = Backoff.ConstantBackoff(FromMilliseconds(100), 300);
96+
//
97+
// protected override async Task OnServiceStarted() {
98+
// using var http = new HttpClient(
99+
// #if NET
100+
// new SocketsHttpHandler { SslOptions = { RemoteCertificateValidationCallback = delegate { return true; } } }
101+
// #else
102+
// new WinHttpHandler { ServerCertificateValidationCallback = delegate { return true; } }
103+
// #endif
104+
// ) {
105+
// BaseAddress = Options.ClientSettings.ConnectivitySettings.Address
106+
// };
107+
//
108+
// await Policy.Handle<Exception>()
109+
// .WaitAndRetryAsync(DefaultBackoffDelay)
110+
// .ExecuteAsync(
111+
// async () => {
112+
// using var response = await http.GetAsync("/health/live", CancellationToken.None);
113+
// if (response.StatusCode >= HttpStatusCode.BadRequest)
114+
// throw new FluentDockerException($"Health check failed with status code: {response.StatusCode}.");
115+
// }
116+
// );
117+
// }
118118
}
119119

120120
/// <summary>
@@ -164,4 +164,4 @@ public async Task<int> GetNextAvailablePort(TimeSpan delay = default) {
164164
}
165165

166166
public int NextAvailablePort => GetNextAvailablePort(FromMilliseconds(100)).GetAwaiter().GetResult();
167-
}
167+
}

0 commit comments

Comments
 (0)