Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add user secrets #115 #116

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add user secrets #115 #116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/Falco/ConfigBuilder.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, string> }
InMemory : Map<string, string>
AddUserSecrets: bool}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a space here to separate the type from the bracket.


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[]) =
Expand Down Expand Up @@ -51,6 +54,9 @@ type ConfigBuilder (args : string[]) =

bldr.AddCommandLine(args) |> ignore

if conf.AddUserSecrets then
Copy link
Owner

@pimbrouwers pimbrouwers Dec 4, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should appear before env vars, I try to match the prior specified here: https://learn.microsoft.com/en-us/dotnet/core/extensions/configuration.

image

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Goido. I'll fix that.

bldr.AddUserSecrets() |> ignore

bldr.Build() :> IConfiguration

/// Sets the base path of the ConfigurationBuilder.
Expand Down Expand Up @@ -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.
[<CustomOperation("optional_user_secrets")>]
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the non-optional brother of this omitted on purpose?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes because it is generally only used in the Development environment. In the default web builder of the c# template where it sets up all the config for you it only adds optional user secrets if the env is development.

member _.AddOptionalUserSecrets (conf : ConfigBuilderSpec) =
{ conf with AddUserSecrets = true }

[<AutoOpen>]
module ConfigurationBuilder =
/// Computation expression to allow for elegant IConfiguration construction.
Expand Down