Change Vault mount path cli option name

backends/client.go

@@ -75,7 +75,7 @@ func New(config Config) (StoreClient, error) {
 			"cert":      config.ClientCert,
 			"key":       config.ClientKey,
 			"caCert":    config.ClientCaKeys,
-			"path":      config.VaultPath,
+			"path":      config.Path,
 		}
 		return vault.New(backendNodes[0], config.AuthType, vaultConfig)
 	case "dynamodb":

backends/config.go

@@ -24,6 +24,6 @@ type Config struct {
 	SecretID     string     `toml:"secret_id"`
 	YAMLFile     util.Nodes `toml:"file"`
 	Filter       string     `toml:"filter"`
-	VaultPath    string     `toml:"vault_path"`
+	Path         string     `toml:"path"`
 	Role         string
 }

config.go

@@ -66,7 +66,7 @@ func init() {
 	flag.StringVar(&config.UserID, "user-id", "", "Vault user-id to use with the app-id backend (only used with -backend=value and auth-type=app-id)")
 	flag.StringVar(&config.RoleID, "role-id", "", "Vault role-id to use with the AppRole, Kubernetes backends (only used with -backend=vault and either auth-type=app-role or auth-type=kubernetes)")
 	flag.StringVar(&config.SecretID, "secret-id", "", "Vault secret-id to use with the AppRole backend (only used with -backend=vault and auth-type=app-role)")
-	flag.StringVar(&config.VaultPath, "vault-path", "", "Vault mount path of the auth method (only used with -backend=vault)")
+	flag.StringVar(&config.Path, "path", "", "Vault mount path of the auth method (only used with -backend=vault)")
 	flag.StringVar(&config.Table, "table", "", "the name of the DynamoDB table (only used with -backend=dynamodb)")
 	flag.StringVar(&config.Separator, "separator", "", "the separator to replace '/' with when looking up keys in the backend, prefixed '/' will also be removed (only used with -backend=redis)")
 	flag.StringVar(&config.Username, "username", "", "the username to authenticate as (only used with vault and etcd backends)")

docs/command-line-flags.md

@@ -46,6 +46,8 @@ Usage of confd:
       run once and exit
   -password string
       the password to authenticate with (only used with vault and etcd backends)
+  -path string
+      Vault mount path of the auth method (only used with -backend=vault)
   -prefix string
       key path prefix
   -role-id string
@@ -70,8 +72,6 @@ Usage of confd:
       Vault user-id to use with the app-id backend (only used with -backend=value and auth-type=app-id)
   -username string
       the username to authenticate as (only used with vault and etcd backends)
-  -vault-path string
-      Vault mount path of the auth method (only used with -backend=vault)
   -version
       print version and exit
   -watch

docs/configuration-guide.md

@@ -35,7 +35,7 @@ Optional:
 * `secret_id` (string) - Vault secret-id to use with the AppRole backend (only used with -backend=vault and auth-type=app-role).
 * `file` (array of strings) - The YAML file to watch for changes (only used with -backend=file).
 * `filter` (string) - Files filter (only used with -backend=file) (default "*").
-* `vault_path` (string) - Vault mount path of the auth method (only used with -backend=vault).
+* `path` (string) - Vault mount path of the auth method (only used with -backend=vault).
 
 Example:
 

integration/vault-path/test.sh

@@ -37,5 +37,5 @@ confd --onetime --log-level debug \
       --auth-type app-role \
       --role-id $ROLE_ID \
       --secret-id $SECRET_ID \
-      --vault-path=test \
+      --path=test \
       --node http://127.0.0.1:8200