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

Merge remote-tracking branch 'oss/master' into database-refactor

Browse Source
This commit is contained in:
Brian Kassouf
2017-05-04 10:45:18 -07:00
parent c825362304 4b6d4e9e83
commit 55f1f5116a
88 changed files with 4430 additions and 1062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cli/commands.go
View File

@@ -10,7 +10,7 @@ import (
credAppId "github.com/hashicorp/vault/builtin/credential/app-id"
credAppRole "github.com/hashicorp/vault/builtin/credential/approle"
credAwsEc2 "github.com/hashicorp/vault/builtin/credential/aws-ec2"
credAws "github.com/hashicorp/vault/builtin/credential/aws"
credCert "github.com/hashicorp/vault/builtin/credential/cert"
credGitHub "github.com/hashicorp/vault/builtin/credential/github"
credLdap "github.com/hashicorp/vault/builtin/credential/ldap"
@@ -72,7 +72,7 @@ func Commands(metaPtr *meta.Meta) map[string]cli.CommandFactory {
CredentialBackends: map[string]logical.Factory{
"approle": credAppRole.Factory,
"cert": credCert.Factory,
"aws-ec2": credAwsEc2.Factory,
"aws": credAws.Factory,
"app-id": credAppId.Factory,
"github": credGitHub.Factory,
"userpass": credUserpass.Factory,
@@ -120,6 +120,7 @@ func Commands(metaPtr *meta.Meta) map[string]cli.CommandFactory {
"ldap": &credLdap.CLIHandler{},
"okta": &credOkta.CLIHandler{},
"cert": &credCert.CLIHandler{},
"aws": &credAws.CLIHandler{},
"radius": &credUserpass.CLIHandler{DefaultMount: "radius"},
},
}, nil