SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Don#t use colon in appsettings #1223

Browse source 
Colons are removed from any element name in the appsettings
This commit is contained in:
axeleron007 2021-07-07 10:31:29 +03:00
parent 88bc022140
commit 32c2815f55
19 changed files with 47 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/activities/Elsa.Activities.Temporal.Quartz/Startup.cs
View file

@ -4,12 +4,12 @@ using Microsoft.Extensions.Configuration;
namespace Elsa.Activities.Temporal.Quartz
{
[Feature("Temporal:Quartz")]
[Feature("TemporalQuartz")]
public class Startup : StartupBase
{
public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration)
{
elsa.AddQuartzTemporalActivities(options => configuration.GetSection("Elsa:Temporal:Quartz").Bind(options));
elsa.AddQuartzTemporalActivities(options => configuration.GetSection("Elsa:TemporalQuartz").Bind(options));
}
}
}

2
src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Core/EntityFrameworkWebhookStartupBase.cs
View file

@ -16,7 +16,7 @@ namespace Elsa.Webhooks.Persistence.EntityFramework.Core
public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration)
{
var services = elsa.Services;
var section = configuration.GetSection($"Elsa:Features:Webhooks:Persistence:EntityFrameworkCore:{ProviderName}");
var section = configuration.GetSection($"Elsa:Features:WebhooksPersistenceEntityFrameworkCore{ProviderName}");
var connectionStringName = section.GetValue<string>("ConnectionStringName");
var connectionString = section.GetValue<string>("ConnectionString");

2
src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.MySql/Startup.cs
View file

@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
namespace Elsa.Webhooks.Persistence.EntityFramework.MySql
{
[Feature("Webhooks:Persistence:EntityFrameworkCore:MySql")]
[Feature("WebhooksPersistenceEntityFrameworkCoreMySql")]
public class Startup : EntityFrameworkWebhookStartupBase
{
protected override string ProviderName => "MySql";

2
src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.PostgreSql/Startup.cs
View file

@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
namespace Elsa.Webhooks.Persistence.EntityFramework.PostgreSql
{
[Feature("Webhooks:Persistence:EntityFrameworkCore:PostgreSql")]
[Feature("WebhooksPersistenceEntityFrameworkCorePostgreSql")]
public class Startup : EntityFrameworkWebhookStartupBase
{
protected override string ProviderName => "PostgreSql";

2
src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.SqlServer/Startup.cs
View file

@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
namespace Elsa.Webhooks.Persistence.EntityFramework.SqlServer
{
[Feature("Webhooks:Persistence:EntityFrameworkCore:SqlServer")]
[Feature("WebhooksPersistenceEntityFrameworkCoreSqlServer")]
public class Startup : EntityFrameworkWebhookStartupBase
{
protected override string ProviderName => "SqlServer";

2
src/activities/webhooks/Elsa.Webhooks.Persistence.EntityFramework.Sqlite/Startup.cs
View file

@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
namespace Elsa.Webhooks.Persistence.EntityFramework.Sqlite
{
[Feature("Webhooks:Persistence:EntityFrameworkCore:Sqlite")]
[Feature("WebhooksPersistenceEntityFrameworkCoreSqlite")]
public class Startup : EntityFrameworkWebhookStartupBase
{
protected override string ProviderName => "Sqlite";

4
src/activities/webhooks/Elsa.Webhooks.Persistence.MongoDb/Startup.cs
View file

@ -8,13 +8,13 @@ using Microsoft.Extensions.DependencyInjection;
namespace Elsa.Webhooks.Persistence.MongoDb
{
[Feature("Webhooks:Persistence:MongoDb")]
[Feature("WebhooksPersistenceMongoDb")]
public class Startup : StartupBase
{
public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration)
{
var services = elsa.Services;
var section = configuration.GetSection($"Elsa:Features:Webhooks:Persistence:MongoDb");
var section = configuration.GetSection($"Elsa:Features:WebhooksPersistenceMongoDb");
var connectionStringName = section.GetValue<string>("ConnectionStringName");
var connectionString = section.GetValue<string>("ConnectionString");

10
src/activities/webhooks/Elsa.Webhooks.Persistence.YesSql/Startups.cs
View file

@ -13,7 +13,7 @@ using YesSql.Provider.SqlServer;
namespace Elsa.Webhooks.Persistence.YesSql
{
[Feature("Webhooks:Persistence:YesSql:Sqlite")]
[Feature("WebhooksPersistenceYesSqlSqlite")]
public class SqliteStartup : YesSqlStartupBase
{
protected override string ProviderName => "Sqlite";
@ -21,21 +21,21 @@ namespace Elsa.Webhooks.Persistence.YesSql
protected override void Configure(global::YesSql.IConfiguration options, string connectionString) => options.UseSqLite(connectionString);
}
[Feature("Webhooks:Persistence:YesSql:SqlServer")]
[Feature("WebhooksPersistenceYesSqlSqlServer")]
public class SqlServerStartup : YesSqlStartupBase
{
protected override string ProviderName => "SqlServer";
protected override void Configure(global::YesSql.IConfiguration options, string connectionString) => options.UseSqlServer(connectionString);
}
[Feature("Webhooks:Persistence:YesSql:MySql")]
[Feature("WebhooksPersistenceYesSqlMySql")]
public class MySqlStartup : YesSqlStartupBase
{
protected override string ProviderName => "MySql";
protected override void Configure(global::YesSql.IConfiguration options, string connectionString) => options.UseMySql(connectionString);
}
[Feature("Webhooks:Persistence:YesSql:PostgreSql")]
[Feature("WebhooksPersistenceYesSqlPostgreSql")]
public class PostgreSqlStartup : YesSqlStartupBase
{
protected override string ProviderName => "PostgreSql";
@ -49,7 +49,7 @@ namespace Elsa.Webhooks.Persistence.YesSql
public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration)
{
var services = elsa.Services;
var section = configuration.GetSection($"Elsa:Features:Webhooks:Persistence:YesSql:{ProviderName}");
var section = configuration.GetSection($"Elsa:Features:WebhooksPersistenceYesSql{ProviderName}");
var connectionStringName = section.GetValue<string>("ConnectionStringName");
var connectionString = section.GetValue<string>("ConnectionString");

2
src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Core/EntityFrameworkCoreStartupBase.cs
View file

@ -12,7 +12,7 @@ namespace Elsa.Persistence.EntityFramework.Core
public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration)
{
var section = configuration.GetSection($"Elsa:Features:Persistence:EntityFrameworkCore:{ProviderName}");
var section = configuration.GetSection($"Elsa:Features:PersistenceEntityFrameworkCore{ProviderName}");
var connectionStringName = section.GetValue<string>("ConnectionStringName");
var connectionString = section.GetValue<string>("ConnectionString");

2
src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.MySql/Startup.cs
View file

@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
namespace Elsa.Persistence.EntityFramework.MySql
{
[Feature("Persistence:EntityFrameworkCore:MySql")]
[Feature("PersistenceEntityFrameworkCoreMySql")]
public class Startup : EntityFrameworkCoreStartupBase
{
protected override string ProviderName => "MySql";

2
src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.PostgreSql/Startup.cs
View file

@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
namespace Elsa.Persistence.EntityFramework.PostgreSql
{
[Feature("Persistence:EntityFrameworkCore:PostgreSql")]
[Feature("PersistenceEntityFrameworkCorePostgreSql")]
public class Startup : EntityFrameworkCoreStartupBase
{
protected override string ProviderName => "PostgreSql";

2
src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.SqlServer/Startup.cs
View file

@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
namespace Elsa.Persistence.EntityFramework.SqlServer
{
[Feature("Persistence:EntityFrameworkCore:SqlServer")]
[Feature("PersistenceEntityFrameworkCoreSqlServer")]
public class Startup : EntityFrameworkCoreStartupBase
{
protected override string ProviderName => "SqlServer";

2
src/persistence/Elsa.Persistence.EntityFramework/Elsa.Persistence.EntityFramework.Sqlite/Startup.cs
View file

@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore;
namespace Elsa.Persistence.EntityFramework.Sqlite
{
[Feature("Persistence:EntityFrameworkCore:Sqlite")]
[Feature("PersistenceEntityFrameworkCoreSqlite")]
public class Startup : EntityFrameworkCoreStartupBase
{
protected override string ProviderName => "Sqlite";

4
src/persistence/Elsa.Persistence.MongoDb/Startup.cs
View file

@ -4,12 +4,12 @@ using Microsoft.Extensions.Configuration;
namespace Elsa.Persistence.MongoDb
{
[Feature("Persistence:MongoDb")]
[Feature("PersistenceMongoDb")]
public class Startup : StartupBase
{
public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration)
{
var section = configuration.GetSection($"Elsa:Features:Persistence:MongoDb");
var section = configuration.GetSection($"Elsa:Features:PersistenceMongoDb");
var connectionStringName = section.GetValue<string>("ConnectionStringName");
var connectionString = section.GetValue<string>("ConnectionString");

10
src/persistence/Elsa.Persistence.YesSql/Startups.cs
View file

@ -9,7 +9,7 @@ using YesSql.Provider.SqlServer;
namespace Elsa.Persistence.YesSql
{
[Feature("Persistence:YesSql:Sqlite")]
[Feature("PersistenceYesSqlSqlite")]
public class SqliteStartup : YesSqlStartupBase
{
protected override string ProviderName => "Sqlite";
@ -17,21 +17,21 @@ namespace Elsa.Persistence.YesSql
protected override void Configure(global::YesSql.IConfiguration options, string connectionString) => options.UseSqLite(connectionString);
}
[Feature("Persistence:YesSql:SqlServer")]
[Feature("PersistenceYesSqlSqlServer")]
public class SqlServerStartup : YesSqlStartupBase
{
protected override string ProviderName => "SqlServer";
protected override void Configure(global::YesSql.IConfiguration options, string connectionString) => options.UseSqlServer(connectionString);
}
[Feature("Persistence:YesSql:MySql")]
[Feature("PersistenceYesSqlMySql")]
public class MySqlStartup : YesSqlStartupBase
{
protected override string ProviderName => "MySql";
protected override void Configure(global::YesSql.IConfiguration options, string connectionString) => options.UseMySql(connectionString);
}
[Feature("Persistence:YesSql:PostgreSql")]
[Feature("PersistenceYesSqlPostgreSql")]
public class PostgreSqlStartup : YesSqlStartupBase
{
protected override string ProviderName => "PostgreSql";
@ -44,7 +44,7 @@ namespace Elsa.Persistence.YesSql
public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration)
{
var section = configuration.GetSection($"Elsa:Features:Persistence:YesSql:{ProviderName}");
var section = configuration.GetSection($"Elsa:Features:PersistenceYesSql{ProviderName}");
var connectionStringName = section.GetValue<string>("ConnectionStringName");
var connectionString = section.GetValue<string>("ConnectionString");

29
src/samples/server/Elsa.Samples.Server.Host/README.md
View file

@ -1,12 +1,12 @@
### Configure persistence for Elsa Core in the appsettings.json
It is required to specify the persistence, it's enabled status and connection string name in Features
In order to specify the persistence it's required to set enabled status and connection string name in Features node
EF Sqlite
```
"Elsa": {
"Features": {
"Persistence:EntityFrameworkCore:Sqlite": {
"PersistenceEntityFrameworkCoreSqlite": {
"Enabled": true,
"ConnectionStringName": "Sqlite"
},
@ -17,7 +17,7 @@ EF MySQL
```
"Elsa": {
"Features": {
"Persistence:EntityFrameworkCore:MySql": {
"PersistenceEntityFrameworkCoreMySql": {
"Enabled": true,
"ConnectionStringName": "MySql"
},
@ -28,7 +28,7 @@ EF SQL Server
```
"Elsa": {
"Features": {
"Persistence:EntityFrameworkCore:SqlServer": {
"PersistenceEntityFrameworkCoreSqlServer": {
"Enabled": true,
"ConnectionStringName": "SqlServer"
},
@ -39,7 +39,7 @@ EF Postgre
```
"Elsa": {
"Features": {
"Persistence:EntityFrameworkCore:PostgreSql": {
"PersistenceEntityFrameworkCorePostgreSql": {
"Enabled": "true",
"ConnectionStringName": "PostgreSql"
},
@ -50,7 +50,7 @@ EF MongoDB
```
"Elsa": {
"Features": {
"Persistence:MongoDb": {
"PersistenceMongoDb": {
"Enabled": true,
"ConnectionStringName": "MongoDb"
},
@ -61,7 +61,7 @@ YesSql Sqlite
```
"Elsa": {
"Features": {
"Persistence:YesSql:Sqlite": {
"PersistenceYesSqlSqlite": {
"Enabled": true,
"ConnectionStringName": "Sqlite"
},
@ -72,7 +72,7 @@ YesSql MySQL
```
"Elsa": {
"Features": {
"Persistence:YesSql:MySql": {
"PersistenceYesSqlMySql": {
"Enabled": true,
"ConnectionStringName": "MySql"
},
@ -83,7 +83,7 @@ YesSql SQL Server
```
"Elsa": {
"Features": {
"Persistence:YesSql:SqlServer": {
"PersistenceYesSqlSqlServer": {
"Enabled": true,
"ConnectionStringName": "SqlServer"
},
@ -94,7 +94,7 @@ YesSql Postgre
```
"Elsa": {
"Features": {
"Persistence:YesSql:PostgreSql": {
"PersistenceYesSqlPostgreSql": {
"Enabled": true,
"ConnectionStringName": "PostgreSql"
},
@ -103,20 +103,19 @@ YesSql Postgre
### Configure modular activity providers such as Webhooks
It is required to add modular activity provider and additional persistence feature for your modular activity provider.
The persistence providers should match for Elsa Core and modular activity providers.
Two examples below are given to set up Elsa Core and Webhooks persistence as follow.
EF Sqlite
```
"Elsa": {
"Features": {
"Persistence:EntityFrameworkCore:Sqlite": {
"PersistenceEntityFrameworkCoreSqlite": {
"Enabled": true,
"ConnectionStringName": "Sqlite"
},
"Webhooks": true
},
"Webhooks:Persistence:EntityFrameworkCore:Sqlite": {
"WebhooksPersistenceEntityFrameworkCoreSqlite": {
"Enabled": true,
"ConnectionStringName": "Sqlite"
}
@ -127,13 +126,13 @@ EF MongoDB
```
"Elsa": {
"Features": {
"Persistence:MongoDb": {
"PersistenceMongoDb": {
"Enabled": true,
"ConnectionStringName": "MongoDb"
},
"Webhooks": true
},
"Webhooks:Persistence:MongoDb": {
"WebhooksPersistenceMongoDb": {
"Enabled": true,
"ConnectionStringName": "MongoDb"
}

10
src/samples/server/Elsa.Samples.Server.Host/appsettings.json
View file

@ -19,21 +19,21 @@
},
"Elsa": {
"Features": {
"Persistence:EntityFrameworkCore:Sqlite": {
"PersistenceEntityFrameworkCoreSqlite": {
"Enabled": true,
"ConnectionStringName": "Sqlite"
},
"Dispatcher:Hangfire": true,
"DispatcherHangfire": true,
"Console": true,
"Http": true,
"Email": true,
"Temporal:Quartz": true,
"JavaScript:Activities": true,
"TemporalQuartz": true,
"JavaScriptActivities": true,
"UserTask": true,
"Conductor": true,
"Telnyx": true,
"Webhooks": true,
"Webhooks:Persistence:EntityFrameworkCore:Sqlite": {
"WebhooksPersistenceEntityFrameworkCoreSqlite": {
"Enabled": true,
"ConnectionStringName": "Sqlite"
}

2
src/scripting/Elsa.Scripting.JavaScript/Startup.cs
View file

@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
namespace Elsa.Scripting.JavaScript
{
[Feature("JavaScript:Activities")]
[Feature("JavaScriptActivities")]
public class Startup : StartupBase
{
public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration)

2
src/server/Elsa.Server.Hangfire/Startup.cs
View file

@ -5,7 +5,7 @@ using Microsoft.Extensions.Configuration;
namespace Elsa.Server.Hangfire
{
[Feature("Dispatcher:Hangfire")]
[Feature("DispatcherHangfire")]
public class Startup : StartupBase
{
public override void ConfigureElsa(ElsaOptionsBuilder elsa, IConfiguration configuration)