Add tests

.github/workflows/base.yml

@@ -6,6 +6,18 @@ on:
       docker-tag:
         required: true
         type: string
+      docker-registry:
+        required: true
+        type: string
+        default: docker.eventstore.com/eventstore-ce/eventstoredb-ce
+      build-matrix:
+        required: true
+        type: string
+        default: '["Streams", "PersistentSubscriptions", "Operations", "UserManagement", "ProjectionManagement"]'
+      test-matrix:
+        required: true
+        type: string
+        default: '["Streams", "PersistentSubscriptions", "Operations", "UserManagement", "ProjectionManagement"]'
 
 jobs:
   test:
@@ -15,7 +27,8 @@ jobs:
       matrix:
         framework: [ net6.0, net7.0, net8.0 ]
         os: [ ubuntu-latest ]
-        test: [ Streams, PersistentSubscriptions, Operations, UserManagement, ProjectionManagement ]
+        build: ${{fromJson(inputs.build-matrix)}}
+        test: ${{fromJson(inputs.test-matrix)}}
         configuration: [ release ]
     runs-on: ${{ matrix.os }}
     name: EventStore.Client.${{ matrix.test }}/${{ matrix.os }}/${{ matrix.framework }}/${{ inputs.docker-tag }}
@@ -36,7 +49,7 @@ jobs:
       - name: Pull EventStore Image
         shell: bash
         run: |
-          docker pull docker.eventstore.com/eventstore-ce/eventstoredb-ce:${{ inputs.docker-tag }}
+          docker pull ${{ inputs.docker-registry }}:${{ inputs.docker-tag }}
       - name: Install dotnet SDKs
         uses: actions/setup-dotnet@v3
         with:
@@ -47,11 +60,12 @@ jobs:
       - name: Compile
         shell: bash
         run: |
-          dotnet build --configuration ${{ matrix.configuration }} --framework ${{ matrix.framework }} src/EventStore.Client.${{ matrix.test }}
+          dotnet build --configuration ${{ matrix.configuration }} --framework ${{ matrix.framework }} src/EventStore.Client.${{ matrix.build }}
       - name: Run Tests
         shell: bash
         env:
           ES_DOCKER_TAG: ${{ inputs.docker-tag }}
+          ES_DOCKER_REGISTRY: ${{ inputs.docker-registry }}
         run: |
           sudo ./gencert.sh
           dotnet test --configuration ${{ matrix.configuration }} --blame \

.github/workflows/enterprise.yml

@@ -0,0 +1,19 @@
+name: Test CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+    tags:
+      - v*
+
+jobs:
+  test:
+    uses: ./.github/workflows/base.yml
+    with:
+      docker-tag: 24.2.0-jammy
+      docker-registry: docker.eventstore.com/eventstore-ee/eventstoredb-commercial
+      build-matrix: '["Streams", "PersistentSubscriptions", "Operations", "UserManagement", "ProjectionManagement"]'
+      test-matrix: '["Plugins"]'
+    secrets: inherit

EventStore.Client.sln

