simona/dotnet-template
Template
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing connection strings - wip

Browse Source
This commit is contained in:
Caterina Simona Pastore
2024-11-29 22:23:40 +01:00
parent 998a4d5ab9
commit 0ab8d7f7d1
5 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -44,6 +44,8 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
SQLSERVER_DB_SERVER: ${{ secrets.SQLSERVER_DB_SERVER }}
MONGO_DB_SERVER: ${{ secrets.MONGO_DB_SERVER }}
shell: powershell shell: powershell
run: | run: |
.\.sonar\scanner\dotnet-sonarscanner begin /k:"csimonapastore_BasicDotnetTemplate" /o:"csimonapastore-github" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml .\.sonar\scanner\dotnet-sonarscanner begin /k:"csimonapastore_BasicDotnetTemplate" /o:"csimonapastore-github" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml

2
MainProject/Models/Settings/DatabaseSettings.cs
View File

@@ -4,6 +4,6 @@ public class DatabaseSettings
{ {
#nullable enable #nullable enable
public string? SqlServerConnectionString { get; set; } public string? SqlServerConnectionString { get; set; }
public MongoDbSettings? MongoDbSettings { get; set; } public string? MongoDbConnectionString { get; set; }
#nullable disable #nullable disable
} }

9
MainProject/Models/Settings/MongoDbSettings.cs
View File

@@ -1,9 +0,0 @@
namespace BasicDotnetTemplate.MainProject.Models.Settings;
public class MongoDbSettings
{
#nullable enable
public string? MongoDbConnectionString { get; set; }
public string? DatabaseName { get; set; }
#nullable disable
}

14
MainProject/Utils/ProgramUtils.cs
View File

@@ -137,9 +137,6 @@ public static class ProgramUtils
if (!String.IsNullOrEmpty(connectionString)) if (!String.IsNullOrEmpty(connectionString))
{ {
connectionString = connectionString.Replace("SQLSERVER_DB_SERVER", Environment.GetEnvironmentVariable("SQLSERVER_DB_SERVER")); connectionString = connectionString.Replace("SQLSERVER_DB_SERVER", Environment.GetEnvironmentVariable("SQLSERVER_DB_SERVER"));
connectionString = connectionString.Replace("SQLSERVER_DB_DATABASE", Environment.GetEnvironmentVariable("SQLSERVER_DB_DATABASE"));
connectionString = connectionString.Replace("SQLSERVER_DB_USER", Environment.GetEnvironmentVariable("SQLSERVER_DB_USER"));
connectionString = connectionString.Replace("SQLSERVER_DB_PASSWORD", Environment.GetEnvironmentVariable("SQLSERVER_DB_PASSWORD"));
builder.Services.AddDbContext<SqlServerContext>(options => builder.Services.AddDbContext<SqlServerContext>(options =>
options.UseSqlServer(connectionString)); options.UseSqlServer(connectionString));
@@ -147,20 +144,15 @@ public static class ProgramUtils
databaseAdded += "SqlServer"; databaseAdded += "SqlServer";
} }
connectionString = appSettings?.DatabaseSettings?.MongoDbConnectionString ?? String.Empty;
connectionString = appSettings?.DatabaseSettings?.MongoDbSettings?.MongoDbConnectionString ?? String.Empty;
if (!String.IsNullOrEmpty(connectionString)) if (!String.IsNullOrEmpty(connectionString))
{ {
connectionString = connectionString.Replace("MONGODB_DB_SERVER", Environment.GetEnvironmentVariable("MONGODB_DB_SERVER")); connectionString = connectionString.Replace("MONGO_DB_SERVER", Environment.GetEnvironmentVariable("MONGODB_DB_SERVER"));
connectionString = connectionString.Replace("MONGODB_DB_DATABASE", Environment.GetEnvironmentVariable("MONGODB_DB_DATABASE"));
connectionString = connectionString.Replace("MONGODB_DB_USER", Environment.GetEnvironmentVariable("MONGODB_DB_USER"));
connectionString = connectionString.Replace("MONGODB_DB_PASSWORD", Environment.GetEnvironmentVariable("MONGODB_DB_PASSWORD"));
var mongoClient = new MongoClient(connectionString); var mongoClient = new MongoClient(connectionString);
var databaseName = appSettings?.DatabaseSettings?.MongoDbSettings?.DatabaseName ?? Environment.GetEnvironmentVariable("MONGODB_DB_DATABASE") ?? String.Empty; var databaseName = connectionString.Split("/").LastOrDefault();
if (!String.IsNullOrEmpty(databaseName)) if (!String.IsNullOrEmpty(databaseName))
{ {

7
MainProject/appsettings.json
View File

@@ -7,11 +7,8 @@
"Description": "This template contains basic configuration for a .Net 8 backend" "Description": "This template contains basic configuration for a .Net 8 backend"
}, },
"DatabaseSettings": { "DatabaseSettings": {
"SqlServerConnectionString": "Server=SQLSERVER_DB_SERVER;Initial Catalog=SQLSERVER_DB_DATABASE;User Id=SQLSERVER_DB_USER;Password=SQLSERVER_DB_PASSWORD;MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;", "SqlServerConnectionString": "SQLSERVER_DB_SERVER",
"MongoDbSettings": { "MongoDbConnectionString": "MONGO_DB_SERVER"
"MongoDbConnectionString": "mongodb://MONGODB_DB_USER:MONGODB_DB_PASSWORD@MONGODB_DB_SERVER:27017/MONGODB_DB_DATABASE",
"DatabaseName": "BaseDb"
}
}, },
"OpenApiSettings": { "OpenApiSettings": {
"TermsOfServiceUrl": "", "TermsOfServiceUrl": "",