Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for GCP PubSub and Google Spanner database #1154

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Added support for GCP PubSub and Google Spanner database #1154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
036f13c
Added support for GCP PubSub and Spanner
jhakp Jun 13, 2022
5708ecf
added values in appsettings.json
jhakp Jun 13, 2022
406590f
added project for GCP PubSub and MongoDB integration
jhakp Jul 26, 2022
2b83050
removed GCP PubSub and MongoDB integration project as this is already…
jhakp Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion CAP.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.RabbitMQ.SqlServer.D
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetCore.CAP.OpenTelemetry", "src\DotNetCore.CAP.OpenTelemetry\DotNetCore.CAP.OpenTelemetry.csproj", "{83DDB126-A00B-4064-86E7-568322CA67EC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.AzureServiceBus.InMemory", "samples\Sample.AzureServiceBus.InMemory\Sample.AzureServiceBus.InMemory.csproj", "{0C734FB2-7D75-4FF3-B564-1E50E6280B14}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.AzureServiceBus.InMemory", "samples\Sample.AzureServiceBus.InMemory\Sample.AzureServiceBus.InMemory.csproj", "{0C734FB2-7D75-4FF3-B564-1E50E6280B14}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.GcpPubSub.GoogleSpanner", "samples\Sample.GcpPubSub.GoogleSpanner\Sample.GcpPubSub.GoogleSpanner.csproj", "{5F857ABF-449B-46C7-B160-CAC1C02DB782}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetCore.CAP.GoogleSpanner", "src\DotNetCore.CAP.GoogleSpanner\DotNetCore.CAP.GoogleSpanner.csproj", "{79278DDF-D699-4E1F-ACB4-907F8903E350}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.GcpPubSub.MongoDB", "samples\Sample.GcpPubSub.MongoDB\Sample.GcpPubSub.MongoDB.csproj", "{EEA758C3-2AFE-491C-B593-06143C73BAC7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetCore.CAP.GcpPubSub", "src\DotNetCore.CAP.GcpPubSub\DotNetCore.CAP.GcpPubSub.csproj", "{F607A247-7391-4423-A59E-6BB7F05475B1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -214,6 +222,22 @@ Global
{0C734FB2-7D75-4FF3-B564-1E50E6280B14}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0C734FB2-7D75-4FF3-B564-1E50E6280B14}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0C734FB2-7D75-4FF3-B564-1E50E6280B14}.Release|Any CPU.Build.0 = Release|Any CPU
{5F857ABF-449B-46C7-B160-CAC1C02DB782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F857ABF-449B-46C7-B160-CAC1C02DB782}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F857ABF-449B-46C7-B160-CAC1C02DB782}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5F857ABF-449B-46C7-B160-CAC1C02DB782}.Release|Any CPU.Build.0 = Release|Any CPU
{79278DDF-D699-4E1F-ACB4-907F8903E350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{79278DDF-D699-4E1F-ACB4-907F8903E350}.Debug|Any CPU.Build.0 = Debug|Any CPU
{79278DDF-D699-4E1F-ACB4-907F8903E350}.Release|Any CPU.ActiveCfg = Release|Any CPU
{79278DDF-D699-4E1F-ACB4-907F8903E350}.Release|Any CPU.Build.0 = Release|Any CPU
{EEA758C3-2AFE-491C-B593-06143C73BAC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EEA758C3-2AFE-491C-B593-06143C73BAC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EEA758C3-2AFE-491C-B593-06143C73BAC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EEA758C3-2AFE-491C-B593-06143C73BAC7}.Release|Any CPU.Build.0 = Release|Any CPU
{F607A247-7391-4423-A59E-6BB7F05475B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F607A247-7391-4423-A59E-6BB7F05475B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F607A247-7391-4423-A59E-6BB7F05475B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F607A247-7391-4423-A59E-6BB7F05475B1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -249,6 +273,10 @@ Global
{DCDF58E8-F823-4F04-9F8C-E8076DC16A68} = {3A6B6931-A123-477A-9469-8B468B5385AF}
{83DDB126-A00B-4064-86E7-568322CA67EC} = {9B2AE124-6636-4DE9-83A3-70360DABD0C4}
{0C734FB2-7D75-4FF3-B564-1E50E6280B14} = {3A6B6931-A123-477A-9469-8B468B5385AF}
{5F857ABF-449B-46C7-B160-CAC1C02DB782} = {3A6B6931-A123-477A-9469-8B468B5385AF}
{79278DDF-D699-4E1F-ACB4-907F8903E350} = {9B2AE124-6636-4DE9-83A3-70360DABD0C4}
{EEA758C3-2AFE-491C-B593-06143C73BAC7} = {3A6B6931-A123-477A-9469-8B468B5385AF}
{F607A247-7391-4423-A59E-6BB7F05475B1} = {9B2AE124-6636-4DE9-83A3-70360DABD0C4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2E70565D-94CF-40B4-BFE1-AC18D5F736AB}
Expand Down
79 changes: 79 additions & 0 deletions samples/Sample.GcpPubSub.GoogleSpanner/Controllers/ValuesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
using System;
using System.Data;
using System.Text.Json;
using System.Threading.Tasks;
using Dapper;
using DotNetCore.CAP;
using Google.Cloud.Spanner.Data;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;

namespace Sample.GcpPubSub.GoogleSpanner
{
[Route("api/[controller]")]
public class ValuesController : Controller, ICapSubscribe
{
public class MyObj
{
public string SingerId { get; set; }
public string FirstName { get; set; }
}

private readonly string _connectionString;
private readonly ICapPublisher _capBus;

public ValuesController(ICapPublisher producer, IConfiguration configuration)
{
_capBus = producer;
_connectionString = configuration.GetConnectionString("SpannerDB");
}

[Route("~/without/transaction")]
public async Task<IActionResult> WithoutTransaction()
{
await _capBus.PublishAsync("sample.gcppubsub.googlespanner", DateTime.Now);

return Ok();
}

[Route("~/adonet/transaction")]
public IActionResult AdonetWithTransaction()
{
var random = new Random().Next(1, 10000);
try
{
using (var connection = new SpannerConnection(_connectionString))
{
using (var transaction = connection.BeginTransaction())
{
var id = Guid.NewGuid().ToString();
var sql = "INSERT INTO Singers (SingerId, FirstName, LastName, FullName) " +
" values ('" + id + "', 'User" + random + "', 'Doe', 'User" + random + " Doe')";
var cmd = connection.CreateDmlCommand(sql);
cmd.Transaction = transaction;
_ = cmd.ExecuteNonQuery();

var msg = new MyObj { SingerId = id, FirstName = "User" + random };

_capBus.Publish("sample.gcppubsub.googlespanner", msg);

transaction.Commit();
}
}
}
catch (Exception ex)
{
Console.WriteLine(ex);
}

return Ok();
}


[CapSubscribe("sample.gcppubsub.googlespanner")]
public void Test2(MyObj value)
{
Console.WriteLine("Subscriber output message: " + JsonSerializer.Serialize(value));
}
}
}
20 changes: 20 additions & 0 deletions samples/Sample.GcpPubSub.GoogleSpanner/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting;

namespace Sample.GcpPubSub.GoogleSpanner
{
public class Program
{
public static void Main(string[] args)
{
CreateHostBuilder(args).Build().Run();
}

public static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder =>
{
webBuilder.UseStartup<Startup>();
});
}
}
21 changes: 21 additions & 0 deletions samples/Sample.GcpPubSub.GoogleSpanner/Sample.GcpPubSub.GoogleSpanner.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<WarningsAsErrors>NU1701</WarningsAsErrors>
<NoWarn>NU1701</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.35" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.7" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\DotNetCore.CAP.Dashboard\DotNetCore.CAP.Dashboard.csproj" />
<ProjectReference Include="..\..\src\DotNetCore.CAP.GcpPubSub\DotNetCore.CAP.GcpPubSub.csproj" />
<ProjectReference Include="..\..\src\DotNetCore.CAP.GoogleSpanner\DotNetCore.CAP.GoogleSpanner.csproj" />
<ProjectReference Include="..\..\src\DotNetCore.CAP\DotNetCore.CAP.csproj" />
</ItemGroup>

</Project>
48 changes: 48 additions & 0 deletions samples/Sample.GcpPubSub.GoogleSpanner/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
using DotNetCore.CAP.GoogleSpanner;
using Microsoft.Extensions.Configuration;
using DotNetCore.CAP;
using DotNetCore.CAP.Dashboard.NodeDiscovery;

namespace Sample.GcpPubSub.GoogleSpanner
{
public class Startup
{
public Startup(IConfiguration configuration)
{
Configuration = configuration;
}

public IConfiguration Configuration { get; }

public void ConfigureServices(IServiceCollection services)
{
string connectionString = Configuration["ConnectionStrings:SpannerCapDB"];

services.AddCap(x =>
{
x.UseGoogleSpanner(connectionString);
x.UseGooglePubSub(cfg =>
{
cfg.ProjectId = Configuration["Pubsub:ProjectId"];
cfg.SubscriptionId = Configuration["Pubsub:SubscriptionId"];
cfg.VerificationToken = Configuration["Pubsub:VerificationToken"];
cfg.TopicId = Configuration["Pubsub:TopicId"];
});
x.UseDashboard();
});
//services.AddSingleton<INodeDiscoveryProvider>();
services.AddControllers();
}

public void Configure(IApplicationBuilder app)
{
app.UseRouting();
app.UseEndpoints(endpoints =>
{
endpoints.MapControllers();
});
}
}
}
18 changes: 18 additions & 0 deletions samples/Sample.GcpPubSub.GoogleSpanner/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"Pubsub": {
"ProjectId": "digitalcore-sandbox",
"VerificationToken": "f2000d9218621a4e296d1e1d92c1d714ba46d400",
"TopicId": "pjha-dapr-pub-sub",
"SubscriptionId": "pjha-dapr-subscription"
},
"ConnectionStrings": {
"SpannerDB": "Data Source=projects/digitalcore-sandbox/instances/sheeley-test/databases/spanner-perf",
"SpannerCapDB": "Data Source=projects/digitalcore-sandbox/instances/sheeley-test/databases/cap"
},
"Logging": {
"IncludeScopes": false,
"LogLevel": {
"Default": "Debug"
}
}
}
76 changes: 76 additions & 0 deletions samples/Sample.GcpPubSub.MongoDB/Controllers/ValuesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
using System;
using System.Text.Json;
using System.Threading.Tasks;
using DotNetCore.CAP;
using Microsoft.AspNetCore.Mvc;
using MongoDB.Bson;
using MongoDB.Driver;

