mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-02-27 02:31:12 +01:00
Code Issues Projects Releases Wiki Activity

Wire up remaining sections for config validation (#12048)

Browse Source 
* wip

* Add validation to storage, serviceregistration

* Wire up remaining sections except Storage which is generic
This commit is contained in:
Scott Miller 2021-07-12 16:33:17 -05:00 committed by GitHub
parent 6e9ad7c8dc
commit 136dd73cb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
command/server/config.go
View File

@ -19,6 +19,10 @@ import (
"github.com/hashicorp/vault/sdk/helper/parseutil"
)
var entConfigValidate = func(_ *Config, _ string) []configutil.ConfigError {
return nil
}
// Config is the configuration for the vault server.
type Config struct {
UnusedKeys configutil.UnusedKeyMap `hcl:",unusedKeyPositions"`
@ -88,13 +92,21 @@ func (c *Config) Validate(sourceFilePath string) []configutil.ConfigError {
results := configutil.ValidateUnusedFields(c.UnusedKeys, sourceFilePath)
if c.Telemetry != nil {
results = append(results, c.Telemetry.Validate(sourceFilePath)...)
for _, l := range c.Listeners {
results = append(results, l.Validate(sourceFilePath)...)
}
}
if c.ServiceRegistration != nil {
results = append(results, c.ServiceRegistration.Validate(sourceFilePath)...)
}
for _, l := range c.Listeners {
results = append(results, l.Validate(sourceFilePath)...)
}
results = append(results, c.validateEnt(sourceFilePath)...)
return results
}
func (c *Config) validateEnt(sourceFilePath string) []configutil.ConfigError {
return entConfigValidate(c, sourceFilePath)
}
// DevConfig is a Config that is used for dev mode of Vault.
func DevConfig(storageType string) (*Config, error) {
hclStr := `
@ -130,7 +142,6 @@ ui = true
// Storage is the underlying storage configuration for the server.
type Storage struct {
UnusedKeys []string `hcl:",unusedKeys"`
Type string
RedirectAddr string
ClusterAddr string
@ -144,8 +155,13 @@ func (b *Storage) GoString() string {
// ServiceRegistration is the optional service discovery for the server.
type ServiceRegistration struct {
Type string
Config map[string]string
UnusedKeys configutil.UnusedKeyMap `hcl:",unusedKeyPositions"`
Type string
Config map[string]string
}
func (b *ServiceRegistration) Validate(source string) []configutil.ConfigError {
return configutil.ValidateUnusedFields(b.UnusedKeys, source)
}
func (b *ServiceRegistration) GoString() string {