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

Updating for backend API change

Browse Source
This commit is contained in:
Armon Dadgar
2015-06-30 17:36:12 -07:00
parent 8a7918f9c0
commit 22f543f837
13 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/credential/app-id/backend.go
View File

@@ -1,19 +1,22 @@
package appId package appId
import ( import (
"github.com/hashicorp/vault/helper/salt"
"github.com/hashicorp/vault/logical" "github.com/hashicorp/vault/logical"
"github.com/hashicorp/vault/logical/framework" "github.com/hashicorp/vault/logical/framework"
) )
func Factory(map[string]string) (logical.Backend, error) { func Factory(*logical.BackendConfig) (logical.Backend, error) {
return Backend(), nil return Backend(), nil
} }
func Backend() *framework.Backend { func Backend() *framework.Backend {
var salt *salt.Salt
var b backend var b backend
b.MapAppId = &framework.PolicyMap{ b.MapAppId = &framework.PolicyMap{
PathMap: framework.PathMap{ PathMap: framework.PathMap{
Name: "app-id", Name: "app-id",
Salt: salt,
Schema: map[string]*framework.FieldSchema{ Schema: map[string]*framework.FieldSchema{
"display_name": &framework.FieldSchema{ "display_name": &framework.FieldSchema{
Type: framework.TypeString, Type: framework.TypeString,
@@ -31,6 +34,7 @@ func Backend() *framework.Backend {
b.MapUserId = &framework.PathMap{ b.MapUserId = &framework.PathMap{
Name: "user-id", Name: "user-id",
Salt: salt,
Schema: map[string]*framework.FieldSchema{ Schema: map[string]*framework.FieldSchema{
"cidr_block": &framework.FieldSchema{ "cidr_block": &framework.FieldSchema{
Type: framework.TypeString, Type: framework.TypeString,

2
builtin/credential/cert/backend.go
View File

@@ -5,7 +5,7 @@ import (
"github.com/hashicorp/vault/logical/framework" "github.com/hashicorp/vault/logical/framework"
) )
func Factory(map[string]string) (logical.Backend, error) { func Factory(*logical.BackendConfig) (logical.Backend, error) {
return Backend(), nil return Backend(), nil
} }

2
builtin/credential/github/backend.go
View File

@@ -9,7 +9,7 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
) )
func Factory(map[string]string) (logical.Backend, error) { func Factory(*logical.BackendConfig) (logical.Backend, error) {
return Backend(), nil return Backend(), nil
} }

5
builtin/credential/ldap/backend.go
View File

@@ -3,12 +3,12 @@ package ldap
import ( import (
"fmt" "fmt"
"github.com/go-ldap/ldap"
"github.com/hashicorp/vault/logical" "github.com/hashicorp/vault/logical"
"github.com/hashicorp/vault/logical/framework" "github.com/hashicorp/vault/logical/framework"
"github.com/go-ldap/ldap"
) )
func Factory(map[string]string) (logical.Backend, error) { func Factory(*logical.BackendConfig) (logical.Backend, error) {
return Backend(), nil return Backend(), nil
} }
@@ -93,7 +93,6 @@ func (b *backend) Login(req *logical.Request, username string, password string)
return nil, logical.ErrorResponse(err.Error()), nil return nil, logical.ErrorResponse(err.Error()), nil
} }
// Try to authenticate to the server using the provided credentials // Try to authenticate to the server using the provided credentials
binddn := fmt.Sprintf("%s=%s,%s", cfg.UserAttr, EscapeLDAPValue(username), cfg.UserDN) binddn := fmt.Sprintf("%s=%s,%s", cfg.UserAttr, EscapeLDAPValue(username), cfg.UserDN)
if err = c.Bind(binddn, password); err != nil { if err = c.Bind(binddn, password); err != nil {

2
builtin/credential/userpass/backend.go
View File

@@ -5,7 +5,7 @@ import (
"github.com/hashicorp/vault/logical/framework" "github.com/hashicorp/vault/logical/framework"
) )
func Factory(map[string]string) (logical.Backend, error) { func Factory(*logical.BackendConfig) (logical.Backend, error) {
return Backend(), nil return Backend(), nil
} }

2
builtin/logical/aws/backend.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/hashicorp/vault/logical/framework" "github.com/hashicorp/vault/logical/framework"
) )
func Factory(map[string]string) (logical.Backend, error) { func Factory(*logical.BackendConfig) (logical.Backend, error) {
return Backend(), nil return Backend(), nil
} }

2
builtin/logical/cassandra/backend.go
View File

@@ -11,7 +11,7 @@ import (
) )
// Factory creates a new backend // Factory creates a new backend
func Factory(map[string]string) (logical.Backend, error) { func Factory(*logical.BackendConfig) (logical.Backend, error) {
return Backend(), nil return Backend(), nil
} }

2
builtin/logical/consul/backend.go
View File

@@ -5,7 +5,7 @@ import (
"github.com/hashicorp/vault/logical/framework" "github.com/hashicorp/vault/logical/framework"
) )
func Factory(map[string]string) (logical.Backend, error) { func Factory(*logical.BackendConfig) (logical.Backend, error) {
return Backend(), nil return Backend(), nil
} }

2
builtin/logical/mysql/backend.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/hashicorp/vault/logical/framework" "github.com/hashicorp/vault/logical/framework"
) )
func Factory(map[string]string) (logical.Backend, error) { func Factory(*logical.BackendConfig) (logical.Backend, error) {
return Backend(), nil return Backend(), nil
} }

2
builtin/logical/pki/backend.go
View File

@@ -10,7 +10,7 @@ import (
) )
// Factory creates a new backend implementing the logical.Backend interface // Factory creates a new backend implementing the logical.Backend interface
func Factory(map[string]string) (logical.Backend, error) { func Factory(*logical.BackendConfig) (logical.Backend, error) {
return Backend(), nil return Backend(), nil
} }

2
builtin/logical/postgresql/backend.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/hashicorp/vault/logical/framework" "github.com/hashicorp/vault/logical/framework"
) )
func Factory(map[string]string) (logical.Backend, error) { func Factory(*logical.BackendConfig) (logical.Backend, error) {
return Backend(), nil return Backend(), nil
} }

2
builtin/logical/transit/backend.go
View File

@@ -5,7 +5,7 @@ import (
"github.com/hashicorp/vault/logical/framework" "github.com/hashicorp/vault/logical/framework"
) )
func Factory(map[string]string) (logical.Backend, error) { func Factory(*logical.BackendConfig) (logical.Backend, error) {
return Backend(), nil return Backend(), nil
} }

2
logical/testing/testing.go
View File

@@ -110,7 +110,7 @@ func Test(t TestT, c TestCase) {
core, err := vault.NewCore(&vault.CoreConfig{ core, err := vault.NewCore(&vault.CoreConfig{
Physical: physical.NewInmem(), Physical: physical.NewInmem(),
LogicalBackends: map[string]logical.Factory{ LogicalBackends: map[string]logical.Factory{
"test": func(map[string]string) (logical.Backend, error) { "test": func(*logical.BackendConfig) (logical.Backend, error) {
return c.Backend, nil return c.Backend, nil
}, },
}, },