namespace Sample.GcpPubSub.GoogleSpanner
{
[Route("api/[controller]")]
public class ValuesController : Controller, ICapSubscribe
{
public class MyObj
{
public string SingerId { get; set; }
public string FirstName { get; set; }
}

private readonly IMongoClient _client;
private readonly ICapPublisher _capBus;

public ValuesController(IMongoClient client, ICapPublisher producer)
{
_capBus = producer;
_client = client;
}

[Route("~/without/transaction")]
public async Task<IActionResult> WithoutTransaction()
{
await _capBus.PublishAsync("sample.gcppubsub.googlespanner", DateTime.Now);

return Ok();
}

[Route("~/adonet/transaction")]
public IActionResult AdonetWithTransaction()
{
var random = new Random().Next(1, 10000).ToString();
try
{
//NOTE: before your test, create "test" database and "test.collection" collection first
//The MongoDB should have replication enabled.

using (var session = _client.StartTransaction(_capBus, autoCommit: false))
{
var collection = _client.GetDatabase("test").GetCollection<BsonDocument>("test.collection");
collection.InsertOne(session, new BsonDocument {
{ "SingerId", random },
{ "FirstName", "John"+random },
{ "LastName", "Doe"+random }
});

var msg = new MyObj { SingerId = random, FirstName = "John" + random };
_capBus.Publish("sample.gcppubsub.mongodb", msg);

session.CommitTransaction();
}
}
catch (Exception ex)
{
Console.WriteLine(ex);
}

return Ok();
}


[CapSubscribe("sample.gcppubsub.mongodb")]
public void Test2(MyObj value)
{
Console.WriteLine("Subscriber output message: " + JsonSerializer.Serialize(value));
}
}
}
20 changes: 20 additions & 0 deletions samples/Sample.GcpPubSub.MongoDB/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting;

namespace Sample.GcpPubSub.GoogleSpanner
{
public class Program
{
public static void Main(string[] args)
{
CreateHostBuilder(args).Build().Run();
}

public static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder =>
{
webBuilder.UseStartup<Startup>();
});
}
}
21 changes: 21 additions & 0 deletions samples/Sample.GcpPubSub.MongoDB/Sample.GcpPubSub.MongoDB.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<WarningsAsErrors>NU1701</WarningsAsErrors>
<NoWarn>NU1701</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.35" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.7" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\DotNetCore.CAP.Dashboard\DotNetCore.CAP.Dashboard.csproj" />
<ProjectReference Include="..\..\src\DotNetCore.CAP.GcpPubSub\DotNetCore.CAP.GcpPubSub.csproj" />
<ProjectReference Include="..\..\src\DotNetCore.CAP.MongoDB\DotNetCore.CAP.MongoDB.csproj" />
<ProjectReference Include="..\..\src\DotNetCore.CAP\DotNetCore.CAP.csproj" />
</ItemGroup>

</Project>
Loading