Refactoring SetupConsole with DBFactory
This commit is contained in:
parent
8dd01d291d
commit
78d49a9829
20 changed files with 337 additions and 407 deletions
|
|
@ -1,6 +1,3 @@
|
|||
using Microsoft.ApplicationInsights.DataContracts;
|
||||
using System.Text;
|
||||
|
||||
namespace PlanTempus.Core.Logging
|
||||
{
|
||||
public record SeqConfiguration(string IngestionEndpoint, string ApiKey, string Environment);
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ namespace PlanTempus.Core.ModuleRegistry
|
|||
protected override void Load(ContainerBuilder builder)
|
||||
{
|
||||
|
||||
builder.RegisterType<MessageChannel>()
|
||||
.As<IMessageChannel<Microsoft.ApplicationInsights.Channel.ITelemetry>>()
|
||||
.SingleInstance();
|
||||
//builder.RegisterType<MessageChannel>()
|
||||
// .As<IMessageChannel<Microsoft.ApplicationInsights.Channel.ITelemetry>>()
|
||||
// .SingleInstance();
|
||||
|
||||
builder.RegisterType<SeqBackgroundService>()
|
||||
.As<Microsoft.Extensions.Hosting.IHostedService>()
|
||||
|
|
|
|||
|
|
@ -6,29 +6,30 @@ namespace PlanTempus.Core.ModuleRegistry
|
|||
{
|
||||
public class TelemetryModule : Module
|
||||
{
|
||||
public TelemetryConfig TelemetryConfig { get; set; }
|
||||
public required TelemetryConfig TelemetryConfig { get; set; }
|
||||
|
||||
protected override void Load(ContainerBuilder builder)
|
||||
{
|
||||
if (TelemetryConfig == null)
|
||||
throw new Exceptions.ConfigurationException("TelemetryConfig is missing");
|
||||
|
||||
|
||||
var configuration = TelemetryConfiguration.CreateDefault();
|
||||
configuration.ConnectionString = TelemetryConfig.ConnectionString;
|
||||
configuration.TelemetryChannel.DeveloperMode = true;
|
||||
|
||||
if (TelemetryConfig.UseSeqLoggingTelemetryChannel)
|
||||
configuration.TelemetryChannel = new Telemetry.SeqLoggingTelemetryChannel(); ;
|
||||
{
|
||||
var messageChannel = new Telemetry.MessageChannel();
|
||||
|
||||
var r = new Microsoft.ApplicationInsights.Extensibility.Implementation.TelemetryProcessorChainBuilder(configuration);
|
||||
r.Use(next => new Telemetry.Enrichers.EnrichWithMetaTelemetry(next));
|
||||
r.Build();
|
||||
builder.RegisterInstance(messageChannel)
|
||||
.As<Telemetry.IMessageChannel<ITelemetry>>()
|
||||
.SingleInstance();
|
||||
|
||||
//builder.RegisterInstance(configuration);
|
||||
configuration.TelemetryChannel = new Telemetry.SeqLoggingTelemetryChannel(messageChannel);
|
||||
}
|
||||
|
||||
var telemetryProcessorChain = new Microsoft.ApplicationInsights.Extensibility.Implementation.TelemetryProcessorChainBuilder(configuration);
|
||||
telemetryProcessorChain.Use(next => new Telemetry.Enrichers.EnrichWithMetaTelemetry(next));
|
||||
telemetryProcessorChain.Build();
|
||||
|
||||
//builder.RegisterType<Microsoft.ApplicationInsights.TelemetryClient>()
|
||||
// .InstancePerLifetimeScope();
|
||||
|
||||
var client = new Microsoft.ApplicationInsights.TelemetryClient(configuration);
|
||||
client.Context.GlobalProperties["Application"] = GetType().Namespace.Split('.')[0];
|
||||
|
|
|
|||
|
|
@ -1,50 +1,27 @@
|
|||
using Microsoft.ApplicationInsights.Channel;
|
||||
using System.Net.Http.Headers;
|
||||
|
||||
namespace PlanTempus.Core.Telemetry
|
||||
{
|
||||
public class SeqLoggingTelemetryChannel : InMemoryChannel, ITelemetryChannel
|
||||
{
|
||||
public ITelemetryChannel _defaultChannel;
|
||||
static HttpClient _client = new HttpClient();
|
||||
private readonly IMessageChannel<ITelemetry> _messageChannel;
|
||||
|
||||
static SeqLoggingTelemetryChannel()
|
||||
{
|
||||
_client = new HttpClient()
|
||||
{
|
||||
BaseAddress = new Uri("http://localhost:5341"),
|
||||
Timeout = TimeSpan.FromSeconds(30)
|
||||
};
|
||||
|
||||
_client.DefaultRequestHeaders.Accept.Clear();
|
||||
_client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
|
||||
}
|
||||
|
||||
|
||||
public SeqLoggingTelemetryChannel()
|
||||
public SeqLoggingTelemetryChannel(IMessageChannel<ITelemetry> messageChannel)
|
||||
{
|
||||
_messageChannel = messageChannel;
|
||||
}
|
||||
public new void Send(ITelemetry telemetry)
|
||||
{
|
||||
//var l = new SeqLogger(_client, "", "");
|
||||
|
||||
//l.LogToSeq(
|
||||
// "Bruger {UserId} loggede ind",
|
||||
// "Debug",
|
||||
// new Dictionary<string, object> { { "UserId", "12345" }, { "Counter", "i++" } }
|
||||
// );
|
||||
|
||||
|
||||
//if (telemetry is Microsoft.ApplicationInsights.DataContracts.TraceTelemetry trace)
|
||||
//{
|
||||
// var severity = trace.SeverityLevel;
|
||||
// Console.WriteLine($"Trace severity: {severity}, Message: {trace.Message}");
|
||||
//}
|
||||
|
||||
var writeTask = _messageChannel.Writer.WriteAsync(telemetry).AsTask();
|
||||
writeTask.ContinueWith(t =>
|
||||
{
|
||||
if (t.Exception != null)
|
||||
{
|
||||
throw t.Exception;
|
||||
}
|
||||
}, TaskContinuationOptions.OnlyOnFaulted);
|
||||
|
||||
base.Send(telemetry);
|
||||
var logEntry = $"{DateTime.UtcNow:u}|{telemetry.Context.Operation.Name}|{telemetry.Context.Operation.Id}";
|
||||
//File.AppendAllText(_filePath, logEntry + Environment.NewLine);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@ public class SetupConfiguration : IDbConfigure<SetupConfiguration.Command>
|
|||
{
|
||||
_connectionFactory = connectionFactory;
|
||||
}
|
||||
public void With(Command notInUse)
|
||||
public void With(Command notInUse, ConnectionStringParameters parameters = null)
|
||||
{
|
||||
using var conn = _connectionFactory.Create();
|
||||
using var conn = parameters is null ? _connectionFactory.Create() : _connectionFactory.Create(parameters);
|
||||
using var transaction = conn.OpenWithTransaction();
|
||||
try
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
namespace PlanTempus.Database.Core.ConnectionFactory
|
||||
{
|
||||
public record ConnectionStringParameters(string user, string pwd);
|
||||
|
||||
public interface IDbConnectionFactory
|
||||
{
|
||||
System.Data.IDbConnection Create();
|
||||
System.Data.IDbConnection Create(string username, string password);
|
||||
System.Data.IDbConnection Create(ConnectionStringParameters connectionStringTemplateParameters);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@ namespace PlanTempus.Database.Core.ConnectionFactory
|
|||
return _baseDataSource.CreateConnection();
|
||||
}
|
||||
|
||||
public IDbConnection Create(string username, string password)
|
||||
public IDbConnection Create(ConnectionStringParameters param)
|
||||
{
|
||||
var connectionStringBuilder = new NpgsqlConnectionStringBuilder(
|
||||
_baseDataSource.ConnectionString)
|
||||
{
|
||||
Username = username,
|
||||
Password = password
|
||||
Username = param.user,
|
||||
Password = param.pwd
|
||||
};
|
||||
|
||||
var tempDataSourceBuilder = new NpgsqlDataSourceBuilder(
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ using PlanTempus.Database.Core.ConnectionFactory;
|
|||
|
||||
namespace PlanTempus.Database.Core.DCL
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Only a superadmin or similar can create Application Users
|
||||
/// </summary>
|
||||
|
|
@ -18,7 +17,6 @@ namespace PlanTempus.Database.Core.DCL
|
|||
public required string Password { get; init; }
|
||||
}
|
||||
|
||||
|
||||
Command _command;
|
||||
private readonly IDbConnectionFactory _connectionFactory;
|
||||
|
||||
|
|
@ -27,14 +25,14 @@ namespace PlanTempus.Database.Core.DCL
|
|||
_connectionFactory = connectionFactory;
|
||||
}
|
||||
|
||||
public void With(Command command)
|
||||
public void With(Command command, ConnectionStringParameters parameters = null)
|
||||
{
|
||||
_command = command;
|
||||
|
||||
if (!Validations.IsValidSchemaName(_command.Schema))
|
||||
throw new ArgumentException("Invalid schema name", _command.Schema);
|
||||
|
||||
using var conn = _connectionFactory.Create();
|
||||
using var conn = parameters is null ? _connectionFactory.Create() : _connectionFactory.Create(parameters);
|
||||
using var transaction = conn.OpenWithTransaction();
|
||||
try
|
||||
{
|
||||
|
|
@ -49,7 +47,6 @@ namespace PlanTempus.Database.Core.DCL
|
|||
transaction.Rollback();
|
||||
throw new InvalidOperationException("Failed to SetupApplicationUser in Database", ex);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void CreateSchema(IDbConnection db)
|
||||
|
|
|
|||
|
|
@ -29,14 +29,14 @@ namespace PlanTempus.Database.Core.DCL
|
|||
}
|
||||
|
||||
|
||||
public void With(Command command)
|
||||
public void With(Command command, ConnectionStringParameters parameters = null)
|
||||
{
|
||||
_command = command;
|
||||
|
||||
if (!Validations.IsValidSchemaName(_command.Schema))
|
||||
throw new ArgumentException("Invalid schema name", _command.Schema);
|
||||
|
||||
using var conn = _connectionFactory.Create();
|
||||
using var conn = parameters is null ? _connectionFactory.Create() : _connectionFactory.Create(parameters);
|
||||
using var transaction = conn.OpenWithTransaction();
|
||||
try
|
||||
{
|
||||
|
|
@ -83,8 +83,7 @@ namespace PlanTempus.Database.Core.DCL
|
|||
{
|
||||
// Grant USAGE og alle CREATE rettigheder på schema niveau
|
||||
//GRANT USAGE ON SCHEMA {_command.Schema} TO {_command.User};
|
||||
var sql = $@"
|
||||
GRANT CREATE ON SCHEMA {_command.Schema} TO {_command.User};";
|
||||
var sql = $@"GRANT CREATE ON SCHEMA {_command.Schema} TO {_command.User};";
|
||||
|
||||
db.ExecuteSql(sql);
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using Insight.Database;
|
||||
using PlanTempus.Database.Common;
|
||||
using PlanTempus.Database.Core;
|
||||
using PlanTempus.Database.Core.ConnectionFactory;
|
||||
|
||||
namespace PlanTempus.Database.Core.DCL
|
||||
{
|
||||
|
|
@ -14,30 +15,29 @@ namespace PlanTempus.Database.Core.DCL
|
|||
public required string Password { get; init; }
|
||||
}
|
||||
|
||||
IDbConnection _db;
|
||||
Command _command;
|
||||
private readonly IDbConnectionFactory _connectionFactory;
|
||||
|
||||
public SetupOrganization(IDbConnection db)
|
||||
|
||||
public SetupOrganization(IDbConnectionFactory connectionFactory)
|
||||
{
|
||||
_db = db;
|
||||
_connectionFactory = connectionFactory;
|
||||
}
|
||||
|
||||
public void With(Command command)
|
||||
public void With(Command command, ConnectionStringParameters parameters = null)
|
||||
{
|
||||
|
||||
_command = command;
|
||||
|
||||
|
||||
if (!Validations.IsValidSchemaName(_command.Schema))
|
||||
throw new ArgumentException("Invalid schema name", _command.Schema);
|
||||
|
||||
using (var transaction = _db.BeginTransaction())
|
||||
{
|
||||
using var conn = parameters is null ? _connectionFactory.Create() : _connectionFactory.Create(parameters);
|
||||
using var transaction = conn.OpenWithTransaction();
|
||||
try
|
||||
{
|
||||
CreateSchema();
|
||||
CreateRole();
|
||||
GrantSchemaRights();
|
||||
CreateSchema(conn);
|
||||
CreateRole(conn);
|
||||
GrantSchemaRights(conn);
|
||||
|
||||
transaction.Commit();
|
||||
}
|
||||
|
|
@ -46,49 +46,44 @@ namespace PlanTempus.Database.Core.DCL
|
|||
transaction.Rollback();
|
||||
throw new InvalidOperationException("Failed to SetupOrganization in Database", ex);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
private void ExecuteSql(string sql)
|
||||
{
|
||||
_db.ExecuteSql(sql);
|
||||
}
|
||||
|
||||
private void CreateSchema()
|
||||
private void CreateSchema(IDbConnection db)
|
||||
{
|
||||
var sql = $"CREATE SCHEMA IF NOT EXISTS {_command.Schema}";
|
||||
ExecuteSql(sql);
|
||||
db.ExecuteSql(sql);
|
||||
}
|
||||
|
||||
private void CreateRole()
|
||||
private void CreateRole(IDbConnection db)
|
||||
{
|
||||
var sql = $"CREATE ROLE {_command.User} LOGIN PASSWORD '{_command.Password}';";
|
||||
ExecuteSql(sql);
|
||||
db.ExecuteSql(sql);
|
||||
|
||||
var sql1 = $"ALTER ROLE {_command.User} SET search_path='{_command.Schema}';";
|
||||
ExecuteSql(sql1);
|
||||
db.ExecuteSql(sql1);
|
||||
|
||||
}
|
||||
|
||||
private void GrantSchemaRights()
|
||||
private void GrantSchemaRights(IDbConnection db)
|
||||
{
|
||||
var sql = $"GRANT USAGE ON SCHEMA {_command.Schema} TO {_command.User};";
|
||||
ExecuteSql(sql);
|
||||
db.ExecuteSql(sql);
|
||||
|
||||
var sql1 = $"ALTER DEFAULT PRIVILEGES IN SCHEMA {_command.Schema} " +
|
||||
$"GRANT INSERT, SELECT, UPDATE PRIVILEGES ON TABLES TO {_command.User};";
|
||||
ExecuteSql(sql1);
|
||||
db.ExecuteSql(sql1);
|
||||
|
||||
var sql2 = $"GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA {_command.Schema} TO {_command.User};";
|
||||
ExecuteSql(sql2);
|
||||
db.ExecuteSql(sql2);
|
||||
|
||||
var sql3 = $"GRANT CREATE TABLE ON SCHEMA {_command.Schema} TO {_command.User};";
|
||||
ExecuteSql(sql3);
|
||||
db.ExecuteSql(sql3);
|
||||
}
|
||||
public void RevokeCreateTable()
|
||||
public void RevokeCreateTable(IDbConnection db)
|
||||
{
|
||||
var sql = $"REVOKE CREATE TABLE ON SCHEMA {_command.Schema} FROM {_command.User};";
|
||||
ExecuteSql(sql);
|
||||
db.ExecuteSql(sql);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ namespace PlanTempus.Database.Core.DDL
|
|||
/// Creates the system tables in the specified schema within a transaction.
|
||||
/// </summary>
|
||||
/// <param name="schema">The schema name where the tables will be created.</param>
|
||||
public void With(Command command)
|
||||
public void With(Command command, ConnectionStringParameters parameters = null)
|
||||
{
|
||||
_command = command;
|
||||
|
||||
using var conn = _connectionFactory.Create();
|
||||
using var conn = parameters is null ? _connectionFactory.Create() : _connectionFactory.Create(parameters);
|
||||
using var transaction = conn.OpenWithTransaction();
|
||||
try
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
{
|
||||
public interface IDbConfigure<T>
|
||||
{
|
||||
void With(T command);
|
||||
void With(T command, ConnectionFactory.ConnectionStringParameters parameters = null);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@ using System.Data;
|
|||
|
||||
namespace PlanTempus.Database.Core.Sql
|
||||
{
|
||||
|
||||
|
||||
public class DatabaseScope : IDisposable
|
||||
{
|
||||
private readonly IDbConnection _connection;
|
||||
|
|
@ -99,6 +97,4 @@ namespace PlanTempus.Database.Core.Sql
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,42 +12,14 @@ namespace PlanTempus.Database.ModuleRegistry
|
|||
{
|
||||
Insight.Database.Providers.PostgreSQL.PostgreSQLInsightDbProvider.RegisterProvider();
|
||||
|
||||
builder.Register<Core.ConnectionFactory.IDbConnectionFactory>(c =>
|
||||
new Core.ConnectionFactory.PostgresConnectionFactory(ConnectionString))
|
||||
builder.RegisterType<Core.ConnectionFactory.PostgresConnectionFactory>()
|
||||
.As<Core.ConnectionFactory.IDbConnectionFactory>()
|
||||
.WithParameter(new TypedParameter(typeof(string), ConnectionString))
|
||||
.SingleInstance();
|
||||
|
||||
builder.RegisterType<Core.Sql.SqlOperations>()
|
||||
.As<Core.Sql.IDatabaseOperations>();
|
||||
}
|
||||
}
|
||||
public class PostgresConnectionFactory1 //: IDbConnectionFactory
|
||||
{
|
||||
private readonly string _baseConnectionString;
|
||||
|
||||
public PostgresConnectionFactory1(string connectionString)
|
||||
{
|
||||
_baseConnectionString = connectionString;
|
||||
}
|
||||
|
||||
public IDbConnection Create()
|
||||
{
|
||||
return new NpgsqlConnection(_baseConnectionString);
|
||||
}
|
||||
|
||||
public IDbConnection Create(string username, string password)
|
||||
{
|
||||
var builder = new NpgsqlConnectionStringBuilder(_baseConnectionString)
|
||||
{
|
||||
Username = username,
|
||||
Password = password
|
||||
};
|
||||
|
||||
return new NpgsqlConnection(builder.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
|
|||
using Microsoft.Extensions.Hosting;
|
||||
using Npgsql;
|
||||
using PlanTempus.Database.ConfigurationManagementSystem;
|
||||
using PlanTempus.Database.Core.ConnectionFactory;
|
||||
using PlanTempus.Database.Core.DCL;
|
||||
using PlanTempus.Database.Core.DDL;
|
||||
using System.Data;
|
||||
|
|
@ -61,28 +62,27 @@ namespace PlanTempus.SetupInfrastructure
|
|||
|
||||
static ConsoleColor _backgroundColor = Console.BackgroundColor;
|
||||
static ConsoleColor _foregroundColor = Console.ForegroundColor;
|
||||
|
||||
private readonly IDbConnectionFactory _connectionFactory;
|
||||
private readonly SetupDbAdmin _setupDbAdmin;
|
||||
private readonly SetupIdentitySystem _setupIdentitySystem;
|
||||
private readonly SetupConfiguration _setupConfiguration;
|
||||
private readonly SetupApplicationUser _setupApplicationUser;
|
||||
|
||||
public ConsoleService(SetupDbAdmin setupDbAdmin, SetupIdentitySystem setupIdentitySystem, SetupConfiguration setupConfiguration, SetupApplicationUser setupApplicationUser)
|
||||
public ConsoleService(IDbConnectionFactory connectionFactory, SetupDbAdmin setupDbAdmin, SetupIdentitySystem setupIdentitySystem, SetupConfiguration setupConfiguration, SetupApplicationUser setupApplicationUser)
|
||||
{
|
||||
_connectionFactory = connectionFactory;
|
||||
_setupDbAdmin = setupDbAdmin;
|
||||
_setupIdentitySystem = setupIdentitySystem;
|
||||
_setupConfiguration = setupConfiguration;
|
||||
_setupApplicationUser = setupApplicationUser;
|
||||
}
|
||||
static bool IsSuperAdmin()
|
||||
bool IsSuperAdmin(ConnectionStringParameters parameters)
|
||||
{
|
||||
//test db access
|
||||
Console.WriteLine("Testing db access...");
|
||||
|
||||
string query = @"SELECT usename, usesuper FROM pg_user WHERE usename = CURRENT_USER;";
|
||||
|
||||
var conn = new NpgsqlConnection();
|
||||
|
||||
using var conn = _connectionFactory.Create(parameters);
|
||||
var result = (dynamic)conn.QuerySql(query).Single();
|
||||
|
||||
string username = result.usename;
|
||||
|
|
@ -91,12 +91,12 @@ namespace PlanTempus.SetupInfrastructure
|
|||
if ((bool)result.usesuper)
|
||||
{
|
||||
Console.ForegroundColor = ConsoleColor.Green;
|
||||
Console.WriteLine();
|
||||
Console.BackgroundColor = ConsoleColor.Yellow;
|
||||
Console.WriteLine();
|
||||
Console.WriteLine("TEST SUCCESSFULLY");
|
||||
Console.WriteLine();
|
||||
Console.ForegroundColor = ConsoleColor.White;
|
||||
Console.BackgroundColor = _backgroundColor;
|
||||
Console.BackgroundColor = ConsoleColor.Black;
|
||||
Console.WriteLine();
|
||||
Console.WriteLine("-------------------------------");
|
||||
Console.WriteLine();
|
||||
Console.WriteLine($"Username: {username}");
|
||||
|
|
@ -118,7 +118,7 @@ namespace PlanTempus.SetupInfrastructure
|
|||
Console.WriteLine("TEST WAS NOT SUCCESSFULLY");
|
||||
Console.WriteLine();
|
||||
Console.ForegroundColor = ConsoleColor.White;
|
||||
Console.BackgroundColor = _backgroundColor;
|
||||
Console.BackgroundColor = ConsoleColor.Black;
|
||||
Console.WriteLine("-------------------------------");
|
||||
Console.WriteLine();
|
||||
Console.WriteLine($"Username: {username}");
|
||||
|
|
@ -169,13 +169,12 @@ namespace PlanTempus.SetupInfrastructure
|
|||
string.IsNullOrEmpty(userPass.Split(":")[0]) ||
|
||||
string.IsNullOrEmpty(userPass.Split(":")[1]));
|
||||
|
||||
//var ctp = new Startup.ConnectionStringTemplateParameters(
|
||||
// user: userPass.Split(":")[0],
|
||||
// pwd: userPass.Split(":")[1]
|
||||
//);
|
||||
//_container = new Startup().ConfigureContainer(ctp);
|
||||
var superUser = new ConnectionStringParameters(
|
||||
user: userPass.Split(":")[0],
|
||||
pwd: userPass.Split(":")[1]
|
||||
);
|
||||
|
||||
if (IsSuperAdmin())
|
||||
if (IsSuperAdmin(superUser))
|
||||
{
|
||||
Console.ForegroundColor = ConsoleColor.Green;
|
||||
var sw = new Stopwatch();
|
||||
|
|
@ -183,26 +182,25 @@ namespace PlanTempus.SetupInfrastructure
|
|||
Console.Write("Database.Core.DCL.SetupDbAdmin...");
|
||||
sw.Start();
|
||||
|
||||
_setupDbAdmin.With(new SetupDbAdmin.Command { Password = "3911", Schema = "system", User = "heimdall" });
|
||||
_setupDbAdmin.With(new SetupDbAdmin.Command { Password = "3911", Schema = "system", User = "heimdall" }, superUser);
|
||||
Console.WriteLine($"DONE, took: {sw.ElapsedMilliseconds} ms");
|
||||
|
||||
|
||||
Console.WriteLine("::");
|
||||
Console.WriteLine("::");
|
||||
Console.Write("Database.Core.DDL.SetupIdentitySystem...");
|
||||
sw.Restart();
|
||||
|
||||
//create new container with application user, we use that role from now.
|
||||
//_container = new Startup().ConfigureContainer(new Startup.ConnectionStringTemplateParameters("heimdall", "3911"));
|
||||
//use application user, we use that role from now.
|
||||
var connParams = new ConnectionStringParameters(user: "heimdall", pwd: "3911");
|
||||
|
||||
_setupIdentitySystem.With(new SetupIdentitySystem.Command { Schema = "system" });
|
||||
_setupIdentitySystem.With(new SetupIdentitySystem.Command { Schema = "system" }, connParams);
|
||||
Console.WriteLine($"DONE, took: {sw.ElapsedMilliseconds} ms");
|
||||
|
||||
Console.WriteLine("::");
|
||||
Console.WriteLine("::");
|
||||
Console.Write("Database.ConfigurationManagementSystem.SetupConfiguration...");
|
||||
sw.Restart();
|
||||
_setupConfiguration.With(new SetupConfiguration.Command());
|
||||
_setupConfiguration.With(new SetupConfiguration.Command(), connParams);
|
||||
Console.Write($"DONE, took: {sw.ElapsedMilliseconds} ms");
|
||||
|
||||
|
||||
|
|
@ -211,7 +209,7 @@ namespace PlanTempus.SetupInfrastructure
|
|||
Console.Write("Database.Core.DCL.SetupApplicationUser...");
|
||||
sw.Start();
|
||||
|
||||
_setupApplicationUser.With(new SetupApplicationUser.Command { Password = "3911", Schema = "system", User = "sathumper" });
|
||||
_setupApplicationUser.With(new SetupApplicationUser.Command { Password = "3911", Schema = "system", User = "sathumper" }, superUser);
|
||||
Console.WriteLine($"DONE, took: {sw.ElapsedMilliseconds} ms");
|
||||
|
||||
|
||||
|
|
@ -227,6 +225,7 @@ namespace PlanTempus.SetupInfrastructure
|
|||
catch (Exception e)
|
||||
{
|
||||
Console.ForegroundColor = ConsoleColor.Red;
|
||||
Console.WriteLine();
|
||||
Console.WriteLine(e);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ namespace PlanTempus.SetupInfrastructure
|
|||
{
|
||||
public class Startup
|
||||
{
|
||||
|
||||
public virtual IConfigurationRoot Configuration()
|
||||
{
|
||||
var configuration = new ConfigurationBuilder()
|
||||
|
|
@ -21,10 +20,8 @@ namespace PlanTempus.SetupInfrastructure
|
|||
public void ConfigureContainer(ContainerBuilder builder)
|
||||
{
|
||||
|
||||
//var builder = new ContainerBuilder();
|
||||
var configuration = Configuration();
|
||||
|
||||
|
||||
builder.RegisterModule(new Database.ModuleRegistry.DbPostgreSqlModule
|
||||
{
|
||||
ConnectionString = configuration.GetConnectionString("DefaultConnection")
|
||||
|
|
@ -47,9 +44,6 @@ namespace PlanTempus.SetupInfrastructure
|
|||
|
||||
builder.RegisterType<ConsoleService>();
|
||||
|
||||
|
||||
//return builder.Build();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"ConnectionStrings": {
|
||||
"DefaultConnection": "Host=192.168.1.57;Port=5432;Database=ptmain;User Id={usr};Password={pwd};"
|
||||
"DefaultConnection": "Host=192.168.1.57;Port=5432;Database=ptmain;"
|
||||
},
|
||||
"ApplicationInsights": {
|
||||
"ConnectionString": "InstrumentationKey=07d2a2b9-5e8e-4924-836e-264f8438f6c5;IngestionEndpoint=https://northeurope-2.in.applicationinsights.azure.com/;LiveEndpoint=https://northeurope.livediagnostics.monitor.azure.com/;ApplicationId=56748c39-2fa3-4880-a1e2-24068e791548",
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"resources":{"Scripts/Script-1.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44","default-catalog":"ptmain"},"Scripts/Script.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44"},"Scripts/SmartConfigSystem.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44","default-catalog":"ptdb01"},"Scripts/grant-privileges.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44","default-catalog":"ptmain"}}}
|
||||
{"resources":{"Scripts/Script-1.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44","default-catalog":"ptmain"},"Scripts/Script.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44","default-catalog":"ptmain"},"Scripts/SmartConfigSystem.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44","default-catalog":"ptdb01"},"Scripts/grant-privileges.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44","default-catalog":"ptmain"}}}
|
||||
|
|
@ -36,5 +36,6 @@ SHOW search_path;
|
|||
create table system.foos(id int)
|
||||
|
||||
select * from system.foo
|
||||
select * from "system".organizations
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ namespace PlanTempus.Tests.ConfigurationTests
|
|||
}
|
||||
}
|
||||
|
||||
public class Feature
|
||||
internal class Feature
|
||||
{
|
||||
public bool Enabled { get; set; }
|
||||
public int RolloutPercentage { get; set; }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue