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

command/meta: VAULT_ADDR to set the addr via env var

Browse Source
This commit is contained in:
Mitchell Hashimoto
2015-03-15 20:41:36 -07:00
parent f93f1198d5
commit f11c8febad
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
command/meta.go
View File

@@ -7,12 +7,16 @@ import (
"io" "io"
"net" "net"
"net/http" "net/http"
"os"
"time" "time"
"github.com/hashicorp/vault/api" "github.com/hashicorp/vault/api"
"github.com/mitchellh/cli" "github.com/mitchellh/cli"
) )
// EnvVaultAddress can be used to set the address of Vault
const EnvVaultAddress = "VAULT_ADDR"
// FlagSetFlags is an enum to define what flags are present in the // FlagSetFlags is an enum to define what flags are present in the
// default FlagSet returned by Meta.FlagSet. // default FlagSet returned by Meta.FlagSet.
type FlagSetFlags uint type FlagSetFlags uint
@@ -39,6 +43,9 @@ type Meta struct {
// flag settings for this command. // flag settings for this command.
func (m *Meta) Client() (*api.Client, error) { func (m *Meta) Client() (*api.Client, error) {
config := api.DefaultConfig() config := api.DefaultConfig()
if v := os.Getenv(EnvVaultAddress); v != "" {
config.Address = v
}
if m.flagAddress != "" { if m.flagAddress != "" {
config.Address = m.flagAddress config.Address = m.flagAddress
} }