scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 11:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added optional -log-level flag to 'operator migrate' command (#15405)

Browse Source
This commit is contained in:
Peter Wilson
2022-05-12 20:56:25 +01:00
committed by GitHub
parent 7aaa70cf9c
commit aa2a10a1a7
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/15405.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:improvement
command: Support optional '-log-level' flag to be passed to 'operator migrate' command (defaults to info). Also support VAULT_LOG_LEVEL env var.
```

4
command/agent.go
View File

@@ -127,9 +127,9 @@ func (c *AgentCommand) Flags() *FlagSets {
Target: &c.flagLogLevel, Target: &c.flagLogLevel,
Default: "info", Default: "info",
EnvVar: "VAULT_LOG_LEVEL", EnvVar: "VAULT_LOG_LEVEL",
Completion: complete.PredictSet("trace", "debug", "info", "warn", "err"), Completion: complete.PredictSet("trace", "debug", "info", "warn", "error"),
Usage: "Log verbosity level. Supported values (in order of detail) are " + Usage: "Log verbosity level. Supported values (in order of detail) are " +
"\"trace\", \"debug\", \"info\", \"warn\", and \"err\".", "\"trace\", \"debug\", \"info\", \"warn\", and \"error\".",
}) })
f.BoolVar(&BoolVar{ f.BoolVar(&BoolVar{

21
command/operator_migrate.go
View File

@@ -11,6 +11,7 @@ import (
"time" "time"
log "github.com/hashicorp/go-hclog" log "github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-secure-stdlib/strutil"
"github.com/hashicorp/hcl" "github.com/hashicorp/hcl"
"github.com/hashicorp/hcl/hcl/ast" "github.com/hashicorp/hcl/hcl/ast"
"github.com/hashicorp/vault/command/server" "github.com/hashicorp/vault/command/server"
@@ -35,6 +36,7 @@ type OperatorMigrateCommand struct {
PhysicalBackends map[string]physical.Factory PhysicalBackends map[string]physical.Factory
flagConfig string flagConfig string
flagLogLevel string
flagStart string flagStart string
flagReset bool flagReset bool
logger log.Logger logger log.Logger
@@ -96,6 +98,16 @@ func (c *OperatorMigrateCommand) Flags() *FlagSets {
Usage: "Reset the migration lock. No migration will occur.", Usage: "Reset the migration lock. No migration will occur.",
}) })
f.StringVar(&StringVar{
Name: "log-level",
Target: &c.flagLogLevel,
Default: "info",
EnvVar: "VAULT_LOG_LEVEL",
Completion: complete.PredictSet("trace", "debug", "info", "warn", "error"),
Usage: "Log verbosity level. Supported values (in order of detail) are " +
"\"trace\", \"debug\", \"info\", \"warn\", and \"error\". These are not case sensitive.",
})
return set return set
} }
@@ -108,7 +120,6 @@ func (c *OperatorMigrateCommand) AutocompleteFlags() complete.Flags {
} }
func (c *OperatorMigrateCommand) Run(args []string) int { func (c *OperatorMigrateCommand) Run(args []string) int {
c.logger = logging.NewVaultLogger(log.Info)
f := c.Flags() f := c.Flags()
if err := f.Parse(args); err != nil { if err := f.Parse(args); err != nil {
@@ -116,6 +127,14 @@ func (c *OperatorMigrateCommand) Run(args []string) int {
return 1 return 1
} }
c.flagLogLevel = strings.ToLower(c.flagLogLevel)
validLevels := []string{"trace", "debug", "info", "warn", "error"}
if !strutil.StrListContains(validLevels, c.flagLogLevel) {
c.UI.Error(fmt.Sprintf("%s is an unknown log level. Valid log levels are: %s", c.flagLogLevel, validLevels))
return 1
}
c.logger = logging.NewVaultLogger(log.LevelFromString(c.flagLogLevel))
if c.flagConfig == "" { if c.flagConfig == "" {
c.UI.Error("Must specify exactly one config path using -config") c.UI.Error("Must specify exactly one config path using -config")
return 1 return 1

4
command/server.go
View File

@@ -189,9 +189,9 @@ func (c *ServerCommand) Flags() *FlagSets {
Target: &c.flagLogLevel, Target: &c.flagLogLevel,
Default: notSetValue, Default: notSetValue,
EnvVar: "VAULT_LOG_LEVEL", EnvVar: "VAULT_LOG_LEVEL",
Completion: complete.PredictSet("trace", "debug", "info", "warn", "err"), Completion: complete.PredictSet("trace", "debug", "info", "warn", "error"),
Usage: "Log verbosity level. Supported values (in order of detail) are " + Usage: "Log verbosity level. Supported values (in order of detail) are " +
"\"trace\", \"debug\", \"info\", \"warn\", and \"err\".", "\"trace\", \"debug\", \"info\", \"warn\", and \"error\".",
}) })
f.StringVar(&StringVar{ f.StringVar(&StringVar{