simplify the config

thangchung · thangchung · commit 587bfa7a78ef · 2018-10-29T16:35:24.000+07:00
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.1.401"
+    "version": "2.1.403"
   }
 }
diff --git a/samples/Notifier/appsettings.json b/samples/Notifier/appsettings.json
@@ -1,6 +1,6 @@
 {
-  "EventBus": {
-    "Brokers": "kafka-server:9092"
+  "Kafka": {
+    "FQDN": "kafka-server:9092"
   },
   "Logging": {
     "LogLevel": {
diff --git a/samples/SignalRNotifier/Dockerfile b/samples/SignalRNotifier/Dockerfile
@@ -1,10 +1,10 @@
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime-alpine AS base
+FROM microsoft/dotnet:2.1.5-aspnetcore-runtime-alpine AS base
 WORKDIR /app
 
 ENV ASPNETCORE_URLS http://+:5002
 EXPOSE 5002
 
-FROM microsoft/dotnet:2.1.401-sdk-alpine AS build
+FROM microsoft/dotnet:2.1.403-sdk-alpine AS build
 WORKDIR .
 COPY . .
 
diff --git a/samples/SignalRNotifier/Startup.cs b/samples/SignalRNotifier/Startup.cs
@@ -81,10 +81,10 @@ private static IServiceProvider BuildServiceProvider(IServiceCollection services
       var resolver = services.BuildServiceProvider();
       var config = resolver.GetRequiredService<IConfiguration>();
       var env = resolver.GetRequiredService<IHostingEnvironment>();
-      var kafkaOptions = config.GetSection("EventBus");
+      var kafkaOptions = config.GetSection("Kafka");
       //if (env.IsDevelopment())
       {
-        services.Configure<KafkaOptions>(o => { o.Brokers = kafkaOptions.GetValue<string>("Brokers"); });
+        services.Configure<KafkaOptions>(o => { o.Fqdn = kafkaOptions.GetValue<string>("FQDN"); });
       }
       /*else
       {
@@ -96,7 +96,7 @@ private static IServiceProvider BuildServiceProvider(IServiceCollection services
         var ip = Environment.GetEnvironmentVariable($"{serviceName}_SERVICE_HOST");
         var port = Environment.GetEnvironmentVariable($"{serviceName}_SERVICE_PORT");
 
-        services.Configure<KafkaOptions>(o => { o.Brokers = $"{ip}:{port}"; });
+        services.Configure<KafkaOptions>(o => { o.Fqdn = $"{ip}:{port}"; });
       }*/
 
       return resolver;
diff --git a/samples/SignalRNotifier/appsettings.Development.json b/samples/SignalRNotifier/appsettings.Development.json
@@ -1,9 +1,9 @@
 {
-  "EventBus": {
-    "Brokers": "127.0.0.1:9092"
+  "Kafka": {
+    "FQDN": "127.0.0.1:9092"
   },
   "Redis": {
-    "Connection": "127.0.0.1:31496",
+    "FQDN": "127.0.0.1:31496",
     "Password": "letmein"
   }
 }
diff --git a/samples/SignalRNotifier/appsettings.json b/samples/SignalRNotifier/appsettings.json
@@ -3,11 +3,11 @@
   "Hosts": {
     "BasePath": "/"
   },
-  "EventBus": {
-    "Brokers": "kafka-cp-kafka:9092"
+  "Kafka": {
+    "FQDN": "kafka-cp-kafka:9092"
   },
   "Redis": {
-    "Connection": "redis-master.redis:6379",
+    "FQDN": "redis-master.redis:6379",
     "Password": "letmein"
   },
   "Logging": {
diff --git a/samples/SignalRNotifier/k8s/signalrnotifier-dep.yaml b/samples/SignalRNotifier/k8s/signalrnotifier-dep.yaml
@@ -18,7 +18,7 @@ spec:
         env:
         - name: Hosts__BasePath
           value: /
-        - name: EventBus__Brokers
+        - name: EventBus__FQDN
           value: "kafka-cp-kafka:9092"
         - name: Redis__Connection
           value: "redis-master.redis:6379"
diff --git a/samples/TodoApi/Dockerfile b/samples/TodoApi/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.1.3-aspnetcore-runtime-alpine AS base
+FROM microsoft/dotnet:2.1.5-aspnetcore-runtime-alpine AS base
 WORKDIR /app
 
 ARG service_version
@@ -10,7 +10,7 @@ ENV API_VERSION ${api_version:-1.0}
 ENV ASPNETCORE_URLS http://+:5001
 EXPOSE 5001
 
-FROM microsoft/dotnet:2.1.401-sdk-alpine AS build
+FROM microsoft/dotnet:2.1.403-sdk-alpine AS build
 WORKDIR .
 COPY . .
 
diff --git a/samples/TodoApi/appsettings.Development.json b/samples/TodoApi/appsettings.Development.json
@@ -1,18 +1,24 @@
 {
-  "ConnectionStrings": {
-    "mssqldb": "Server=tcp:127.0.0.1,1433;Database=maindb;User Id=cs;Password=P@ssw0rd;",
-    "mysqldb": "server=127.0.0.1;port=30584;uid=root;pwd=P@ssw0rd;database=maindb"
-  },
   "Hosts": {
     "Externals": {
       "CurrentUri": "http://localhost:5001"
     }
   },
-  "EventBus": {
-    "Brokers": "127.0.0.1:9092"
+  "MySqlDb": {
+    "FQDN": "127.0.0.1:30584",
+    "Database": "maindb",
+    "UserName": "root",
+    "Password": "P@ssw0rd",
+    "Major": 5,
+    "Minor": 7,
+    "Build": 14,
+    "DbType": 0
+  },
+  "Kafka": {
+    "FQDN": "127.0.0.1:9092"
   },
   "Redis": {
-    "Connection": "127.0.0.1:31496",
+    "FQDN": "127.0.0.1:31496",
     "Password": "letmein"
   },
   "Logging": {
diff --git a/samples/TodoApi/appsettings.json b/samples/TodoApi/appsettings.json
@@ -2,37 +2,36 @@
   "API_VERSION": "1.0",
   "SERVICE_VERSION": "0.0.1",
   "QualifiedAssemblyPattern": "NetCoreKit.Samples.*",
+  "Hosts": {
+    "BasePath": "/",
+    "Externals": {
+      "CurrentUri": "http://localhost:32501"
+    }
+  },
   "ConnectionStrings": {
-    "mysqldb": "server={0};port={1};uid={2};pwd={3};database={4}"
+    "MsSqlDb": "Server=tcp:{0},{1};Database={2};User Id={3};Password={4};",
+    "MySqlDb": "server={0};port={1};uid={2};pwd={3};database={4}"
   },
-  "k8s": {
-    "mysqldb": {
-      "ServiceName": "mysql",
-      "Database": "maindb",
-      "UserName": "root",
-      "Password": "P@ssw0rd",
-      "Major": 5,
-      "Minor": 7,
-      "Build": 14,
-      "DbType": 0
-    }
+  "MySqlDb": {
+    "FQDN": "mysql.default:3306",
+    "Database": "maindb",
+    "UserName": "root",
+    "Password": "P@ssw0rd",
+    "Major": 5,
+    "Minor": 7,
+    "Build": 14,
+    "DbType": 0
   },
   "OpenApi": {
     "Enabled": true,
     "EnabledUI": true,
-    "EnabledProfiler": true 
-  },
-  "Hosts": {
-    "BasePath": "/",
-    "Externals": {
-      "CurrentUri": "http://localhost:32501"
-    }
+    "EnabledProfiler": true
   },
-  "EventBus": {
-    "Brokers": "kafka-cp-kafka:9092"
+  "Kafka": {
+    "FQDN": "kafka-cp-kafka:9092"
   },
   "Redis": {
-    "Connection": "redis-master.redis:6379",
+    "FQDN": "redis-master.redis:6379",
     "Password": "letmein"
   },
   "Logging": {
diff --git a/samples/TodoApi/k8s/todolist-dep.yaml b/samples/TodoApi/k8s/todolist-dep.yaml
@@ -18,7 +18,7 @@ spec:
         env:
         - name: Hosts__BasePath
           value: /
-        - name: EventBus__Brokers
+        - name: EventBus__FQDN
           value: "kafka-cp-kafka:9092"
         - name: Redis__Connection
           value: "redis-master.redis:6379"
diff --git a/samples/WebNotifier/Dockerfile b/samples/WebNotifier/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.1.401-sdk-alpine AS build
+FROM microsoft/dotnet:2.1.403-sdk-alpine AS build
 WORKDIR .
 COPY . .
 WORKDIR /samples/WebNotifier
diff --git a/src/NetCoreKit.Infrastructure.AspNetCore.OpenApi/AuthorizeCheckOperationFilter.cs b/src/NetCoreKit.Infrastructure.AspNetCore.OpenApi/AuthorizeCheckOperationFilter.cs
@@ -11,20 +11,25 @@ public class AuthorizeCheckOperationFilter : IOperationFilter
     public void Apply(Operation operation, OperationFilterContext context)
     {
       // Check for authorize attribute
-      var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() ||
-                         context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any();
+      context.ApiDescription.TryGetMethodInfo(out var methodInfo);
+      var requiredScopes = methodInfo.GetCustomAttributes(true).OfType<AuthorizeAttribute>();
 
-      if (hasAuthorize)
-      {
-        operation.Responses.Add("401", new Response {Description = "Unauthorized"});
-        operation.Responses.Add("403", new Response {Description = "Forbidden"});
+      /*var hasAuthorize = context.ApiDescription.ControllerAttributes().OfType<AuthorizeAttribute>().Any() ||
+                         context.ApiDescription.ActionAttributes().OfType<AuthorizeAttribute>().Any();*/
+      
+      var hasAuthorize = requiredScopes.Any();
+      if (!hasAuthorize) return;
+
+      operation.Responses.Add("401", new Response {Description = "Unauthorized"});
+      operation.Responses.Add("403", new Response {Description = "Forbidden"});
 
-        operation.Security = new List<IDictionary<string, IEnumerable<string>>>();
-        operation.Security.Add(new Dictionary<string, IEnumerable<string>>
+      operation.Security = new List<IDictionary<string, IEnumerable<string>>>
+      {
+        new Dictionary<string, IEnumerable<string>>
         {
-          {"oauth2", new[] {"swagger_id"}}
-        });
-      }
+          ["oauth2"] = new[] {"swagger_id"}
+        }
+      };
     }
   }
 }
diff --git a/src/NetCoreKit.Infrastructure.AspNetCore.OpenApi/SecurityRequirementsOperationFilter.cs b/src/NetCoreKit.Infrastructure.AspNetCore.OpenApi/SecurityRequirementsOperationFilter.cs
@@ -11,23 +11,30 @@ public class SecurityRequirementsOperationFilter : IOperationFilter
     public void Apply(Operation operation, OperationFilterContext context)
     {
       // Policy names map to scopes
-      var requiredScopes = context.MethodInfo
+      /*var requiredScopes = context.MethodInfo
         .GetCustomAttributes(true)
         .OfType<AuthorizeAttribute>()
         .Select(attr => attr.Policy)
-        .Distinct();
+        .Distinct();*/
 
-      if (requiredScopes.Any())
-      {
-        operation.Responses.Add("401", new Response {Description = "Unauthorized"});
-        operation.Responses.Add("403", new Response {Description = "Forbidden"});
+      var requiredScopes = context.MethodInfo.DeclaringType
+        ?.GetCustomAttributes(true)
+        .Union(context.MethodInfo.GetCustomAttributes(true))
+        .OfType<AuthorizeAttribute>()
+        .ToList();
+
+      if (requiredScopes == null || !requiredScopes.Any()) return;
 
-        operation.Security = new List<IDictionary<string, IEnumerable<string>>>();
-        operation.Security.Add(new Dictionary<string, IEnumerable<string>>
+      operation.Responses.Add("401", new Response {Description = "Unauthorized"});
+      operation.Responses.Add("403", new Response {Description = "Forbidden"});
+
+      operation.Security = new List<IDictionary<string, IEnumerable<string>>>
+      {
+        new Dictionary<string, IEnumerable<string>>
         {
-          {"oauth2", requiredScopes}
-        });
-      }
+          ["oauth2"] = requiredScopes.Select(attr => attr.Policy).Distinct()
+        }
+      };
     }
   }
 }
diff --git a/src/NetCoreKit.Infrastructure.Bus.Kafka/DispatchedEventBus.cs b/src/NetCoreKit.Infrastructure.Bus.Kafka/DispatchedEventBus.cs
@@ -31,7 +31,7 @@ public class DispatchedEventBus : IDispatchedEventBus
     public DispatchedEventBus(IServiceProvider serviceProvider, IOptions<KafkaOptions> options, ILoggerFactory factory)
     {
       _serviceProvider = serviceProvider;
-      _brokerList = options.Value.Brokers;
+      _brokerList = options.Value.Fqdn;
       //_logger = factory.CreateLogger<DispatchedEventBus>();
       Console.WriteLine($"[NCK] Init DispatchedEventBus with {_brokerList}.");
     }
diff --git a/src/NetCoreKit.Infrastructure.Bus.Kafka/KafkaOptions.cs b/src/NetCoreKit.Infrastructure.Bus.Kafka/KafkaOptions.cs
@@ -2,6 +2,6 @@ namespace NetCoreKit.Infrastructure.Bus.Kafka
 {
   public class KafkaOptions
   {
-    public string Brokers { get; set; } = "127.0.0.1:9092";
+    public string Fqdn { get; set; } = "127.0.0.1:9092";
   }
 }
diff --git a/src/NetCoreKit.Infrastructure.Bus.Kafka/ServiceCollectionExtensions.cs b/src/NetCoreKit.Infrastructure.Bus.Kafka/ServiceCollectionExtensions.cs
@@ -14,10 +14,10 @@ public static IServiceCollection AddKafkaEventBus(this IServiceCollection servic
       {
         var config = scope.ServiceProvider.GetService<IConfiguration>();
         var env = scope.ServiceProvider.GetService<IHostingEnvironment>();
-        var kafkaOptions = config.GetSection("EventBus");
+        var kafkaOptions = config.GetSection("Kafka");
         //if (env.IsDevelopment())
         {
-          services.Configure<KafkaOptions>(o => { o.Brokers = kafkaOptions.GetValue<string>("Brokers"); });
+          services.Configure<KafkaOptions>(o => { o.Fqdn = kafkaOptions.GetValue<string>("FQDN"); });
         }
         /*else
         {
@@ -29,7 +29,7 @@ public static IServiceCollection AddKafkaEventBus(this IServiceCollection servic
           var ip = Environment.GetEnvironmentVariable($"{serviceName}_SERVICE_HOST");
           var port = Environment.GetEnvironmentVariable($"{serviceName}_SERVICE_PORT");
 
-          services.Configure<KafkaOptions>(o => { o.Brokers = $"{ip}:{port}"; });
+          services.Configure<KafkaOptions>(o => { o.Fqdn = $"{ip}:{port}"; });
         }*/
 
         services.AddSingleton<IDispatchedEventBus, DispatchedEventBus>();
diff --git a/src/NetCoreKit.Infrastructure.Bus.Redis/ServiceCollectionExtensions.cs b/src/NetCoreKit.Infrastructure.Bus.Redis/ServiceCollectionExtensions.cs
@@ -15,7 +15,7 @@ public static IServiceCollection AddRedisBus(this IServiceCollection services)
 
         services.Configure<RedisOptions>(o =>
         {
-          o.Connection = redisOptions.GetValue<string>("Connection");
+          o.Connection = redisOptions.GetValue<string>("FQDN");
           o.Password = redisOptions.GetValue<string>("Password");
         });
 
diff --git a/src/NetCoreKit.Infrastructure.EfCore.MySql/DatabaseConnectionStringFactory.cs b/src/NetCoreKit.Infrastructure.EfCore.MySql/DatabaseConnectionStringFactory.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.AspNetCore.Hosting;
+using System.Linq;
 using Microsoft.Extensions.Configuration;
 using NetCoreKit.Infrastructure.EfCore.Db;
 
@@ -8,31 +7,25 @@ namespace NetCoreKit.Infrastructure.EfCore.MySql
   public sealed class DatabaseConnectionStringFactory : IDatabaseConnectionStringFactory
   {
     private readonly IConfiguration _config;
-    private readonly IHostingEnvironment _env;
 
-    public DatabaseConnectionStringFactory(
-      IConfiguration config,
-      IHostingEnvironment env)
+    public DatabaseConnectionStringFactory(IConfiguration config)
     {
       _config = config;
-      _env = env;
     }
 
     public string Create()
     {
-      if (_env.IsDevelopment())
-      {
-        return _config.GetConnectionString("mysqldb");
-      }
+      var connPattern = _config.GetConnectionString("MySqlDb");
+      var connConfigs = _config.GetValue<string>("MySqlDb:FQDN").Split(':');
+      var fqdn = connConfigs.First();
+      var port = connConfigs.Except(new[] {fqdn}).First();
 
-      var serviceName = _config.GetValue<string>("k8s:mysqldb:ServiceName").ToUpperInvariant();
       return string.Format(
-        _config.GetConnectionString("mysqldb"),
-        Environment.GetEnvironmentVariable($"{serviceName}_SERVICE_HOST"),
-        Environment.GetEnvironmentVariable($"{serviceName}_SERVICE_PORT"),
-        _config.GetValue<string>("k8s:mysqldb:UserName"),
-        _config.GetValue<string>("k8s:mysqldb:Password"),
-        _config.GetValue<string>("k8s:mysqldb:Database"));
+        connPattern,
+        fqdn, port,
+        _config.GetValue<string>("MySqlDb:UserName"),
+        _config.GetValue<string>("MySqlDb:Password"),
+        _config.GetValue<string>("MySqlDb:Database"));
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "2.1.401"`
	`3`	`+ "version": "2.1.403"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "EventBus": {`
`3`		`- "Brokers": "kafka-server:9092"`
	`2`	`+ "Kafka": {`
	`3`	`+ "FQDN": "kafka-server:9092"`
`4`	`4`	`},`
`5`	`5`	`"Logging": {`
`6`	`6`	`"LogLevel": {`
Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,10 @@ private static IServiceProvider BuildServiceProvider(IServiceCollection services`
`81`	`81`	`var resolver = services.BuildServiceProvider();`
`82`	`82`	`var config = resolver.GetRequiredService<IConfiguration>();`
`83`	`83`	`var env = resolver.GetRequiredService<IHostingEnvironment>();`
`84`		`- var kafkaOptions = config.GetSection("EventBus");`
	`84`	`+ var kafkaOptions = config.GetSection("Kafka");`
`85`	`85`	`//if (env.IsDevelopment())`
`86`	`86`	`{`
`87`		`- services.Configure<KafkaOptions>(o => { o.Brokers = kafkaOptions.GetValue<string>("Brokers"); });`
	`87`	`+ services.Configure<KafkaOptions>(o => { o.Fqdn = kafkaOptions.GetValue<string>("FQDN"); });`
`88`	`88`	`}`
`89`	`89`	`/*else`
`90`	`90`	`{`
`@@ -96,7 +96,7 @@ private static IServiceProvider BuildServiceProvider(IServiceCollection services`
`96`	`96`	`var ip = Environment.GetEnvironmentVariable($"{serviceName}_SERVICE_HOST");`
`97`	`97`	`var port = Environment.GetEnvironmentVariable($"{serviceName}_SERVICE_PORT");`
`98`	`98`
`99`		`- services.Configure<KafkaOptions>(o => { o.Brokers = $"{ip}:{port}"; });`
	`99`	`+ services.Configure<KafkaOptions>(o => { o.Fqdn = $"{ip}:{port}"; });`
`100`	`100`	`}*/`
`101`	`101`
`102`	`102`	`return resolver;`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`		`- "EventBus": {`
`3`		`- "Brokers": "127.0.0.1:9092"`
	`2`	`+ "Kafka": {`
	`3`	`+ "FQDN": "127.0.0.1:9092"`
`4`	`4`	`},`
`5`	`5`	`"Redis": {`
`6`		`- "Connection": "127.0.0.1:31496",`
	`6`	`+ "FQDN": "127.0.0.1:31496",`
`7`	`7`	`"Password": "letmein"`
`8`	`8`	`}`
`9`	`9`	`}`