removed superfluous support for UserSecrets; default to no HttpsRedir…

…ect (#57) force merge because there was a breaking change to the WebApiConfigurator
johnazariah · Oct 14, 2020 · 01f9ea1 · 01f9ea1
1 parent cbffdeb
commit 01f9ea1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 20 deletions.
diff --git a/proto-csharp/webapi-directclient/Program.cs b/proto-csharp/webapi-directclient/Program.cs
@@ -31,7 +31,7 @@ class WebApiConfigurator : Orleans.Contrib.UniversalSilo.WebApiConfigurator
                 },
             };
 
-        public WebApiConfigurator() : base(_apiInfo)
+        public WebApiConfigurator() : base(_apiInfo, false)
         { }
     }
 

diff --git a/proto-csharp/webapi-directclient/webapi-directclient.csproj b/proto-csharp/webapi-directclient/webapi-directclient.csproj
@@ -1,5 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -9,16 +9,13 @@
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
   </PropertyGroup>
-
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>
-
   <PropertyGroup>
-    <DefineConstants>TRACE;HTTPS</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.8" />
@@ -29,16 +26,13 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.8" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.15.0" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.6.3" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Orleans.Client" Version="3.3.0" />
     <PackageReference Include="Microsoft.Orleans.Clustering.AzureStorage" Version="3.3.0" />
@@ -52,21 +46,17 @@
     <PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.3.0" />
     <PackageReference Include="Microsoft.Orleans.Server" Version="3.3.0" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Orleans.Clustering.Kubernetes" Version="2.0.0" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="OrleansDashboard" Version="3.1.0" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\universal-silo\universal-silo.fsproj" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\grain-controllers\grain-controllers.csproj" />
     <ProjectReference Include="..\grains\grains.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/proto-fsharp/webapi-directclient/Program.fs b/proto-fsharp/webapi-directclient/Program.fs
@@ -30,7 +30,7 @@ module OpenApiConfiguration =
 
 /// Override methods in this class to take over how the web-api host is configured
 type WebApiConfigurator() = class
-    inherit Orleans.Contrib.UniversalSilo.WebApiConfigurator(OpenApiConfiguration.ApiInfo)
+    inherit Orleans.Contrib.UniversalSilo.WebApiConfigurator(OpenApiConfiguration.ApiInfo, false)
 end
 
 /// Override methods in this class to take over how the silo is configured

diff --git a/universal-silo/Client.fs b/universal-silo/Client.fs
@@ -105,7 +105,6 @@ type ClientConfiguration() = class
     default __.ConfigureAppConfiguration _ configBuilder =
         configBuilder
             .SetBasePath(Directory.GetCurrentDirectory ())
-            .AddUserSecrets(System.Reflection.Assembly.GetExecutingAssembly())
         |> ignore
 
     abstract ConfigureServicesCore : HostBuilderContext -> IServiceCollection -> unit

diff --git a/universal-silo/Configuration.fs b/universal-silo/Configuration.fs
@@ -112,7 +112,6 @@ module Extensions =
             this.ConfigureHostConfiguration (fun cb ->
                 cb
                     .SetBasePath(Directory.GetCurrentDirectory())
-                    .AddUserSecrets(System.Reflection.Assembly.GetExecutingAssembly())
                 |> ignore)
 
         member this.ApplyConfiguration f =

diff --git a/universal-silo/WebApiConfigurator.fs b/universal-silo/WebApiConfigurator.fs
@@ -17,7 +17,7 @@ open Microsoft.Extensions.Diagnostics.HealthChecks
 open Microsoft.AspNetCore.Http
 
 [<AbstractClass>]
-type WebApiConfigurator (apiInfo : OpenApiInfo) = class
+type WebApiConfigurator (apiInfo : OpenApiInfo, useHttpsRedirection : bool) = class
     let mutable configuration : IConfiguration = null
     member val public Configuration = configuration
 
@@ -83,10 +83,11 @@ type WebApiConfigurator (apiInfo : OpenApiInfo) = class
             ]
             |> dict
 
+        if useHttpsRedirection then ignore <| builder.UseHttpsRedirection()
+
         builder
             .UseDefaultFiles()
             .UseStaticFiles()
-            .UseHttpsRedirection()
             .UseSwagger()
             .UseSwaggerUI(fun options -> options.SwaggerEndpoint(swaggerUri, swaggerName))
             .UseResponseCompression()
-Original file line number
+Diff line change
@@ Expand Up @@
                     },
                 };
-            public WebApiConfigurator() : base(_apiInfo)
+            public WebApiConfigurator() : base(_apiInfo, false)
             { }
         }
@@ Expand Down @@