Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update vault lib import path #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend.go
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"fmt"

"github.com/hashicorp/vault/logical"
"github.com/hashicorp/vault/logical/framework"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/logical"
)

// New returns a new backend as an interface. This func
Expand Down
4 changes: 2 additions & 2 deletions lookup.go
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"fmt"

"github.com/hashicorp/vault/logical"
"github.com/hashicorp/vault/logical/framework"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/logical"
)

func lookupPaths(b *backend) []*framework.Path {
Expand Down
10 changes: 5 additions & 5 deletions main.go
Expand Up @@ -18,18 +18,18 @@ import (
"log"
"os"

"github.com/hashicorp/vault/helper/pluginutil"
"github.com/hashicorp/vault/logical"
"github.com/hashicorp/vault/logical/plugin"
"github.com/hashicorp/vault/api"
"github.com/hashicorp/vault/sdk/logical"
"github.com/hashicorp/vault/sdk/plugin"
)

func main() {
apiClientMeta := &pluginutil.APIClientMeta{}
apiClientMeta := &api.PluginAPIClientMeta{}
flags := apiClientMeta.FlagSet()
flags.Parse(os.Args[1:]) // Ignore command, strictly parse flags

tlsConfig := apiClientMeta.GetTLSConfig()
tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig)
tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig)

factoryFunc := FactoryType(logical.TypeLogical)
err := plugin.Serve(&plugin.ServeOpts{
Expand Down
4 changes: 2 additions & 2 deletions path_config.go
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"fmt"

"github.com/hashicorp/vault/logical"
"github.com/hashicorp/vault/logical/framework"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/logical"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions path_import.go
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"fmt"

"github.com/hashicorp/vault/logical"
"github.com/hashicorp/vault/logical/framework"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/logical"
)

func importPaths(b *backend) []*framework.Path {
Expand Down
6 changes: 3 additions & 3 deletions path_wallet.go
Expand Up @@ -29,9 +29,9 @@ import (
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/hashicorp/errwrap"
"github.com/hashicorp/vault/helper/cidrutil"
"github.com/hashicorp/vault/logical"
"github.com/hashicorp/vault/logical/framework"
"github.com/hashicorp/vault/sdk/framework"
"github.com/hashicorp/vault/sdk/helper/cidrutil"
"github.com/hashicorp/vault/sdk/logical"
)

// Wallet is a container of BTC-compliant private key
Expand Down