feat: add Default config which applies to all servers #61
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,12 +11,16 @@ import ( | |
| ) | ||
|
|
||
| type NvrhConfigServer struct { | ||
| NvimCmd []string `yaml:"nvim-cmd,omitempty"` | ||
| UsePorts *bool `yaml:"use-ports,omitempty"` | ||
| SshArg []string `yaml:"ssh-arg,omitempty"` | ||
| SshPath string `yaml:"ssh-path,omitempty"` | ||
| LocalEditor []string `yaml:"local-editor,omitempty"` | ||
| ServerEnv map[string]string `yaml:"server-env,omitempty"` | ||
|
Owner
There was a problem hiding this comment. Would prefer if this was just
Owner
There was a problem hiding this comment. Ah, more changes are needed to pipe these through is the issue. |
||
| } | ||
|
|
||
| type NvrhConfig struct { | ||
| Default NvrhConfigServer `yaml:"default,omitempty"` | ||
| Servers map[string]NvrhConfigServer `yaml:"servers"` | ||
| } | ||
|
|
||
|
|
@@ -49,43 +53,88 @@ func LoadConfig(path string) (*NvrhConfig, error) { | |
| } | ||
|
|
||
| var envIndex = map[string][]string{ | ||
| "ssh-path": {"NVRH_CLIENT_SSH_PATH"}, | ||
|
Owner
There was a problem hiding this comment. When adding to this, we need to remove the source from the CLI command, similar to Lines 67 to 72 in 720d3d7 |
||
| "local-editor": {"NVRH_CLIENT_LOCAL_EDITOR"}, | ||
| "server-env": {"NVRH_CLIENT_SERVER_ENV"}, | ||
| "nvim-cmd": {"NVRH_CLIENT_NVIM_CMD"}, | ||
| "use-ports": {"NVRH_CLIENT_USE_PORTS"}, | ||
| "ssh-arg": {"NVRH_CLIENT_SSH_ARG"}, | ||
| } | ||
|
|
||
| func ApplyPrecedence(c *cli.Command, | ||
| defaultServerConfig NvrhConfigServer, | ||
| serverConfig NvrhConfigServer) error { | ||
| // Use values from YAML if not set in command. | ||
|
|
||
| // First apply the specific server config, then the default config. | ||
| err := applyServerConfig(c, serverConfig) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| err = applyServerConfig(c, defaultServerConfig) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // Fall back to environment variables if still not set. | ||
|
Owner
There was a problem hiding this comment. Huh, I can see that was was just moved to DRY the yaml -> CLI stuff, so I might have had a bug here. I have |
||
| for name, keys := range envIndex { | ||
| if c.IsSet(name) { | ||
| continue | ||
| } | ||
|
|
||
| if raw, ok := lookupFirst(keys); ok { | ||
| if err := c.Set(name, raw); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func applyServerConfig(c *cli.Command, serverConfig NvrhConfigServer) error { | ||
| if !c.IsSet("ssh-path") { | ||
| if serverConfig.SshPath != "" { | ||
| if err := c.Set("ssh-path", serverConfig.SshPath); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if !c.IsSet("local-editor") && len(serverConfig.LocalEditor) > 0 { | ||
| for _, v := range serverConfig.LocalEditor { | ||
| if err := c.Set("local-editor", v); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if !c.IsSet("server-env") && len(serverConfig.ServerEnv) > 0 { | ||
| for k, v := range serverConfig.ServerEnv { | ||
| if err := c.Set("server-env", fmt.Sprintf("%s=%s", k, v)); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if !c.IsSet("nvim-cmd") && len(serverConfig.NvimCmd) > 0 { | ||
| for _, v := range serverConfig.NvimCmd { | ||
| if err := c.Set("nvim-cmd", v); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if !c.IsSet("use-ports") && serverConfig.UsePorts != nil { | ||
| if err := c.Set("use-ports", fmt.Sprintf("%v", *serverConfig.UsePorts)); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| if !c.IsSet("ssh-arg") && len(serverConfig.SshArg) > 0 { | ||
| for _, v := range serverConfig.SshArg { | ||
| if err := c.Set("ssh-arg", v); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Given where
ApplyPrecedenceis called in the flow,getSshPathisn't applied to it. So in yamlssh-path: binarywould look for a literal executable namedbinaryin your$PATH, and not actually use the default.