From 1889f4ad37f03e00a0868a886f7035e30b8d6db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Thu, 5 Aug 2021 10:36:44 +0300
Subject: [PATCH] refactored appsettings for dbmigrator

---
 .../eventhub/charts/dbmigrator/templates/migrator.yaml   | 9 +++++++++
 etc/k8s/helm-chart/eventhub/values.yaml                  | 5 +++++
 .../EventHubAdminHttpApiHostModule.cs                    | 1 -
 src/EventHub.DbMigrator/EventHub.DbMigrator.csproj       | 4 ----
 src/EventHub.DbMigrator/appsettings.Development.json     | 5 -----
 src/EventHub.DbMigrator/appsettings.json                 | 8 ++++----
 6 files changed, 18 insertions(+), 14 deletions(-)
 delete mode 100644 src/EventHub.DbMigrator/appsettings.Development.json

diff --git a/etc/k8s/helm-chart/eventhub/charts/dbmigrator/templates/migrator.yaml b/etc/k8s/helm-chart/eventhub/charts/dbmigrator/templates/migrator.yaml
index ec3de59..02df487 100644
--- a/etc/k8s/helm-chart/eventhub/charts/dbmigrator/templates/migrator.yaml
+++ b/etc/k8s/helm-chart/eventhub/charts/dbmigrator/templates/migrator.yaml
@@ -10,5 +10,14 @@ spec:
       - name: {{ .Release.Name }}-{{ .Chart.Name }}
         image: {{ .Values.containerImage }}
         imagePullPolicy: Never
+        env:
+        - name: "ConnectionStrings__Default"
+          value: "Host=eh-st-postgresql;Port=5435;Database=EventHub;Username=root;Password=root"
+        - name: "IdentityServer__Clients__EventHub_Web__RootUrl"
+          value: {{ .Values.global.wwwUrlFull }}
+        - name: "IdentityServer__Clients__EventHub_Blazor__RootUrl"
+          value: {{ .Values.global.adminUrlFull }}
+        - name: "IdentityServer__Clients__EventHub_Swagger__RootUrl"
+          value: {{ .Values.global.apiUrlFull }}
       restartPolicy: Never
   backoffLimit: 4
\ No newline at end of file
diff --git a/etc/k8s/helm-chart/eventhub/values.yaml b/etc/k8s/helm-chart/eventhub/values.yaml
index 27e5bd5..b70f1b5 100644
--- a/etc/k8s/helm-chart/eventhub/values.yaml
+++ b/etc/k8s/helm-chart/eventhub/values.yaml
@@ -1,6 +1,11 @@
 global:
   accountUrl: eh-st-account
+  accountUrlFull: https://eh-st-account
   apiUrl: eh-st-api
+  apiUrlFull: https://eh-st-api
   wwwUrl: eh-st-www
+  wwwUrlFull: "https://eh-st-www"
+  adminUrl: eh-st-admin
+  adminUrlFull: https://eh-st-admin
   nginxProxyBufferSize: "32k"
   nginxProxyBuffersNumber: "8"
\ No newline at end of file
diff --git a/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs b/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs
index 81a76bc..38ff481 100644
--- a/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs
+++ b/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs
@@ -15,7 +15,6 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.OpenApi.Models;
 using StackExchange.Redis;
 using Volo.Abp;
-using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
diff --git a/src/EventHub.DbMigrator/EventHub.DbMigrator.csproj b/src/EventHub.DbMigrator/EventHub.DbMigrator.csproj
index ed41ba6..69154bc 100644
--- a/src/EventHub.DbMigrator/EventHub.DbMigrator.csproj
+++ b/src/EventHub.DbMigrator/EventHub.DbMigrator.csproj
@@ -12,10 +12,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="appsettings.Development.json">
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="appsettings.json">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/src/EventHub.DbMigrator/appsettings.Development.json b/src/EventHub.DbMigrator/appsettings.Development.json
deleted file mode 100644
index 4ba93e6..0000000
--- a/src/EventHub.DbMigrator/appsettings.Development.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ConnectionStrings": {
-    "Default": "Host=localhost;Database=EventHub;Username=root;Password=root;Port=5432"
-  }
-}
diff --git a/src/EventHub.DbMigrator/appsettings.json b/src/EventHub.DbMigrator/appsettings.json
index c8f7067..26356c1 100644
--- a/src/EventHub.DbMigrator/appsettings.json
+++ b/src/EventHub.DbMigrator/appsettings.json
@@ -1,22 +1,22 @@
 {
   "ConnectionStrings": {
-    "Default": "Host=eh-st-postgresql;Port=5435;Database=EventHub;Username=root;Password=root"
+    "Default": "Host=localhost;Database=EventHub;Username=root;Password=root;Port=5432"    
   },
   "IdentityServer": {
     "Clients": {
       "EventHub_Web": {
         "ClientId": "EventHub_Web",
         "ClientSecret": "1q2w3e*",
-        "RootUrl": "https://eh-st-www"
+        "RootUrl": "https://localhost:44308"
       },
       "EventHub_Blazor": {
         "ClientId": "EventHub_Blazor",
-        "RootUrl": "https://eh-st-admin"
+        "RootUrl": "https://localhost:44307"
       },
       "EventHub_Swagger": {
         "ClientId": "EventHub_Swagger",
         "ClientSecret": "1q2w3e*",
-        "RootUrl": "https://eh-st-api"
+        "RootUrl": "https://localhost:44362"
       }
     }
   }