commit

Author: KirillKurdyukov

examples/src/YC/CmdOptions.cs

@@ -0,0 +1,15 @@
+using CommandLine;
+
+namespace YcCloud;
+
+internal class CmdOptions
+{
+    [Option('h', "host", Required = true, HelpText = "Database host")]
+    public string Host { get; set; } = null!;
+
+    [Option('d', "database", Required = true, HelpText = "Database name")]
+    public string Database { get; set; } = null!;
+    
+    [Option("saFilePath", Required = true, HelpText = "Sa Key")]
+    public string SaFilePath { get; set; } = null!;
+}

examples/src/YC/Program.cs

@@ -0,0 +1,31 @@
+using CommandLine;
+using Microsoft.Extensions.Logging;
+using YcCloud;
+using Ydb.Sdk.Ado;
+using Ydb.Sdk.Yc;
+
+await Parser.Default.ParseArguments<CmdOptions>(args).WithParsedAsync(async cmd =>
+{
+    var loggerFactory = LoggerFactory.Create(builder => builder.AddConsole().SetMinimumLevel(LogLevel.Information));
+
+    var saProvider = new ServiceAccountProvider(saFilePath: cmd.SaFilePath, loggerFactory: loggerFactory);
+    await saProvider.Initialize();
+
+    var cert = YcCerts.GetDefaultServerCertificate();
+
+    var builder = new YdbConnectionStringBuilder
+    {
+        UseTls = true,
+        Host = cmd.Host,
+        Port = 2135,
+        Database = cmd.Database,
+        CredentialsProvider = saProvider,
+        LoggerFactory = loggerFactory,
+        CustomCertificate = cert
+    };
+
+    await using var ydbConnection = new YdbConnection(builder);
+    await ydbConnection.OpenAsync();
+
+    Console.WriteLine(await new YdbCommand(ydbConnection) { CommandText = "SELECT 'Hello YDB!'u" }.ExecuteScalarAsync());
+});

examples/src/YC/YC.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <RootNamespace>YcCloud</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="CommandLineParser" Version="2.8.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
+        <PackageReference Include="Ydb.Protos" Version="1.1.1" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\src\Ydb.Sdk\src\Ydb.Sdk.csproj" />
+        <ProjectReference Include="..\..\..\..\ydb-dotnet-yc\src\Ydb.Sdk.Yc.Auth\src\Ydb.Sdk.Yc.Auth.csproj" />
+    </ItemGroup>
+</Project>

examples/src/YdbExamples.sln

@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdoNet", "AdoNet\AdoNet.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DapperExample", "DapperExample\DapperExample.csproj", "{AC8F1B10-31EB-4A29-BF35-7F49B06E1FA8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YC", "YC\YC.csproj", "{753E4F33-CB08-47B9-864F-4CC037B278C4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@ Global
 		{AC8F1B10-31EB-4A29-BF35-7F49B06E1FA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AC8F1B10-31EB-4A29-BF35-7F49B06E1FA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AC8F1B10-31EB-4A29-BF35-7F49B06E1FA8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{753E4F33-CB08-47B9-864F-4CC037B278C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{753E4F33-CB08-47B9-864F-4CC037B278C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{753E4F33-CB08-47B9-864F-4CC037B278C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{753E4F33-CB08-47B9-864F-4CC037B278C4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Ydb.Sdk/src/Ado/YdbConnectionStringBuilder.cs

@@ -141,6 +141,19 @@ public string? RootCertificate
 
     public ICredentialsProvider? CredentialsProvider { get; set; }
 
+    public X509Certificate? CustomCertificate
+    {
+        get => _customCertificate;
+        set
+        {
+            RootCertificate = null;
+
+            _customCertificate = value;
+        }
+    }
+
+    private X509Certificate? _customCertificate;
+
     private void SaveValue(string propertyName, object? value)
     {
         if (value == null)
@@ -183,7 +196,8 @@ internal Task<Driver> BuildDriver()
     {
         var credentialsProvider = CredentialsProvider ??
                                   (User != null ? new StaticCredentialsProvider(User, Password) : null);
-        var cert = RootCertificate != null ? X509Certificate.CreateFromCertFile(RootCertificate) : null;
+        var cert = CustomCertificate ??
+                   (RootCertificate != null ? X509Certificate.CreateFromCertFile(RootCertificate) : null);
 
         return Driver.CreateInitialized(new DriverConfig(
             endpoint: Endpoint,