@@ -33,6 +33,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventStore.Client.UserManag
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventStore.Client.Tests.Common", "test\EventStore.Client.Tests.Common\EventStore.Client.Tests.Common.csproj", "{E326832D-DE52-4DE4-9E54-C800908B75F3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventStore.Client.Plugins.Tests", "test\EventStore.Client.Plugins.Tests\EventStore.Client.Plugins.Tests.csproj", "{315B38AF-4574-4E25-992B-CA0D24C95884}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -94,6 +96,10 @@ Global
 		{E326832D-DE52-4DE4-9E54-C800908B75F3}.Debug|x64.Build.0 = Debug|Any CPU
 		{E326832D-DE52-4DE4-9E54-C800908B75F3}.Release|x64.ActiveCfg = Release|Any CPU
 		{E326832D-DE52-4DE4-9E54-C800908B75F3}.Release|x64.Build.0 = Release|Any CPU
+		{315B38AF-4574-4E25-992B-CA0D24C95884}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{315B38AF-4574-4E25-992B-CA0D24C95884}.Debug|x64.Build.0 = Debug|Any CPU
+		{315B38AF-4574-4E25-992B-CA0D24C95884}.Release|x64.ActiveCfg = Release|Any CPU
+		{315B38AF-4574-4E25-992B-CA0D24C95884}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{D3744A86-DD35-4104-AAEE-84B79062C4A2} = {EA59C1CB-16DA-4F68-AF8A-642A969B4CF8}
@@ -109,5 +115,6 @@ Global
 		{6CEB731F-72E1-461F-A6B3-54DBF3FD786C} = {C51F2C69-45A9-4D0D-A708-4FC319D5D340}
 		{22634CEE-4F7B-4679-A48D-38A2A8580ECA} = {C51F2C69-45A9-4D0D-A708-4FC319D5D340}
 		{E326832D-DE52-4DE4-9E54-C800908B75F3} = {C51F2C69-45A9-4D0D-A708-4FC319D5D340}
+		{315B38AF-4574-4E25-992B-CA0D24C95884} = {C51F2C69-45A9-4D0D-A708-4FC319D5D340}
 	EndGlobalSection
 EndGlobal

gencert.ps1

@@ -4,18 +4,16 @@ Write-Host ">> Generating certificate..."
 New-Item -ItemType Directory -Path .\certs -Force
 
 # Set permissions for the directory
-icacls .\certs /grant:r "$($env:UserName):(OI)(CI)RX"
+icacls .\certs /grant:r "$($env:UserName):(OI)(CI)F"
 
 # Pull the Docker image
-docker pull eventstore/es-gencert-cli:1.0.2
+docker pull ghcr.io/eventstore/es-gencert-cli:1.3
 
-# Create CA certificate
-docker run --rm --volume ${PWD}\certs:/tmp --user (Get-Process -Id $PID).SessionId eventstore/es-gencert-cli:1.0.2 create-ca -out /tmp/ca
-
-# Create node certificate
-docker run --rm --volume ${PWD}\certs:/tmp --user (Get-Process -Id $PID).SessionId eventstore/es-gencert-cli:1.0.2 create-node -ca-certificate /tmp/ca/ca.crt -ca-key /tmp/ca/ca.key -out /tmp/node -ip-addresses 127.0.0.1 -dns-names localhost
+docker run --rm --volume ${PWD}\certs:/tmp ghcr.io/eventstore/es-gencert-cli create-ca -out /tmp/ca
+docker run --rm --volume ${PWD}\certs:/tmp ghcr.io/eventstore/es-gencert-cli create-node -ca-certificate /tmp/ca/ca.crt -ca-key /tmp/ca/ca.key -out /tmp/node -ip-addresses 127.0.0.1 -dns-names localhost
+docker run --rm --volume ${PWD}\certs:/tmp ghcr.io/eventstore/es-gencert-cli create-user -username admin -ca-certificate /tmp/ca/ca.crt -ca-key /tmp/ca/ca.key -out /tmp/user-admin
 
 # Set permissions recursively for the directory
-icacls .\certs /grant:r "$($env:UserName):(OI)(CI)RX"
+icacls .\certs /grant:r "$($env:UserName):(OI)(CI)F"
 
 Import-Certificate -FilePath ".\certs\ca\ca.crt" -CertStoreLocation Cert:\CurrentUser\Root

gencert.sh

@@ -13,11 +13,13 @@ mkdir -p certs
 
 chmod 0755 ./certs
 
-docker pull eventstore/es-gencert-cli:1.0.2
+docker pull ghcr.io/eventstore/es-gencert-cli:1.3
 
-docker run --rm --volume $PWD/certs:/tmp --user $(id -u):$(id -g) eventstore/es-gencert-cli:1.0.2 create-ca -out /tmp/ca
+docker run --rm --volume $PWD/certs:/tmp --user $(id -u):$(id -g) ghcr.io/eventstore/es-gencert-cli create-ca -out /tmp/ca
 
-docker run --rm --volume $PWD/certs:/tmp --user $(id -u):$(id -g) eventstore/es-gencert-cli:1.0.2 create-node -ca-certificate /tmp/ca/ca.crt -ca-key /tmp/ca/ca.key -out /tmp/node -ip-addresses 127.0.0.1 -dns-names localhost
+docker run --rm --volume $PWD/certs:/tmp --user $(id -u):$(id -g) ghcr.io/eventstore/es-gencert-cli create-node -ca-certificate /tmp/ca/ca.crt -ca-key /tmp/ca/ca.key -out /tmp/node -ip-addresses 127.0.0.1 -dns-names localhost
+
+docker run --rm --volume $PWD/certs:/tmp --user $(id -u):$(id -g) ghcr.io/eventstore/es-gencert-cli create-user -username admin -ca-certificate /tmp/ca/ca.crt -ca-key /tmp/ca/ca.key -out /tmp/user-admin
 
 chmod -R 0755 ./certs
 

src/EventStore.Client.Common/EventStoreCallOptions.cs

@@ -31,7 +31,7 @@ public static CallOptions CreateNonStreaming(
 		Create(
 			settings,
 			deadline ?? settings.DefaultDeadline,
-			userCredentials?.ClientCertificate != null ? null : userCredentials,
+			userCredentials?.UserCertificate != null ? null : userCredentials,
 			cancellationToken
 		);
 

src/EventStore.Client/CertificateUtils.cs

@@ -16,7 +16,7 @@ namespace EventStore.Client;
 /// <summary>
 /// Utility class for loading certificates and private keys from files.
 /// </summary>
-public static class CertificateUtils {
+static class CertificateUtils {
 	private static RSA LoadKey(string privateKeyPath) {
 		string[] allLines        = File.ReadAllLines(privateKeyPath);
 		var      header          = allLines[0].Replace("-", "");

src/EventStore.Client/ChannelFactory.cs

@@ -39,9 +39,9 @@ HttpMessageHandler CreateHandler() {
 
 				bool configureClientCert = settings.ConnectivitySettings.ClientCertificate != null
 				                        || settings.ConnectivitySettings.TlsCaFile != null
-				                        || channelIdentifier.UserCredentials?.ClientCertificate != null;
+				                        || channelIdentifier.UserCredentials?.UserCertificate != null;
 
-				var certificate = channelIdentifier.UserCredentials?.ClientCertificate
+				var certificate = channelIdentifier.UserCredentials?.UserCertificate
 				               ?? settings.ConnectivitySettings.ClientCertificate
 				               ?? settings.ConnectivitySettings.TlsCaFile;
 

src/EventStore.Client/HttpFallback.cs

@@ -23,9 +23,9 @@ internal HttpFallback (EventStoreClientSettings settings, UserCredentials? userC
 
 	            bool configureClientCert = settings.ConnectivitySettings.ClientCertificate != null
 	                                    || settings.ConnectivitySettings.TlsCaFile != null
-	                                    || userCredentials?.ClientCertificate != null;
+	                                    || userCredentials?.UserCertificate != null;
 
-	            var certificate = userCredentials?.ClientCertificate
+	            var certificate = userCredentials?.UserCertificate
 	                           ?? settings.ConnectivitySettings.ClientCertificate
 	                           ?? settings.ConnectivitySettings.TlsCaFile;
 

src/EventStore.Client/SingleNodeChannelSelector.cs

@@ -5,35 +5,32 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 
-namespace EventStore.Client {
-	internal class SingleNodeChannelSelector : IChannelSelector {
-		private readonly ILogger _log;
-		private readonly ChannelCache _channelCache;
-		private readonly ChannelIdentifier _channelIdentifier;
-
-		public SingleNodeChannelSelector(
-			EventStoreClientSettings settings,
-			ChannelCache channelCache) {
-
-			_log = settings.LoggerFactory?.CreateLogger<SingleNodeChannelSelector>() ??
-				new NullLogger<SingleNodeChannelSelector>();
-
-			_channelCache = channelCache;
-
-			var uri             = settings.ConnectivitySettings.ResolvedAddressOrDefault;
-
-			_channelIdentifier = new ChannelIdentifier(new DnsEndPoint(uri.Host, uri.Port));
-		}
-
-		public Task<ChannelBase> SelectChannelAsync(
-			UserCredentials? userCredentials, CancellationToken cancellationToken
-		) =>
-			Task.FromResult(SelectChannel(_channelIdentifier));
-
-		public ChannelBase SelectChannel(ChannelIdentifier channelIdentifier) {
-			_log.LogInformation("Selected {endPoint}.", channelIdentifier);
-
-			return _channelCache.GetChannelInfo(channelIdentifier);
-		}
-	}
+namespace EventStore.Client
+{
+    internal class SingleNodeChannelSelector : IChannelSelector
+    {
+        private readonly ILogger _log;
+        private readonly ChannelCache _channelCache;
+        private readonly EventStoreClientSettings _settings;
+
+        public SingleNodeChannelSelector(EventStoreClientSettings settings, ChannelCache channelCache)
+        {
+            _log = settings.LoggerFactory?.CreateLogger<SingleNodeChannelSelector>() ?? new NullLogger<SingleNodeChannelSelector>();
+            _settings = settings;
+            _channelCache = channelCache;
+        }
+
+        public Task<ChannelBase> SelectChannelAsync(UserCredentials? userCredentials, CancellationToken cancellationToken)
+        {
+            var uri = _settings.ConnectivitySettings.ResolvedAddressOrDefault;
+            var channelIdentifier = new ChannelIdentifier(new DnsEndPoint(uri.Host, uri.Port), userCredentials);
+            return Task.FromResult(SelectChannel(channelIdentifier));
+        }
+
+        public ChannelBase SelectChannel(ChannelIdentifier channelIdentifier)
+        {
+            _log.LogInformation("Selected {endPoint}.", channelIdentifier);
+            return _channelCache.GetChannelInfo(channelIdentifier);
+        }
+    }
 }

src/EventStore.Client/UserCertificate.cs

@@ -0,0 +1,30 @@
+using System.Security.Cryptography.X509Certificates;
+
+namespace EventStore.Client {
+	/// <summary>
+	/// Represents the user certificates used to authenticate and authorize operations on the EventStoreDB.
+	/// </summary>
+	public class UserCertificate {
+		/// <summary>
+		/// The user certificate
+		/// </summary>
+		public X509Certificate2? Certificate { get; }
+
+		/// <summary>
+		/// Constructs a new <see cref="UserCredentials"/>.
+		/// </summary>
+		public UserCertificate(X509Certificate2 userCertificate) {
+			Certificate = userCertificate;
+		}
+
+		/// <summary>
+		/// Constructs a new <see cref="UserCredentials"/>.
+		/// </summary>
+		public UserCertificate(string certificatePath, string privateKeyPath) {
+			Certificate = CertificateUtils.LoadFromFile(
+				certificatePath,
+				privateKeyPath
+			);
+		}
+	}
+}

src/EventStore.Client/UserCredentials.cs

@@ -15,8 +15,8 @@ public class UserCredentials {
 		/// <summary>
 		/// Constructs a new <see cref="UserCredentials"/>.
 		/// </summary>
-		public UserCredentials(X509Certificate2 clientCertificate) {
-			ClientCertificate = clientCertificate;
+		public UserCredentials(UserCertificate userCertificate) {
+			UserCertificate = userCertificate.Certificate;
 		}
 
 		/// <summary>
@@ -44,7 +44,7 @@ public UserCredentials(string bearerToken) {
 		/// <summary>
 		/// The client certificate
 		/// </summary>
-		public X509Certificate2? ClientCertificate { get; }
+		public X509Certificate2? UserCertificate { get; }
 
 		/// <summary>
 		/// The username
@@ -58,7 +58,7 @@ public UserCredentials(string bearerToken) {
 
 		/// <inheritdoc />
 		public override string ToString() =>
-			ClientCertificate != null ? string.Empty : Authorization?.ToString() ?? string.Empty;
+			UserCertificate != null ? string.Empty : Authorization?.ToString() ?? string.Empty;
 
 		/// <summary>
 		/// Implicitly convert a <see cref="UserCredentials"/> to a <see cref="string"/>.

test/EventStore.Client.Plugins.Tests/EventStore.Client.Plugins.Tests.csproj

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+	  <RootNamespace>EventStore.Client.Plugins.Tests</RootNamespace>
+	</PropertyGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\EventStore.Client.Tests.Common\EventStore.Client.Tests.Common.csproj" />
+	</ItemGroup>
+</Project>