Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15526 from influxdata/4447/fix_vault_flag_names 

fix(vault): rename flags to match env vars and add missing token flag
pull/15529/head
Johnny Steenbergen 2019-10-21 16:15:57 -07:00 committed by GitHub
parent f73647f2da 1bacb62b3a
commit 1e69c517b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/influxd/launcher/launcher.go
View File

@ -196,7 +196,7 @@ func buildLauncherCommand(l *Launcher, cmd *cobra.Command) {
}, },
{ {
DestP: &vaultConfig.Address, DestP: &vaultConfig.Address,
Flag: "vault-address", Flag: "vault-addr",
Desc: "address of the Vault server expressed as a URL and port, for example: https://127.0.0.1:8200/.", Desc: "address of the Vault server expressed as a URL and port, for example: https://127.0.0.1:8200/.",
}, },
{ {
@ -206,17 +206,17 @@ func buildLauncherCommand(l *Launcher, cmd *cobra.Command) {
}, },
{ {
DestP: &vaultConfig.MaxRetries, DestP: &vaultConfig.MaxRetries,
Flag: "vault-client-max-retries", Flag: "vault-max-retries",
Desc: "maximum number of retries when a 5xx error code is encountered. The default is 2, for three total attempts. Set this to 0 or less to disable retrying.", Desc: "maximum number of retries when a 5xx error code is encountered. The default is 2, for three total attempts. Set this to 0 or less to disable retrying.",
}, },
{ {
DestP: &vaultConfig.CACert, DestP: &vaultConfig.CACert,
Flag: "vault-ca-cert", Flag: "vault-cacert",
Desc: "path to a PEM-encoded CA certificate file on the local disk. This file is used to verify the Vault server's SSL certificate. This environment variable takes precedence over VAULT_CAPATH.", Desc: "path to a PEM-encoded CA certificate file on the local disk. This file is used to verify the Vault server's SSL certificate. This environment variable takes precedence over VAULT_CAPATH.",
}, },
{ {
DestP: &vaultConfig.CAPath, DestP: &vaultConfig.CAPath,
Flag: "vault-ca-path", Flag: "vault-capath",
Desc: "path to a directory of PEM-encoded CA certificate files on the local disk. These certificates are used to verify the Vault server's SSL certificate.", Desc: "path to a directory of PEM-encoded CA certificate files on the local disk. These certificates are used to verify the Vault server's SSL certificate.",
}, },
{ {
@ -239,6 +239,11 @@ func buildLauncherCommand(l *Launcher, cmd *cobra.Command) {
Flag: "vault-tls-server-name", Flag: "vault-tls-server-name",
Desc: "name to use as the SNI host when connecting via TLS.", Desc: "name to use as the SNI host when connecting via TLS.",
}, },
{
DestP: &vaultConfig.Token,
Flag: "vault-token",
Desc: "vault authentication token",
},
{ {
DestP: &l.httpTlsCert, DestP: &l.httpTlsCert,
Flag: "tls-cert", Flag: "tls-cert",

5
vault/secret.go
View File

@ -25,6 +25,7 @@ type Config struct {
AgentAddress string AgentAddress string
ClientTimeout time.Duration ClientTimeout time.Duration
MaxRetries int MaxRetries int
Token string
TLSConfig TLSConfig
} }
@ -114,6 +115,10 @@ func NewSecretService(cfgOpts ...ConfigOptFn) (*SecretService, error) {
return nil, err return nil, err
} }
if explicitConfig.Token != "" {
c.SetToken(explicitConfig.Token)
}
return &SecretService{ return &SecretService{
Client: c, Client: c,
}, nil }, nil