From 187ec28680c227415def57547b05983016931f98 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Mon, 4 Dec 2023 06:52:44 +1000 Subject: [PATCH 1/3] Add user secrets #115 --- src/Falco/ConfigBuilder.fs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Falco/ConfigBuilder.fs b/src/Falco/ConfigBuilder.fs index ab7757e3..a83a6076 100644 --- a/src/Falco/ConfigBuilder.fs +++ b/src/Falco/ConfigBuilder.fs @@ -8,19 +8,22 @@ type ConfigFile = | XmlFile of path : string | JsonFile of path : string + type ConfigBuilderSpec = { AddEnvVars : bool BasePath : string RequiredFiles : ConfigFile list OptionalFiles : ConfigFile list - InMemory : Map } + InMemory : Map + AddUserSecrets: bool} static member Empty = { AddEnvVars = false BasePath = Directory.GetCurrentDirectory() RequiredFiles = [] OptionalFiles = [] - InMemory = Map.empty } + InMemory = Map.empty + AddUserSecrets= false } /// Computation expression to allow for elegant IConfiguration construction. type ConfigBuilder (args : string[]) = @@ -51,6 +54,9 @@ type ConfigBuilder (args : string[]) = bldr.AddCommandLine(args) |> ignore + if conf.AddUserSecrets then + bldr.AddUserSecrets() |> ignore + bldr.Build() :> IConfiguration /// Sets the base path of the ConfigurationBuilder. @@ -101,6 +107,11 @@ type ConfigBuilder (args : string[]) = member _.AddOptionalJsonFile (conf : ConfigBuilderSpec, filePath : string) = { conf with OptionalFiles = (JsonFile filePath) :: conf.OptionalFiles } + ///Adds optional user secrets to the ConfigurationBuilder. + [] + member _.AddOptionalUserSecrets (conf : ConfigBuilderSpec) = + { conf with AddUserSecrets = true } + [] module ConfigurationBuilder = /// Computation expression to allow for elegant IConfiguration construction. From 7e6015d72f0821678f26a58f2c00064d710b99b8 Mon Sep 17 00:00:00 2001 From: Ben Collins <=> Date: Wed, 3 Jul 2024 11:24:45 -0500 Subject: [PATCH 2/3] add requested changes from PR --- src/Falco/ConfigBuilder.fs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Falco/ConfigBuilder.fs b/src/Falco/ConfigBuilder.fs index a83a6076..358d6b49 100644 --- a/src/Falco/ConfigBuilder.fs +++ b/src/Falco/ConfigBuilder.fs @@ -10,12 +10,12 @@ type ConfigFile = type ConfigBuilderSpec = - { AddEnvVars : bool - BasePath : string - RequiredFiles : ConfigFile list - OptionalFiles : ConfigFile list - InMemory : Map - AddUserSecrets: bool} + { AddEnvVars : bool + BasePath : string + RequiredFiles : ConfigFile list + OptionalFiles : ConfigFile list + InMemory : Map + AddUserSecrets : bool} static member Empty = { AddEnvVars = false @@ -49,14 +49,14 @@ type ConfigBuilder (args : string[]) = if conf.InMemory.Keys.Count > 0 then bldr.AddInMemoryCollection(conf.InMemory) |> ignore + if conf.AddUserSecrets then + bldr.AddUserSecrets() |> ignore + if conf.AddEnvVars then bldr.AddEnvironmentVariables() |> ignore bldr.AddCommandLine(args) |> ignore - if conf.AddUserSecrets then - bldr.AddUserSecrets() |> ignore - bldr.Build() :> IConfiguration /// Sets the base path of the ConfigurationBuilder. From bbc850661e2360be421e7ac7177f957bd981bfb5 Mon Sep 17 00:00:00 2001 From: Ben Collins <=> Date: Wed, 3 Jul 2024 12:04:30 -0500 Subject: [PATCH 3/3] one more whitespace change --- src/Falco/ConfigBuilder.fs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Falco/ConfigBuilder.fs b/src/Falco/ConfigBuilder.fs index 358d6b49..9411d863 100644 --- a/src/Falco/ConfigBuilder.fs +++ b/src/Falco/ConfigBuilder.fs @@ -18,12 +18,12 @@ type ConfigBuilderSpec = AddUserSecrets : bool} static member Empty = - { AddEnvVars = false - BasePath = Directory.GetCurrentDirectory() - RequiredFiles = [] - OptionalFiles = [] - InMemory = Map.empty - AddUserSecrets= false } + { AddEnvVars = false + BasePath = Directory.GetCurrentDirectory() + RequiredFiles = [] + OptionalFiles = [] + InMemory = Map.empty + AddUserSecrets = false } /// Computation expression to allow for elegant IConfiguration construction. type ConfigBuilder (args : string[]) =