diff --git a/Makefile b/Makefile index 9f20c28bd6..9a6e799a59 100644 --- a/Makefile +++ b/Makefile @@ -147,17 +147,17 @@ static-dist: ember-dist static-assets static-dist-dev: ember-dist-dev static-assets proto: - protoc vault/*.proto --go_out=plugins=grpc:../../.. - protoc helper/storagepacker/types.proto --go_out=plugins=grpc:../../.. - protoc helper/forwarding/types.proto --go_out=plugins=grpc:../../.. - protoc logical/*.proto --go_out=plugins=grpc:../../.. - protoc physical/types.proto --go_out=plugins=grpc:../../.. - protoc helper/identity/mfa/types.proto --go_out=plugins=grpc:../../.. - protoc helper/identity/types.proto --go_out=plugins=grpc:../../.. - protoc builtin/logical/database/dbplugin/*.proto --go_out=plugins=grpc:../../.. - protoc logical/plugin/pb/*.proto --go_out=plugins=grpc:../../.. - sed -i -e 's/Idp/IDP/' -e 's/Url/URL/' -e 's/Id/ID/' -e 's/IDentity/Identity/' -e 's/EntityId/EntityID/' -e 's/Api/API/' -e 's/Qr/QR/' -e 's/Totp/TOTP/' -e 's/Mfa/MFA/' -e 's/Pingid/PingID/' -e 's/protobuf:"/sentinel:"" protobuf:"/' -e 's/namespaceId/namespaceID/' -e 's/Ttl/TTL/' -e 's/BoundCidrs/BoundCIDRs/' helper/identity/types.pb.go helper/identity/mfa/types.pb.go helper/storagepacker/types.pb.go logical/plugin/pb/backend.pb.go logical/identity.pb.go - sed -i -e 's/Iv/IV/' -e 's/Hmac/HMAC/' physical/types.pb.go + protoc vault/*.proto --go_out=plugins=grpc,paths=source_relative:. + protoc helper/storagepacker/types.proto --go_out=plugins=grpc,paths=source_relative:. + protoc helper/forwarding/types.proto --go_out=plugins=grpc,paths=source_relative:. + protoc sdk/logical/*.proto --go_out=plugins=grpc,paths=source_relative:. + protoc sdk/physical/types.proto --go_out=plugins=grpc,paths=source_relative:. + protoc helper/identity/mfa/types.proto --go_out=plugins=grpc,paths=source_relative:. + protoc helper/identity/types.proto --go_out=plugins=grpc,paths=source_relative:. + protoc builtin/logical/database/dbplugin/*.proto --go_out=plugins=grpc,paths=source_relative:. + protoc sdk/plugin/pb/*.proto --go_out=plugins=grpc,paths=source_relative:. + sed -i -e 's/Idp/IDP/' -e 's/Url/URL/' -e 's/Id/ID/' -e 's/IDentity/Identity/' -e 's/EntityId/EntityID/' -e 's/Api/API/' -e 's/Qr/QR/' -e 's/Totp/TOTP/' -e 's/Mfa/MFA/' -e 's/Pingid/PingID/' -e 's/protobuf:"/sentinel:"" protobuf:"/' -e 's/namespaceId/namespaceID/' -e 's/Ttl/TTL/' -e 's/BoundCidrs/BoundCIDRs/' helper/identity/types.pb.go helper/identity/mfa/types.pb.go helper/storagepacker/types.pb.go sdk/plugin/pb/backend.pb.go sdk/logical/identity.pb.go + sed -i -e 's/Iv/IV/' -e 's/Hmac/HMAC/' sdk/physical/types.pb.go fmtcheck: @true diff --git a/api/client.go b/api/client.go index a77ceb863a..f1f076a947 100644 --- a/api/client.go +++ b/api/client.go @@ -19,8 +19,8 @@ import ( cleanhttp "github.com/hashicorp/go-cleanhttp" retryablehttp "github.com/hashicorp/go-retryablehttp" rootcerts "github.com/hashicorp/go-rootcerts" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/parseutil" "golang.org/x/net/http2" "golang.org/x/time/rate" ) diff --git a/api/client_test.go b/api/client_test.go index a1b46411d6..c65a8dc156 100644 --- a/api/client_test.go +++ b/api/client_test.go @@ -2,7 +2,7 @@ package api import ( "bytes" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "io" "net/http" "os" diff --git a/api/go.mod b/api/go.mod new file mode 100644 index 0000000000..9ce4a13783 --- /dev/null +++ b/api/go.mod @@ -0,0 +1,19 @@ +module github.com/hashicorp/vault/api + +go 1.12 + +replace github.com/hashicorp/vault/sdk => ../sdk + +require ( + github.com/hashicorp/errwrap v1.0.0 + github.com/hashicorp/go-cleanhttp v0.5.1 + github.com/hashicorp/go-multierror v1.0.0 + github.com/hashicorp/go-retryablehttp v0.5.3 + github.com/hashicorp/go-rootcerts v1.0.0 + github.com/hashicorp/hcl v1.0.0 + github.com/hashicorp/vault/sdk v0.0.0-00010101000000-000000000000 + github.com/mitchellh/mapstructure v1.1.2 + golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 + golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 + gopkg.in/square/go-jose.v2 v2.3.1 +) diff --git a/api/go.sum b/api/go.sum new file mode 100644 index 0000000000..7031749968 --- /dev/null +++ b/api/go.sum @@ -0,0 +1,124 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= +github.com/hashicorp/go-hclog v0.8.0 h1:z3ollgGRg8RjfJH6UVBaG54R70GFd++QOkvnJH3VSBY= +github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-plugin v1.0.0 h1:/gQ1sNR8/LHpoxKRQq4PmLBuacfZb4tC93e9B30o/7c= +github.com/hashicorp/go-plugin v1.0.0/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= +github.com/hashicorp/go-retryablehttp v0.5.3 h1:QlWt0KvWT0lq8MFppF9tsJGF+ynG7ztc2KIPhzRGk7s= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= +github.com/hashicorp/go-rootcerts v1.0.0 h1:Rqb66Oo1X/eSV1x66xbDccZjhJigjg0+e82kpwzSwCI= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= +github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0= +github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ= +github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= +github.com/mitchellh/go-homedir v1.0.0 h1:vKb8ShqSby24Yrqr/yDYkuFz8d0WUjys40rvnGC8aR0= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= +github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= +github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e h1:nFYrTHrdrAOpShe27kaFHjsqYSEQ0KWqdWLu3xuZJts= +golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db h1:6/JqlYfC1CCaLnGceQTI+sDGhC9UBSPAsBqI0Gun6kU= +golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107 h1:xtNn7qFlagY2mQNFHMSRPjT2RkOV4OXM7P5TVy9xATo= +google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.19.1 h1:TrBcJ1yqAl1G++wO39nD/qtgpsW9/1+QGrluyMGEYgM= +google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +gopkg.in/square/go-jose.v2 v2.3.1 h1:SK5KegNXmKmqE342YYN2qPHEnUYeoMiXXl1poUlI+o4= +gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/api/logical.go b/api/logical.go index d13daac6e9..d212066d86 100644 --- a/api/logical.go +++ b/api/logical.go @@ -9,7 +9,7 @@ import ( "os" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" ) const ( diff --git a/helper/pluginutil/tls.go b/api/plugin_tls.go similarity index 51% rename from helper/pluginutil/tls.go rename to api/plugin_tls.go index 932772637f..b312f6ff87 100644 --- a/helper/pluginutil/tls.go +++ b/api/plugin_tls.go @@ -1,138 +1,74 @@ -package pluginutil +package api import ( - "context" - "crypto/ecdsa" - "crypto/elliptic" - "crypto/rand" "crypto/tls" "crypto/x509" - "crypto/x509/pkix" "encoding/base64" "errors" + "flag" "net/url" "os" - "time" squarejwt "gopkg.in/square/go-jose.v2/jwt" "github.com/hashicorp/errwrap" - uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" ) -var ( - // PluginUnwrapTokenEnv is the ENV name used to pass unwrap tokens to the - // plugin. - PluginUnwrapTokenEnv = "VAULT_UNWRAP_TOKEN" +var () - // PluginCACertPEMEnv is an ENV name used for holding a CA PEM-encoded - // string. Used for testing. - PluginCACertPEMEnv = "VAULT_TESTING_PLUGIN_CA_PEM" -) - -// generateCert is used internally to create certificates for the plugin -// client and server. -func generateCert() ([]byte, *ecdsa.PrivateKey, error) { - key, err := ecdsa.GenerateKey(elliptic.P521(), rand.Reader) - if err != nil { - return nil, nil, err - } - - host, err := uuid.GenerateUUID() - if err != nil { - return nil, nil, err - } - - sn, err := certutil.GenerateSerialNumber() - if err != nil { - return nil, nil, err - } - - template := &x509.Certificate{ - Subject: pkix.Name{ - CommonName: host, - }, - DNSNames: []string{host}, - ExtKeyUsage: []x509.ExtKeyUsage{ - x509.ExtKeyUsageClientAuth, - x509.ExtKeyUsageServerAuth, - }, - KeyUsage: x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment | x509.KeyUsageKeyAgreement, - SerialNumber: sn, - NotBefore: time.Now().Add(-30 * time.Second), - NotAfter: time.Now().Add(262980 * time.Hour), - IsCA: true, - } - - certBytes, err := x509.CreateCertificate(rand.Reader, template, template, key.Public(), key) - if err != nil { - return nil, nil, errwrap.Wrapf("unable to generate client certificate: {{err}}", err) - } - - return certBytes, key, nil +// APIClientMeta is a helper that plugins can use to configure TLS connections +// back to Vault. +type APIClientMeta struct { + // These are set by the command line flags. + flagCACert string + flagCAPath string + flagClientCert string + flagClientKey string + flagInsecure bool } -// createClientTLSConfig creates a signed certificate and returns a configured -// TLS config. -func createClientTLSConfig(certBytes []byte, key *ecdsa.PrivateKey) (*tls.Config, error) { - clientCert, err := x509.ParseCertificate(certBytes) - if err != nil { - return nil, errwrap.Wrapf("error parsing generated plugin certificate: {{err}}", err) - } +// FlagSet returns the flag set for configuring the TLS connection +func (f *APIClientMeta) FlagSet() *flag.FlagSet { + fs := flag.NewFlagSet("vault plugin settings", flag.ContinueOnError) - cert := tls.Certificate{ - Certificate: [][]byte{certBytes}, - PrivateKey: key, - Leaf: clientCert, - } + fs.StringVar(&f.flagCACert, "ca-cert", "", "") + fs.StringVar(&f.flagCAPath, "ca-path", "", "") + fs.StringVar(&f.flagClientCert, "client-cert", "", "") + fs.StringVar(&f.flagClientKey, "client-key", "", "") + fs.BoolVar(&f.flagInsecure, "tls-skip-verify", false, "") - clientCertPool := x509.NewCertPool() - clientCertPool.AddCert(clientCert) - - tlsConfig := &tls.Config{ - Certificates: []tls.Certificate{cert}, - RootCAs: clientCertPool, - ClientCAs: clientCertPool, - ClientAuth: tls.RequireAndVerifyClientCert, - ServerName: clientCert.Subject.CommonName, - MinVersion: tls.VersionTLS12, - } - - tlsConfig.BuildNameToCertificate() - - return tlsConfig, nil + return fs } -// wrapServerConfig is used to create a server certificate and private key, then -// wrap them in an unwrap token for later retrieval by the plugin. -func wrapServerConfig(ctx context.Context, sys RunnerUtil, certBytes []byte, key *ecdsa.PrivateKey) (string, error) { - rawKey, err := x509.MarshalECPrivateKey(key) - if err != nil { - return "", err +// GetTLSConfig will return a TLSConfig based off the values from the flags +func (f *APIClientMeta) GetTLSConfig() *TLSConfig { + // If we need custom TLS configuration, then set it + if f.flagCACert != "" || f.flagCAPath != "" || f.flagClientCert != "" || f.flagClientKey != "" || f.flagInsecure { + t := &TLSConfig{ + CACert: f.flagCACert, + CAPath: f.flagCAPath, + ClientCert: f.flagClientCert, + ClientKey: f.flagClientKey, + TLSServerName: "", + Insecure: f.flagInsecure, + } + + return t } - wrapInfo, err := sys.ResponseWrapData(ctx, map[string]interface{}{ - "ServerCert": certBytes, - "ServerKey": rawKey, - }, time.Second*60, true) - if err != nil { - return "", err - } - - return wrapInfo.Token, nil + return nil } // VaultPluginTLSProvider is run inside a plugin and retrieves the response // wrapped TLS certificate from vault. It returns a configured TLS Config. -func VaultPluginTLSProvider(apiTLSConfig *api.TLSConfig) func() (*tls.Config, error) { - if os.Getenv(PluginMetadataModeEnv) == "true" { +func VaultPluginTLSProvider(apiTLSConfig *TLSConfig) func() (*tls.Config, error) { + if os.Getenv(pluginutil.PluginMetadataModeEnv) == "true" { return nil } return func() (*tls.Config, error) { - unwrapToken := os.Getenv(PluginUnwrapTokenEnv) + unwrapToken := os.Getenv(pluginutil.PluginUnwrapTokenEnv) parsedJWT, err := squarejwt.ParseSigned(unwrapToken) if err != nil { @@ -162,7 +98,7 @@ func VaultPluginTLSProvider(apiTLSConfig *api.TLSConfig) func() (*tls.Config, er } // Unwrap the token - clientConf := api.DefaultConfig() + clientConf := DefaultConfig() clientConf.Address = vaultAddr if apiTLSConfig != nil { err := clientConf.ConfigureTLS(apiTLSConfig) @@ -170,7 +106,7 @@ func VaultPluginTLSProvider(apiTLSConfig *api.TLSConfig) func() (*tls.Config, er return nil, errwrap.Wrapf("error configuring api client {{err}}", err) } } - client, err := api.NewClient(clientConf) + client, err := NewClient(clientConf) if err != nil { return nil, errwrap.Wrapf("error during api client creation: {{err}}", err) } diff --git a/api/request.go b/api/request.go index 4efa2aa841..0ed04220e3 100644 --- a/api/request.go +++ b/api/request.go @@ -8,7 +8,7 @@ import ( "net/http" "net/url" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" retryablehttp "github.com/hashicorp/go-retryablehttp" ) diff --git a/api/response.go b/api/response.go index 053a277238..f224972d58 100644 --- a/api/response.go +++ b/api/response.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "net/http" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" ) // Response is a raw response that wraps an HTTP response. diff --git a/api/secret.go b/api/secret.go index c8a0ba3d9d..aaca78c8e3 100644 --- a/api/secret.go +++ b/api/secret.go @@ -7,8 +7,8 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" ) // Secret is the structure returned for every secret within Vault. diff --git a/api/ssh_agent.go b/api/ssh_agent.go index b8e82224ca..a4348ca2ed 100644 --- a/api/ssh_agent.go +++ b/api/ssh_agent.go @@ -14,7 +14,7 @@ import ( rootcerts "github.com/hashicorp/go-rootcerts" "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" - "github.com/hashicorp/vault/helper/hclutil" + "github.com/hashicorp/vault/sdk/helper/hclutil" "github.com/mitchellh/mapstructure" ) diff --git a/api/sys_plugins.go b/api/sys_plugins.go index ebfcfbfc02..0ab022ba09 100644 --- a/api/sys_plugins.go +++ b/api/sys_plugins.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/mitchellh/mapstructure" ) diff --git a/audit/audit.go b/audit/audit.go index fed7033500..beaa909185 100644 --- a/audit/audit.go +++ b/audit/audit.go @@ -3,8 +3,8 @@ package audit import ( "context" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" ) // Backend interface must be implemented for an audit diff --git a/audit/format.go b/audit/format.go index 101fbf3cb2..7cbf771a70 100644 --- a/audit/format.go +++ b/audit/format.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" "github.com/mitchellh/copystructure" ) diff --git a/audit/format_json.go b/audit/format_json.go index f42ab20d38..4003c05a72 100644 --- a/audit/format_json.go +++ b/audit/format_json.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/hashicorp/vault/helper/salt" + "github.com/hashicorp/vault/sdk/helper/salt" ) // JSONFormatWriter is an AuditFormatWriter implementation that structures data into diff --git a/audit/format_json_test.go b/audit/format_json_test.go index 42f177306d..691ddd2fbe 100644 --- a/audit/format_json_test.go +++ b/audit/format_json_test.go @@ -12,10 +12,10 @@ import ( "fmt" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" ) func TestFormatJSON_formatRequest(t *testing.T) { diff --git a/audit/format_jsonx.go b/audit/format_jsonx.go index 30937464df..bff244099a 100644 --- a/audit/format_jsonx.go +++ b/audit/format_jsonx.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/hashicorp/vault/helper/salt" + "github.com/hashicorp/vault/sdk/helper/salt" "github.com/jefferai/jsonx" ) diff --git a/audit/format_jsonx_test.go b/audit/format_jsonx_test.go index 1fc37e904c..ce4b85a7c7 100644 --- a/audit/format_jsonx_test.go +++ b/audit/format_jsonx_test.go @@ -12,8 +12,8 @@ import ( "fmt" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" ) func TestFormatJSONx_formatRequest(t *testing.T) { diff --git a/audit/format_test.go b/audit/format_test.go index e0bd68f0b3..264fb334c1 100644 --- a/audit/format_test.go +++ b/audit/format_test.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "testing" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" ) type noopFormatWriter struct { diff --git a/audit/hashstructure.go b/audit/hashstructure.go index be1aad97ef..e5035581cf 100644 --- a/audit/hashstructure.go +++ b/audit/hashstructure.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/helper/wrapping" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/wrapping" + "github.com/hashicorp/vault/sdk/logical" "github.com/mitchellh/copystructure" "github.com/mitchellh/reflectwalk" ) diff --git a/audit/hashstructure_test.go b/audit/hashstructure_test.go index 05c9c289bf..2f50ef6136 100644 --- a/audit/hashstructure_test.go +++ b/audit/hashstructure_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/helper/wrapping" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/helper/wrapping" + "github.com/hashicorp/vault/sdk/logical" "github.com/mitchellh/copystructure" ) diff --git a/builtin/audit/file/backend.go b/builtin/audit/file/backend.go index 90c5febfa8..4023f12d45 100644 --- a/builtin/audit/file/backend.go +++ b/builtin/audit/file/backend.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/audit" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" ) func Factory(ctx context.Context, conf *audit.BackendConfig) (audit.Backend, error) { diff --git a/builtin/audit/file/backend_test.go b/builtin/audit/file/backend_test.go index c11ab95ea1..ed335f790a 100644 --- a/builtin/audit/file/backend_test.go +++ b/builtin/audit/file/backend_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/hashicorp/vault/audit" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" ) func TestAuditFile_fileModeNew(t *testing.T) { diff --git a/builtin/audit/socket/backend.go b/builtin/audit/socket/backend.go index 64e499b46d..3eb9fdde61 100644 --- a/builtin/audit/socket/backend.go +++ b/builtin/audit/socket/backend.go @@ -11,9 +11,9 @@ import ( multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/vault/audit" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" ) func Factory(ctx context.Context, conf *audit.BackendConfig) (audit.Backend, error) { diff --git a/builtin/audit/syslog/backend.go b/builtin/audit/syslog/backend.go index 6f388bdcf4..b72c06a91f 100644 --- a/builtin/audit/syslog/backend.go +++ b/builtin/audit/syslog/backend.go @@ -9,8 +9,8 @@ import ( gsyslog "github.com/hashicorp/go-syslog" "github.com/hashicorp/vault/audit" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" ) func Factory(ctx context.Context, conf *audit.BackendConfig) (audit.Backend, error) { diff --git a/builtin/credential/app-id/backend.go b/builtin/credential/app-id/backend.go index 32ec158754..4f094bc54f 100644 --- a/builtin/credential/app-id/backend.go +++ b/builtin/credential/app-id/backend.go @@ -4,9 +4,9 @@ import ( "context" "sync" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { diff --git a/builtin/credential/app-id/backend_test.go b/builtin/credential/app-id/backend_test.go index 68a5e31d94..fceac52536 100644 --- a/builtin/credential/app-id/backend_test.go +++ b/builtin/credential/app-id/backend_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" ) func TestBackend_basic(t *testing.T) { diff --git a/builtin/credential/app-id/cmd/app-id/main.go b/builtin/credential/app-id/cmd/app-id/main.go index f7b95a82a9..f75d9d1835 100644 --- a/builtin/credential/app-id/cmd/app-id/main.go +++ b/builtin/credential/app-id/cmd/app-id/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" appId "github.com/hashicorp/vault/builtin/credential/app-id" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: appId.Factory, diff --git a/builtin/credential/app-id/path_login.go b/builtin/credential/app-id/path_login.go index ec744b2832..f5f0816f44 100644 --- a/builtin/credential/app-id/path_login.go +++ b/builtin/credential/app-id/path_login.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathLoginWithAppIDPath(b *backend) *framework.Path { diff --git a/builtin/credential/approle/backend.go b/builtin/credential/approle/backend.go index 514ea4c635..4963eecbbd 100644 --- a/builtin/credential/approle/backend.go +++ b/builtin/credential/approle/backend.go @@ -5,11 +5,11 @@ import ( "sync" "time" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/locksutil" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/locksutil" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/builtin/credential/approle/backend_test.go b/builtin/credential/approle/backend_test.go index 35d4b55440..a23f4c3642 100644 --- a/builtin/credential/approle/backend_test.go +++ b/builtin/credential/approle/backend_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func createBackendWithStorage(t *testing.T) (*backend, logical.Storage) { diff --git a/builtin/credential/approle/cmd/approle/main.go b/builtin/credential/approle/cmd/approle/main.go index b6d9db09c8..ac8141c640 100644 --- a/builtin/credential/approle/cmd/approle/main.go +++ b/builtin/credential/approle/cmd/approle/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/credential/approle" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: approle.Factory, diff --git a/builtin/credential/approle/path_login.go b/builtin/credential/approle/path_login.go index e8c9ad7e9a..87527f7744 100644 --- a/builtin/credential/approle/path_login.go +++ b/builtin/credential/approle/path_login.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/helper/cidrutil" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathLogin(b *backend) *framework.Path { diff --git a/builtin/credential/approle/path_login_test.go b/builtin/credential/approle/path_login_test.go index b1c7af715d..da6d4efaba 100644 --- a/builtin/credential/approle/path_login_test.go +++ b/builtin/credential/approle/path_login_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestAppRole_BoundCIDRLogin(t *testing.T) { diff --git a/builtin/credential/approle/path_role.go b/builtin/credential/approle/path_role.go index 2dc31d4eff..7853d83f75 100644 --- a/builtin/credential/approle/path_role.go +++ b/builtin/credential/approle/path_role.go @@ -10,12 +10,12 @@ import ( "github.com/hashicorp/errwrap" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/helper/cidrutil" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/locksutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/locksutil" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // roleStorageEntry stores all the options that are set on an role diff --git a/builtin/credential/approle/path_role_test.go b/builtin/credential/approle/path_role_test.go index 6ffa055195..a1b1188a67 100644 --- a/builtin/credential/approle/path_role_test.go +++ b/builtin/credential/approle/path_role_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/credential/approle/path_tidy_user_id.go b/builtin/credential/approle/path_tidy_user_id.go index 56f4a608b2..67c52fc0f1 100644 --- a/builtin/credential/approle/path_tidy_user_id.go +++ b/builtin/credential/approle/path_tidy_user_id.go @@ -8,9 +8,9 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathTidySecretID(b *backend) *framework.Path { diff --git a/builtin/credential/approle/path_tidy_user_id_test.go b/builtin/credential/approle/path_tidy_user_id_test.go index f8df51ab69..b6b2b31cef 100644 --- a/builtin/credential/approle/path_tidy_user_id_test.go +++ b/builtin/credential/approle/path_tidy_user_id_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestAppRole_TidyDanglingAccessors_Normal(t *testing.T) { diff --git a/builtin/credential/approle/validation.go b/builtin/credential/approle/validation.go index fd3a079f73..16b0cb5977 100644 --- a/builtin/credential/approle/validation.go +++ b/builtin/credential/approle/validation.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/errwrap" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/helper/cidrutil" - "github.com/hashicorp/vault/helper/locksutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/locksutil" + "github.com/hashicorp/vault/sdk/logical" ) // secretIDStorageEntry represents the information stored in storage diff --git a/builtin/credential/approle/validation_test.go b/builtin/credential/approle/validation_test.go index 10392d0738..ff325f4b1b 100644 --- a/builtin/credential/approle/validation_test.go +++ b/builtin/credential/approle/validation_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestAppRole_SecretIDNumUsesUpgrade(t *testing.T) { diff --git a/builtin/credential/aws/backend.go b/builtin/credential/aws/backend.go index f813aa9fd3..abc9c7cd34 100644 --- a/builtin/credential/aws/backend.go +++ b/builtin/credential/aws/backend.go @@ -10,9 +10,9 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/vault/helper/awsutil" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" cache "github.com/patrickmn/go-cache" ) diff --git a/builtin/credential/aws/backend_test.go b/builtin/credential/aws/backend_test.go index 8cdf0f5abe..3713d151b9 100644 --- a/builtin/credential/aws/backend_test.go +++ b/builtin/credential/aws/backend_test.go @@ -15,9 +15,9 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/sts" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" ) const testVaultHeaderValue = "VaultAcceptanceTesting" diff --git a/builtin/credential/aws/client.go b/builtin/credential/aws/client.go index b8e0727d05..3f510d5ccd 100644 --- a/builtin/credential/aws/client.go +++ b/builtin/credential/aws/client.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/errwrap" cleanhttp "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/vault/helper/awsutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) // getRawClientConfig creates a aws-sdk-go config, which is used to create client diff --git a/builtin/credential/aws/cmd/aws/main.go b/builtin/credential/aws/cmd/aws/main.go index a9438ac4ee..6020d9ef08 100644 --- a/builtin/credential/aws/cmd/aws/main.go +++ b/builtin/credential/aws/cmd/aws/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" awsauth "github.com/hashicorp/vault/builtin/credential/aws" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: awsauth.Factory, diff --git a/builtin/credential/aws/path_config_certificate.go b/builtin/credential/aws/path_config_certificate.go index 1f5a842b29..f66e61d425 100644 --- a/builtin/credential/aws/path_config_certificate.go +++ b/builtin/credential/aws/path_config_certificate.go @@ -9,8 +9,8 @@ import ( "math/big" "strings" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // dsaSignature represents the contents of the signature of a signed diff --git a/builtin/credential/aws/path_config_client.go b/builtin/credential/aws/path_config_client.go index 05315ee67f..e1e90053a6 100644 --- a/builtin/credential/aws/path_config_client.go +++ b/builtin/credential/aws/path_config_client.go @@ -4,8 +4,8 @@ import ( "context" "github.com/aws/aws-sdk-go/aws" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigClient(b *backend) *framework.Path { diff --git a/builtin/credential/aws/path_config_client_test.go b/builtin/credential/aws/path_config_client_test.go index 3c2371de4a..ab6fa9b45a 100644 --- a/builtin/credential/aws/path_config_client_test.go +++ b/builtin/credential/aws/path_config_client_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestBackend_pathConfigClient(t *testing.T) { diff --git a/builtin/credential/aws/path_config_identity.go b/builtin/credential/aws/path_config_identity.go index 8018bff6df..638f43c2b5 100644 --- a/builtin/credential/aws/path_config_identity.go +++ b/builtin/credential/aws/path_config_identity.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigIdentity(b *backend) *framework.Path { diff --git a/builtin/credential/aws/path_config_identity_test.go b/builtin/credential/aws/path_config_identity_test.go index 835bc81a2a..19e919fb11 100644 --- a/builtin/credential/aws/path_config_identity_test.go +++ b/builtin/credential/aws/path_config_identity_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestBackend_pathConfigIdentity(t *testing.T) { diff --git a/builtin/credential/aws/path_config_sts.go b/builtin/credential/aws/path_config_sts.go index 23816846cf..ab3011ff2c 100644 --- a/builtin/credential/aws/path_config_sts.go +++ b/builtin/credential/aws/path_config_sts.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // awsStsEntry is used to store details of an STS role for assumption diff --git a/builtin/credential/aws/path_config_tidy_identity_whitelist.go b/builtin/credential/aws/path_config_tidy_identity_whitelist.go index aeedfea226..de17a0567c 100644 --- a/builtin/credential/aws/path_config_tidy_identity_whitelist.go +++ b/builtin/credential/aws/path_config_tidy_identity_whitelist.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/builtin/credential/aws/path_config_tidy_roletag_blacklist.go b/builtin/credential/aws/path_config_tidy_roletag_blacklist.go index 0c52c53dd8..14a90fa18e 100644 --- a/builtin/credential/aws/path_config_tidy_roletag_blacklist.go +++ b/builtin/credential/aws/path_config_tidy_roletag_blacklist.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/builtin/credential/aws/path_identity_whitelist.go b/builtin/credential/aws/path_identity_whitelist.go index 54587e70e1..c683a9a62d 100644 --- a/builtin/credential/aws/path_identity_whitelist.go +++ b/builtin/credential/aws/path_identity_whitelist.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathIdentityWhitelist(b *backend) *framework.Path { diff --git a/builtin/credential/aws/path_login.go b/builtin/credential/aws/path_login.go index f08357b9ff..7a57219c85 100644 --- a/builtin/credential/aws/path_login.go +++ b/builtin/credential/aws/path_login.go @@ -23,10 +23,10 @@ import ( cleanhttp "github.com/hashicorp/go-cleanhttp" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/helper/awsutil" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/builtin/credential/aws/path_login_test.go b/builtin/credential/aws/path_login_test.go index 2e26e7279b..d0c69cfce0 100644 --- a/builtin/credential/aws/path_login_test.go +++ b/builtin/credential/aws/path_login_test.go @@ -12,7 +12,7 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/sts" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestBackend_pathLogin_getCallerIdentityResponse(t *testing.T) { diff --git a/builtin/credential/aws/path_role.go b/builtin/credential/aws/path_role.go index 25cc296fa7..6efc493865 100644 --- a/builtin/credential/aws/path_role.go +++ b/builtin/credential/aws/path_role.go @@ -8,10 +8,10 @@ import ( "github.com/hashicorp/errwrap" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) var ( diff --git a/builtin/credential/aws/path_role_tag.go b/builtin/credential/aws/path_role_tag.go index a155bebb97..914c2dc4a8 100644 --- a/builtin/credential/aws/path_role_tag.go +++ b/builtin/credential/aws/path_role_tag.go @@ -13,9 +13,9 @@ import ( uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const roleTagVersion = "v1" diff --git a/builtin/credential/aws/path_role_test.go b/builtin/credential/aws/path_role_test.go index 65462b8b21..91a36bc49a 100644 --- a/builtin/credential/aws/path_role_test.go +++ b/builtin/credential/aws/path_role_test.go @@ -9,8 +9,8 @@ import ( "github.com/go-test/deep" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" ) func TestBackend_pathRoleEc2(t *testing.T) { diff --git a/builtin/credential/aws/path_roletag_blacklist.go b/builtin/credential/aws/path_roletag_blacklist.go index 6a8b2471d4..279135774a 100644 --- a/builtin/credential/aws/path_roletag_blacklist.go +++ b/builtin/credential/aws/path_roletag_blacklist.go @@ -5,8 +5,8 @@ import ( "encoding/base64" "time" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathRoletagBlacklist(b *backend) *framework.Path { diff --git a/builtin/credential/aws/path_tidy_identity_whitelist.go b/builtin/credential/aws/path_tidy_identity_whitelist.go index a255b2ce35..07b29cb694 100644 --- a/builtin/credential/aws/path_tidy_identity_whitelist.go +++ b/builtin/credential/aws/path_tidy_identity_whitelist.go @@ -8,9 +8,9 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathTidyIdentityWhitelist(b *backend) *framework.Path { diff --git a/builtin/credential/aws/path_tidy_roletag_blacklist.go b/builtin/credential/aws/path_tidy_roletag_blacklist.go index 5e5bfd14e6..dc9839da42 100644 --- a/builtin/credential/aws/path_tidy_roletag_blacklist.go +++ b/builtin/credential/aws/path_tidy_roletag_blacklist.go @@ -8,9 +8,9 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathTidyRoletagBlacklist(b *backend) *framework.Path { diff --git a/builtin/credential/cert/backend.go b/builtin/credential/cert/backend.go index 8b4c808e25..d5ec063e2a 100644 --- a/builtin/credential/cert/backend.go +++ b/builtin/credential/cert/backend.go @@ -5,8 +5,8 @@ import ( "strings" "sync" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { diff --git a/builtin/credential/cert/backend_test.go b/builtin/credential/cert/backend_test.go index 4e494271a9..48769cd3d6 100644 --- a/builtin/credential/cert/backend_test.go +++ b/builtin/credential/cert/backend_test.go @@ -36,10 +36,10 @@ import ( rootcerts "github.com/hashicorp/go-rootcerts" "github.com/hashicorp/vault/builtin/logical/pki" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/hashicorp/vault/vault" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/credential/cert/cmd/cert/main.go b/builtin/credential/cert/cmd/cert/main.go index 1c7dad47d2..6a922ec242 100644 --- a/builtin/credential/cert/cmd/cert/main.go +++ b/builtin/credential/cert/cmd/cert/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/credential/cert" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: cert.Factory, diff --git a/builtin/credential/cert/path_certs.go b/builtin/credential/cert/path_certs.go index 53f0254b33..3762067228 100644 --- a/builtin/credential/cert/path_certs.go +++ b/builtin/credential/cert/path_certs.go @@ -8,10 +8,10 @@ import ( "time" sockaddr "github.com/hashicorp/go-sockaddr" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathListCerts(b *backend) *framework.Path { diff --git a/builtin/credential/cert/path_config.go b/builtin/credential/cert/path_config.go index 514a65b49c..2bc7a8b4bc 100644 --- a/builtin/credential/cert/path_config.go +++ b/builtin/credential/cert/path_config.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfig(b *backend) *framework.Path { diff --git a/builtin/credential/cert/path_crls.go b/builtin/credential/cert/path_crls.go index 06ced5705f..d0ede783a3 100644 --- a/builtin/credential/cert/path_crls.go +++ b/builtin/credential/cert/path_crls.go @@ -9,9 +9,9 @@ import ( "github.com/fatih/structs" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathCRLs(b *backend) *framework.Path { diff --git a/builtin/credential/cert/path_login.go b/builtin/credential/cert/path_login.go index 4ef6cefe1c..54156eb562 100644 --- a/builtin/credential/cert/path_login.go +++ b/builtin/credential/cert/path_login.go @@ -12,10 +12,10 @@ import ( "fmt" "strings" - "github.com/hashicorp/vault/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/certutil" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/hashicorp/vault/helper/cidrutil" glob "github.com/ryanuber/go-glob" diff --git a/builtin/credential/github/backend.go b/builtin/credential/github/backend.go index b0ad6bb404..a66b7978d5 100644 --- a/builtin/credential/github/backend.go +++ b/builtin/credential/github/backend.go @@ -6,8 +6,8 @@ import ( "github.com/google/go-github/github" cleanhttp "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/vault/helper/mfa" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "golang.org/x/oauth2" ) diff --git a/builtin/credential/github/backend_test.go b/builtin/credential/github/backend_test.go index 05ed630ce2..01793dd6cd 100644 --- a/builtin/credential/github/backend_test.go +++ b/builtin/credential/github/backend_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" ) func TestBackend_Config(t *testing.T) { diff --git a/builtin/credential/github/cmd/github/main.go b/builtin/credential/github/cmd/github/main.go index 76998a175c..d0bd78b00b 100644 --- a/builtin/credential/github/cmd/github/main.go +++ b/builtin/credential/github/cmd/github/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/credential/github" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: github.Factory, diff --git a/builtin/credential/github/path_config.go b/builtin/credential/github/path_config.go index b590746863..59e9784673 100644 --- a/builtin/credential/github/path_config.go +++ b/builtin/credential/github/path_config.go @@ -7,8 +7,8 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfig(b *backend) *framework.Path { diff --git a/builtin/credential/github/path_login.go b/builtin/credential/github/path_login.go index b6e59cfd0d..cc3e43cef4 100644 --- a/builtin/credential/github/path_login.go +++ b/builtin/credential/github/path_login.go @@ -9,8 +9,8 @@ import ( "github.com/google/go-github/github" "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathLogin(b *backend) *framework.Path { diff --git a/builtin/credential/ldap/backend.go b/builtin/credential/ldap/backend.go index 817e0c97ca..72acbde4fe 100644 --- a/builtin/credential/ldap/backend.go +++ b/builtin/credential/ldap/backend.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/vault/helper/ldaputil" "github.com/hashicorp/vault/helper/mfa" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { diff --git a/builtin/credential/ldap/backend_test.go b/builtin/credential/ldap/backend_test.go index f4702a6c9c..49c1eb7856 100644 --- a/builtin/credential/ldap/backend_test.go +++ b/builtin/credential/ldap/backend_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/credential/ldap/cmd/ldap/main.go b/builtin/credential/ldap/cmd/ldap/main.go index 1f46a7b37c..95baf2f4bc 100644 --- a/builtin/credential/ldap/cmd/ldap/main.go +++ b/builtin/credential/ldap/cmd/ldap/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/credential/ldap" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: ldap.Factory, diff --git a/builtin/credential/ldap/path_config.go b/builtin/credential/ldap/path_config.go index f2776b1a03..cc9c068e2c 100644 --- a/builtin/credential/ldap/path_config.go +++ b/builtin/credential/ldap/path_config.go @@ -3,10 +3,10 @@ package ldap import ( "context" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/ldaputil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfig(b *backend) *framework.Path { diff --git a/builtin/credential/ldap/path_groups.go b/builtin/credential/ldap/path_groups.go index daf6b7e710..d0ef2d15da 100644 --- a/builtin/credential/ldap/path_groups.go +++ b/builtin/credential/ldap/path_groups.go @@ -5,8 +5,8 @@ import ( "strings" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathGroupsList(b *backend) *framework.Path { diff --git a/builtin/credential/ldap/path_login.go b/builtin/credential/ldap/path_login.go index 114f20a908..4b09af81de 100644 --- a/builtin/credential/ldap/path_login.go +++ b/builtin/credential/ldap/path_login.go @@ -6,8 +6,8 @@ import ( "sort" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathLogin(b *backend) *framework.Path { diff --git a/builtin/credential/ldap/path_users.go b/builtin/credential/ldap/path_users.go index 6fe3279256..fbfeb3169f 100644 --- a/builtin/credential/ldap/path_users.go +++ b/builtin/credential/ldap/path_users.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathUsersList(b *backend) *framework.Path { diff --git a/builtin/credential/okta/backend.go b/builtin/credential/okta/backend.go index 1080f520f6..0c6f2d1d31 100644 --- a/builtin/credential/okta/backend.go +++ b/builtin/credential/okta/backend.go @@ -7,8 +7,8 @@ import ( "github.com/chrismalek/oktasdk-go/okta" "github.com/hashicorp/vault/helper/mfa" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { diff --git a/builtin/credential/okta/backend_test.go b/builtin/credential/okta/backend_test.go index e19c56852a..662ce80e3b 100644 --- a/builtin/credential/okta/backend_test.go +++ b/builtin/credential/okta/backend_test.go @@ -8,13 +8,13 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/helper/policyutil" "time" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" ) func TestBackend_Config(t *testing.T) { diff --git a/builtin/credential/okta/cmd/okta/main.go b/builtin/credential/okta/cmd/okta/main.go index 19d7f60748..b43b2c9234 100644 --- a/builtin/credential/okta/cmd/okta/main.go +++ b/builtin/credential/okta/cmd/okta/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/credential/okta" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: okta.Factory, diff --git a/builtin/credential/okta/path_config.go b/builtin/credential/okta/path_config.go index 02785812e5..1d61f63abf 100644 --- a/builtin/credential/okta/path_config.go +++ b/builtin/credential/okta/path_config.go @@ -9,8 +9,8 @@ import ( "github.com/chrismalek/oktasdk-go/okta" cleanhttp "github.com/hashicorp/go-cleanhttp" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/builtin/credential/okta/path_groups.go b/builtin/credential/okta/path_groups.go index cbe3b3794f..91a099cfb5 100644 --- a/builtin/credential/okta/path_groups.go +++ b/builtin/credential/okta/path_groups.go @@ -5,8 +5,8 @@ import ( "strings" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathGroupsList(b *backend) *framework.Path { diff --git a/builtin/credential/okta/path_login.go b/builtin/credential/okta/path_login.go index af784e015d..230c9f68ad 100644 --- a/builtin/credential/okta/path_login.go +++ b/builtin/credential/okta/path_login.go @@ -8,8 +8,8 @@ import ( "github.com/go-errors/errors" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathLogin(b *backend) *framework.Path { diff --git a/builtin/credential/okta/path_users.go b/builtin/credential/okta/path_users.go index b815825cea..3be31bcadb 100644 --- a/builtin/credential/okta/path_users.go +++ b/builtin/credential/okta/path_users.go @@ -3,8 +3,8 @@ package okta import ( "context" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathUsersList(b *backend) *framework.Path { diff --git a/builtin/credential/radius/backend.go b/builtin/credential/radius/backend.go index 2681f3d5f4..7aa06f7d6c 100644 --- a/builtin/credential/radius/backend.go +++ b/builtin/credential/radius/backend.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/vault/helper/mfa" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { diff --git a/builtin/credential/radius/backend_test.go b/builtin/credential/radius/backend_test.go index 3f4f143fe3..95b44a467d 100644 --- a/builtin/credential/radius/backend_test.go +++ b/builtin/credential/radius/backend_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/ory/dockertest" ) diff --git a/builtin/credential/radius/cmd/radius/main.go b/builtin/credential/radius/cmd/radius/main.go index b79910766d..f438bceaab 100644 --- a/builtin/credential/radius/cmd/radius/main.go +++ b/builtin/credential/radius/cmd/radius/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/credential/radius" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: radius.Factory, diff --git a/builtin/credential/radius/path_config.go b/builtin/credential/radius/path_config.go index e59f180372..0cdc627661 100644 --- a/builtin/credential/radius/path_config.go +++ b/builtin/credential/radius/path_config.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfig(b *backend) *framework.Path { diff --git a/builtin/credential/radius/path_login.go b/builtin/credential/radius/path_login.go index 2cf2fa2f61..3c800e9906 100644 --- a/builtin/credential/radius/path_login.go +++ b/builtin/credential/radius/path_login.go @@ -12,8 +12,8 @@ import ( . "layeh.com/radius/rfc2865" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathLogin(b *backend) *framework.Path { diff --git a/builtin/credential/radius/path_users.go b/builtin/credential/radius/path_users.go index 00e36a5bf7..3075c502e6 100644 --- a/builtin/credential/radius/path_users.go +++ b/builtin/credential/radius/path_users.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathUsersList(b *backend) *framework.Path { diff --git a/builtin/credential/userpass/backend.go b/builtin/credential/userpass/backend.go index 19e62cf7a6..9a70749ae2 100644 --- a/builtin/credential/userpass/backend.go +++ b/builtin/credential/userpass/backend.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/vault/helper/mfa" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { diff --git a/builtin/credential/userpass/backend_test.go b/builtin/credential/userpass/backend_test.go index fcca9273b4..489b10cda4 100644 --- a/builtin/credential/userpass/backend_test.go +++ b/builtin/credential/userpass/backend_test.go @@ -10,8 +10,8 @@ import ( "crypto/tls" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/credential/userpass/cmd/userpass/main.go b/builtin/credential/userpass/cmd/userpass/main.go index e5fd68293f..67375adcdf 100644 --- a/builtin/credential/userpass/cmd/userpass/main.go +++ b/builtin/credential/userpass/cmd/userpass/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/credential/userpass" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: userpass.Factory, diff --git a/builtin/credential/userpass/path_login.go b/builtin/credential/userpass/path_login.go index 8c8b92e032..c661b4f053 100644 --- a/builtin/credential/userpass/path_login.go +++ b/builtin/credential/userpass/path_login.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/vault/helper/cidrutil" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "golang.org/x/crypto/bcrypt" ) diff --git a/builtin/credential/userpass/path_user_password.go b/builtin/credential/userpass/path_user_password.go index 0d47db3cb5..83a990fbda 100644 --- a/builtin/credential/userpass/path_user_password.go +++ b/builtin/credential/userpass/path_user_password.go @@ -6,8 +6,8 @@ import ( "golang.org/x/crypto/bcrypt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathUserPassword(b *backend) *framework.Path { diff --git a/builtin/credential/userpass/path_user_policies.go b/builtin/credential/userpass/path_user_policies.go index f23e35df3b..c3a0dc686e 100644 --- a/builtin/credential/userpass/path_user_policies.go +++ b/builtin/credential/userpass/path_user_policies.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathUserPolicies(b *backend) *framework.Path { diff --git a/builtin/credential/userpass/path_users.go b/builtin/credential/userpass/path_users.go index b9603ee7a6..da8dff9324 100644 --- a/builtin/credential/userpass/path_users.go +++ b/builtin/credential/userpass/path_users.go @@ -7,10 +7,10 @@ import ( "time" sockaddr "github.com/hashicorp/go-sockaddr" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathUsersList(b *backend) *framework.Path { diff --git a/builtin/logical/aws/backend.go b/builtin/logical/aws/backend.go index f19b46aeaa..c4caca40a4 100644 --- a/builtin/logical/aws/backend.go +++ b/builtin/logical/aws/backend.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/service/iam/iamiface" "github.com/aws/aws-sdk-go/service/sts/stsiface" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { diff --git a/builtin/logical/aws/backend_test.go b/builtin/logical/aws/backend_test.go index 6ec153cfd4..28d33ae050 100644 --- a/builtin/logical/aws/backend_test.go +++ b/builtin/logical/aws/backend_test.go @@ -22,8 +22,8 @@ import ( "github.com/aws/aws-sdk-go/service/sts" cleanhttp "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/vault/helper/testhelpers" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/logical/aws/client.go b/builtin/logical/aws/client.go index 711063de98..2575289653 100644 --- a/builtin/logical/aws/client.go +++ b/builtin/logical/aws/client.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/errwrap" cleanhttp "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/vault/helper/awsutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) // NOTE: The caller is required to ensure that b.clientMutex is at least read locked diff --git a/builtin/logical/aws/cmd/aws/main.go b/builtin/logical/aws/cmd/aws/main.go index fc3487ee20..0012f9af17 100644 --- a/builtin/logical/aws/cmd/aws/main.go +++ b/builtin/logical/aws/cmd/aws/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/logical/aws" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: aws.Factory, diff --git a/builtin/logical/aws/path_config_lease.go b/builtin/logical/aws/path_config_lease.go index 86fa47f38a..eba575de63 100644 --- a/builtin/logical/aws/path_config_lease.go +++ b/builtin/logical/aws/path_config_lease.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigLease(b *backend) *framework.Path { diff --git a/builtin/logical/aws/path_config_root.go b/builtin/logical/aws/path_config_root.go index 51e353787b..50542d9467 100644 --- a/builtin/logical/aws/path_config_root.go +++ b/builtin/logical/aws/path_config_root.go @@ -4,8 +4,8 @@ import ( "context" "github.com/aws/aws-sdk-go/aws" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigRoot(b *backend) *framework.Path { diff --git a/builtin/logical/aws/path_config_rotate_root.go b/builtin/logical/aws/path_config_rotate_root.go index a69c342e0b..d9ff036ccb 100644 --- a/builtin/logical/aws/path_config_rotate_root.go +++ b/builtin/logical/aws/path_config_rotate_root.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigRotateRoot(b *backend) *framework.Path { diff --git a/builtin/logical/aws/path_roles.go b/builtin/logical/aws/path_roles.go index 87f94374e9..fe190a892b 100644 --- a/builtin/logical/aws/path_roles.go +++ b/builtin/logical/aws/path_roles.go @@ -10,10 +10,10 @@ import ( "time" "github.com/aws/aws-sdk-go/aws/arn" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathListRoles(b *backend) *framework.Path { diff --git a/builtin/logical/aws/path_roles_test.go b/builtin/logical/aws/path_roles_test.go index 3ac2473e1a..3f9ae19779 100644 --- a/builtin/logical/aws/path_roles_test.go +++ b/builtin/logical/aws/path_roles_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestBackend_PathListRoles(t *testing.T) { diff --git a/builtin/logical/aws/path_user.go b/builtin/logical/aws/path_user.go index 99f09c6a39..644d2c1d16 100644 --- a/builtin/logical/aws/path_user.go +++ b/builtin/logical/aws/path_user.go @@ -10,9 +10,9 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/iam" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/logical/aws/rollback.go b/builtin/logical/aws/rollback.go index 705a255ead..d49d033613 100644 --- a/builtin/logical/aws/rollback.go +++ b/builtin/logical/aws/rollback.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) walRollback(ctx context.Context, req *logical.Request, kind string, data interface{}) error { diff --git a/builtin/logical/aws/secret_access_keys.go b/builtin/logical/aws/secret_access_keys.go index 81a828a315..676d54d8eb 100644 --- a/builtin/logical/aws/secret_access_keys.go +++ b/builtin/logical/aws/secret_access_keys.go @@ -12,8 +12,8 @@ import ( "github.com/aws/aws-sdk-go/service/sts" "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/helper/awsutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const secretAccessKeyType = "access_keys" diff --git a/builtin/logical/cassandra/backend.go b/builtin/logical/cassandra/backend.go index fba89781f1..5b0ceb4eda 100644 --- a/builtin/logical/cassandra/backend.go +++ b/builtin/logical/cassandra/backend.go @@ -7,8 +7,8 @@ import ( "sync" "github.com/gocql/gocql" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // Factory creates a new backend diff --git a/builtin/logical/cassandra/backend_test.go b/builtin/logical/cassandra/backend_test.go index d476f4aa0d..85dd2a4853 100644 --- a/builtin/logical/cassandra/backend_test.go +++ b/builtin/logical/cassandra/backend_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/gocql/gocql" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/mitchellh/mapstructure" "github.com/ory/dockertest" ) diff --git a/builtin/logical/cassandra/cmd/cassandra/main.go b/builtin/logical/cassandra/cmd/cassandra/main.go index 92e7b0267e..fd17cb36ac 100644 --- a/builtin/logical/cassandra/cmd/cassandra/main.go +++ b/builtin/logical/cassandra/cmd/cassandra/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/logical/cassandra" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: cassandra.Factory, diff --git a/builtin/logical/cassandra/path_config_connection.go b/builtin/logical/cassandra/path_config_connection.go index 3b616f7c7b..970c3d66c3 100644 --- a/builtin/logical/cassandra/path_config_connection.go +++ b/builtin/logical/cassandra/path_config_connection.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/hashicorp/vault/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/certutil" "github.com/hashicorp/vault/helper/tlsutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigConnection(b *backend) *framework.Path { diff --git a/builtin/logical/cassandra/path_creds_create.go b/builtin/logical/cassandra/path_creds_create.go index 2ac8a10de6..5b97807ed1 100644 --- a/builtin/logical/cassandra/path_creds_create.go +++ b/builtin/logical/cassandra/path_creds_create.go @@ -8,9 +8,9 @@ import ( "github.com/gocql/gocql" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathCredsCreate(b *backend) *framework.Path { diff --git a/builtin/logical/cassandra/path_roles.go b/builtin/logical/cassandra/path_roles.go index 9e7c8c1b11..44631e0507 100644 --- a/builtin/logical/cassandra/path_roles.go +++ b/builtin/logical/cassandra/path_roles.go @@ -7,8 +7,8 @@ import ( "github.com/fatih/structs" "github.com/gocql/gocql" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/builtin/logical/cassandra/secret_creds.go b/builtin/logical/cassandra/secret_creds.go index 4aa54956a1..31d6729b04 100644 --- a/builtin/logical/cassandra/secret_creds.go +++ b/builtin/logical/cassandra/secret_creds.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // SecretCredsType is the type of creds issued from this backend diff --git a/builtin/logical/cassandra/util.go b/builtin/logical/cassandra/util.go index 2be6d96714..3af2417cd6 100644 --- a/builtin/logical/cassandra/util.go +++ b/builtin/logical/cassandra/util.go @@ -8,9 +8,9 @@ import ( "github.com/gocql/gocql" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/certutil" "github.com/hashicorp/vault/helper/tlsutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) // Query templates a query for us. diff --git a/builtin/logical/consul/backend.go b/builtin/logical/consul/backend.go index 3cd74c4cf3..5aa886dbb0 100644 --- a/builtin/logical/consul/backend.go +++ b/builtin/logical/consul/backend.go @@ -3,8 +3,8 @@ package consul import ( "context" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { diff --git a/builtin/logical/consul/backend_test.go b/builtin/logical/consul/backend_test.go index a5a011abde..dba9a5339a 100644 --- a/builtin/logical/consul/backend_test.go +++ b/builtin/logical/consul/backend_test.go @@ -12,8 +12,8 @@ import ( "time" consulapi "github.com/hashicorp/consul/api" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/mitchellh/mapstructure" "github.com/ory/dockertest" ) diff --git a/builtin/logical/consul/client.go b/builtin/logical/consul/client.go index 38cf8a8900..e1b6eeca86 100644 --- a/builtin/logical/consul/client.go +++ b/builtin/logical/consul/client.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/hashicorp/consul/api" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func (b *backend) client(ctx context.Context, s logical.Storage) (*api.Client, error, error) { diff --git a/builtin/logical/consul/cmd/consul/main.go b/builtin/logical/consul/cmd/consul/main.go index ea47f673a3..0613f99ac5 100644 --- a/builtin/logical/consul/cmd/consul/main.go +++ b/builtin/logical/consul/cmd/consul/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/logical/consul" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: consul.Factory, diff --git a/builtin/logical/consul/path_config.go b/builtin/logical/consul/path_config.go index 2454b1b7ca..4fed0a7864 100644 --- a/builtin/logical/consul/path_config.go +++ b/builtin/logical/consul/path_config.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigAccess(b *backend) *framework.Path { diff --git a/builtin/logical/consul/path_roles.go b/builtin/logical/consul/path_roles.go index cb1df25ebc..94493de1c7 100644 --- a/builtin/logical/consul/path_roles.go +++ b/builtin/logical/consul/path_roles.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathListRoles(b *backend) *framework.Path { diff --git a/builtin/logical/consul/path_token.go b/builtin/logical/consul/path_token.go index ee6686f1ff..67743d1a91 100644 --- a/builtin/logical/consul/path_token.go +++ b/builtin/logical/consul/path_token.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/consul/api" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/builtin/logical/consul/secret_token.go b/builtin/logical/consul/secret_token.go index 6197bff59c..be7f619e85 100644 --- a/builtin/logical/consul/secret_token.go +++ b/builtin/logical/consul/secret_token.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/builtin/logical/database/backend.go b/builtin/logical/database/backend.go index 7d9789c43c..00b97028c0 100644 --- a/builtin/logical/database/backend.go +++ b/builtin/logical/database/backend.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/errwrap" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/hashicorp/vault/plugins/helper/database/dbutil" ) diff --git a/builtin/logical/database/backend_test.go b/builtin/logical/database/backend_test.go index 93c2a9fb99..588e7df22d 100644 --- a/builtin/logical/database/backend_test.go +++ b/builtin/logical/database/backend_test.go @@ -14,12 +14,12 @@ import ( "github.com/go-test/deep" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/hashicorp/vault/plugins/database/postgresql" "github.com/hashicorp/vault/plugins/helper/database/dbutil" "github.com/hashicorp/vault/vault" @@ -119,7 +119,7 @@ func TestBackend_PluginMain(t *testing.T) { args := []string{"--ca-cert=" + caPEM} - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(args) diff --git a/builtin/logical/database/dbplugin/client.go b/builtin/logical/database/dbplugin/client.go index 4146e2c05c..907e5352b7 100644 --- a/builtin/logical/database/dbplugin/client.go +++ b/builtin/logical/database/dbplugin/client.go @@ -7,7 +7,7 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" ) // DatabasePluginClient embeds a databasePluginRPCClient and wraps it's Close diff --git a/builtin/logical/database/dbplugin/grpc_transport.go b/builtin/logical/database/dbplugin/grpc_transport.go index 1b5267e8f3..1b3fe7f473 100644 --- a/builtin/logical/database/dbplugin/grpc_transport.go +++ b/builtin/logical/database/dbplugin/grpc_transport.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc/status" "github.com/golang/protobuf/ptypes" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" ) var ( diff --git a/builtin/logical/database/dbplugin/plugin.go b/builtin/logical/database/dbplugin/plugin.go index d67088ab22..7868f690a7 100644 --- a/builtin/logical/database/dbplugin/plugin.go +++ b/builtin/logical/database/dbplugin/plugin.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/pluginutil" ) // Database is the interface that all database objects must implement. diff --git a/builtin/logical/database/dbplugin/plugin_test.go b/builtin/logical/database/dbplugin/plugin_test.go index 10f162f5b9..95944fc316 100644 --- a/builtin/logical/database/dbplugin/plugin_test.go +++ b/builtin/logical/database/dbplugin/plugin_test.go @@ -9,11 +9,11 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/plugins" "github.com/hashicorp/vault/vault" ) @@ -112,7 +112,7 @@ func TestPlugin_GRPC_Main(t *testing.T) { args := []string{"--tls-skip-verify=true"} - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(args) diff --git a/builtin/logical/database/path_config_connection.go b/builtin/logical/database/path_config_connection.go index bf3b378a54..05b7143bf3 100644 --- a/builtin/logical/database/path_config_connection.go +++ b/builtin/logical/database/path_config_connection.go @@ -10,8 +10,8 @@ import ( "github.com/fatih/structs" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) var ( diff --git a/builtin/logical/database/path_creds_create.go b/builtin/logical/database/path_creds_create.go index df780f73c5..a79428a03b 100644 --- a/builtin/logical/database/path_creds_create.go +++ b/builtin/logical/database/path_creds_create.go @@ -6,9 +6,9 @@ import ( "time" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathCredsCreate(b *databaseBackend) *framework.Path { diff --git a/builtin/logical/database/path_roles.go b/builtin/logical/database/path_roles.go index 71401b95e5..ac2676ebe4 100644 --- a/builtin/logical/database/path_roles.go +++ b/builtin/logical/database/path_roles.go @@ -5,9 +5,9 @@ import ( "time" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathListRoles(b *databaseBackend) *framework.Path { diff --git a/builtin/logical/database/path_rotate_credentials.go b/builtin/logical/database/path_rotate_credentials.go index 1028bc3978..0973b7d72d 100644 --- a/builtin/logical/database/path_rotate_credentials.go +++ b/builtin/logical/database/path_rotate_credentials.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathRotateCredentials(b *databaseBackend) *framework.Path { diff --git a/builtin/logical/database/secret_creds.go b/builtin/logical/database/secret_creds.go index 04df2663b0..7410224884 100644 --- a/builtin/logical/database/secret_creds.go +++ b/builtin/logical/database/secret_creds.go @@ -6,8 +6,8 @@ import ( "time" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const SecretCredsType = "creds" diff --git a/builtin/logical/mongodb/backend.go b/builtin/logical/mongodb/backend.go index 74f44b813c..88d36f0f46 100644 --- a/builtin/logical/mongodb/backend.go +++ b/builtin/logical/mongodb/backend.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" mgo "gopkg.in/mgo.v2" ) diff --git a/builtin/logical/mongodb/backend_test.go b/builtin/logical/mongodb/backend_test.go index 8c4a9bb888..e9980e07aa 100644 --- a/builtin/logical/mongodb/backend_test.go +++ b/builtin/logical/mongodb/backend_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/mitchellh/mapstructure" dockertest "gopkg.in/ory-am/dockertest.v2" ) diff --git a/builtin/logical/mongodb/cmd/mongodb/main.go b/builtin/logical/mongodb/cmd/mongodb/main.go index c1e41abfbd..1395ad56c2 100644 --- a/builtin/logical/mongodb/cmd/mongodb/main.go +++ b/builtin/logical/mongodb/cmd/mongodb/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/logical/mongodb" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: mongodb.Factory, diff --git a/builtin/logical/mongodb/path_config_connection.go b/builtin/logical/mongodb/path_config_connection.go index 19ec2032ea..ac29258f0d 100644 --- a/builtin/logical/mongodb/path_config_connection.go +++ b/builtin/logical/mongodb/path_config_connection.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" mgo "gopkg.in/mgo.v2" ) diff --git a/builtin/logical/mongodb/path_config_lease.go b/builtin/logical/mongodb/path_config_lease.go index cb9ff7120a..6617ced6b7 100644 --- a/builtin/logical/mongodb/path_config_lease.go +++ b/builtin/logical/mongodb/path_config_lease.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigLease(b *backend) *framework.Path { diff --git a/builtin/logical/mongodb/path_creds_create.go b/builtin/logical/mongodb/path_creds_create.go index 35a5e84b60..835917a9f7 100644 --- a/builtin/logical/mongodb/path_creds_create.go +++ b/builtin/logical/mongodb/path_creds_create.go @@ -5,8 +5,8 @@ import ( "fmt" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathCredsCreate(b *backend) *framework.Path { diff --git a/builtin/logical/mongodb/path_roles.go b/builtin/logical/mongodb/path_roles.go index 6446e9db3b..f34f05292b 100644 --- a/builtin/logical/mongodb/path_roles.go +++ b/builtin/logical/mongodb/path_roles.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathListRoles(b *backend) *framework.Path { diff --git a/builtin/logical/mongodb/secret_creds.go b/builtin/logical/mongodb/secret_creds.go index e0fd590f19..17d25155cf 100644 --- a/builtin/logical/mongodb/secret_creds.go +++ b/builtin/logical/mongodb/secret_creds.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" mgo "gopkg.in/mgo.v2" ) diff --git a/builtin/logical/mssql/backend.go b/builtin/logical/mssql/backend.go index e5d3766b8b..ae1b22a29c 100644 --- a/builtin/logical/mssql/backend.go +++ b/builtin/logical/mssql/backend.go @@ -8,8 +8,8 @@ import ( "sync" _ "github.com/denisenkom/go-mssqldb" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { diff --git a/builtin/logical/mssql/backend_test.go b/builtin/logical/mssql/backend_test.go index 45585857aa..4568761b68 100644 --- a/builtin/logical/mssql/backend_test.go +++ b/builtin/logical/mssql/backend_test.go @@ -9,8 +9,8 @@ import ( "testing" _ "github.com/denisenkom/go-mssqldb" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/logical/mssql/cmd/mssql/main.go b/builtin/logical/mssql/cmd/mssql/main.go index 3915e1fbc6..b9c7b28583 100644 --- a/builtin/logical/mssql/cmd/mssql/main.go +++ b/builtin/logical/mssql/cmd/mssql/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/logical/mssql" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: mssql.Factory, diff --git a/builtin/logical/mssql/path_config_connection.go b/builtin/logical/mssql/path_config_connection.go index b4c9a1d178..e935e11434 100644 --- a/builtin/logical/mssql/path_config_connection.go +++ b/builtin/logical/mssql/path_config_connection.go @@ -5,8 +5,8 @@ import ( "database/sql" "fmt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigConnection(b *backend) *framework.Path { diff --git a/builtin/logical/mssql/path_config_lease.go b/builtin/logical/mssql/path_config_lease.go index b4035b56da..cc479d20fc 100644 --- a/builtin/logical/mssql/path_config_lease.go +++ b/builtin/logical/mssql/path_config_lease.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigLease(b *backend) *framework.Path { diff --git a/builtin/logical/mssql/path_creds_create.go b/builtin/logical/mssql/path_creds_create.go index f6c7a7e444..716248e912 100644 --- a/builtin/logical/mssql/path_creds_create.go +++ b/builtin/logical/mssql/path_creds_create.go @@ -7,9 +7,9 @@ import ( uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/helper/dbtxn" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathCredsCreate(b *backend) *framework.Path { diff --git a/builtin/logical/mssql/path_roles.go b/builtin/logical/mssql/path_roles.go index fd29f36d29..540326e668 100644 --- a/builtin/logical/mssql/path_roles.go +++ b/builtin/logical/mssql/path_roles.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathListRoles(b *backend) *framework.Path { diff --git a/builtin/logical/mssql/secret_creds.go b/builtin/logical/mssql/secret_creds.go index 4adf54ab04..c24cd4cac2 100644 --- a/builtin/logical/mssql/secret_creds.go +++ b/builtin/logical/mssql/secret_creds.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/helper/dbtxn" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const SecretCredsType = "creds" diff --git a/builtin/logical/mysql/backend.go b/builtin/logical/mysql/backend.go index 871eca90c3..c97bb358b5 100644 --- a/builtin/logical/mysql/backend.go +++ b/builtin/logical/mysql/backend.go @@ -8,8 +8,8 @@ import ( "sync" _ "github.com/go-sql-driver/mysql" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { diff --git a/builtin/logical/mysql/backend_test.go b/builtin/logical/mysql/backend_test.go index 8d684772b8..6ac6b28340 100644 --- a/builtin/logical/mysql/backend_test.go +++ b/builtin/logical/mysql/backend_test.go @@ -9,8 +9,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/mitchellh/mapstructure" "github.com/ory/dockertest" ) diff --git a/builtin/logical/mysql/cmd/mysql/main.go b/builtin/logical/mysql/cmd/mysql/main.go index 88385c3447..7461009507 100644 --- a/builtin/logical/mysql/cmd/mysql/main.go +++ b/builtin/logical/mysql/cmd/mysql/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/logical/mysql" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: mysql.Factory, diff --git a/builtin/logical/mysql/path_config_connection.go b/builtin/logical/mysql/path_config_connection.go index 998775ce2d..82701c23df 100644 --- a/builtin/logical/mysql/path_config_connection.go +++ b/builtin/logical/mysql/path_config_connection.go @@ -6,8 +6,8 @@ import ( "fmt" _ "github.com/go-sql-driver/mysql" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigConnection(b *backend) *framework.Path { diff --git a/builtin/logical/mysql/path_config_lease.go b/builtin/logical/mysql/path_config_lease.go index 6f17e18d61..a1189fb4b0 100644 --- a/builtin/logical/mysql/path_config_lease.go +++ b/builtin/logical/mysql/path_config_lease.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigLease(b *backend) *framework.Path { diff --git a/builtin/logical/mysql/path_role_create.go b/builtin/logical/mysql/path_role_create.go index 8623685d0f..452228e9fd 100644 --- a/builtin/logical/mysql/path_role_create.go +++ b/builtin/logical/mysql/path_role_create.go @@ -7,9 +7,9 @@ import ( uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/helper/dbtxn" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" _ "github.com/lib/pq" ) diff --git a/builtin/logical/mysql/path_roles.go b/builtin/logical/mysql/path_roles.go index 4c54f5f8bf..a52c32adaf 100644 --- a/builtin/logical/mysql/path_roles.go +++ b/builtin/logical/mysql/path_roles.go @@ -6,9 +6,9 @@ import ( "strings" _ "github.com/go-sql-driver/mysql" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathListRoles(b *backend) *framework.Path { diff --git a/builtin/logical/mysql/secret_creds.go b/builtin/logical/mysql/secret_creds.go index 65d59dbc40..d2d2ff58fc 100644 --- a/builtin/logical/mysql/secret_creds.go +++ b/builtin/logical/mysql/secret_creds.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const SecretCredsType = "creds" diff --git a/builtin/logical/nomad/backend.go b/builtin/logical/nomad/backend.go index a8b4b99287..68dad17bcd 100644 --- a/builtin/logical/nomad/backend.go +++ b/builtin/logical/nomad/backend.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // Factory returns a Nomad backend that satisfies the logical.Backend interface diff --git a/builtin/logical/nomad/backend_test.go b/builtin/logical/nomad/backend_test.go index 1408d813ae..1239065a07 100644 --- a/builtin/logical/nomad/backend_test.go +++ b/builtin/logical/nomad/backend_test.go @@ -10,7 +10,7 @@ import ( nomadapi "github.com/hashicorp/nomad/api" "github.com/hashicorp/vault/helper/testhelpers" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/mitchellh/mapstructure" "github.com/ory/dockertest" ) diff --git a/builtin/logical/nomad/cmd/nomad/main.go b/builtin/logical/nomad/cmd/nomad/main.go index 2e7000de3f..c5bbef19f7 100644 --- a/builtin/logical/nomad/cmd/nomad/main.go +++ b/builtin/logical/nomad/cmd/nomad/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/logical/nomad" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: nomad.Factory, diff --git a/builtin/logical/nomad/path_config_access.go b/builtin/logical/nomad/path_config_access.go index c1edd6bad1..375e777d7a 100644 --- a/builtin/logical/nomad/path_config_access.go +++ b/builtin/logical/nomad/path_config_access.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const configAccessKey = "config/access" diff --git a/builtin/logical/nomad/path_config_lease.go b/builtin/logical/nomad/path_config_lease.go index 7816aae520..03e8dbd461 100644 --- a/builtin/logical/nomad/path_config_lease.go +++ b/builtin/logical/nomad/path_config_lease.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const leaseConfigKey = "config/lease" diff --git a/builtin/logical/nomad/path_creds_create.go b/builtin/logical/nomad/path_creds_create.go index deca9e490c..0c518c9d19 100644 --- a/builtin/logical/nomad/path_creds_create.go +++ b/builtin/logical/nomad/path_creds_create.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/nomad/api" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // maxTokenNameLength is the maximum length for the name of a Nomad access diff --git a/builtin/logical/nomad/path_roles.go b/builtin/logical/nomad/path_roles.go index 5630602817..d2d789003e 100644 --- a/builtin/logical/nomad/path_roles.go +++ b/builtin/logical/nomad/path_roles.go @@ -5,8 +5,8 @@ import ( "errors" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathListRoles(b *backend) *framework.Path { diff --git a/builtin/logical/nomad/secret_token.go b/builtin/logical/nomad/secret_token.go index 3509dcba48..c91c580d3a 100644 --- a/builtin/logical/nomad/secret_token.go +++ b/builtin/logical/nomad/secret_token.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/builtin/logical/pki/backend.go b/builtin/logical/pki/backend.go index 60e943acb8..282f96d785 100644 --- a/builtin/logical/pki/backend.go +++ b/builtin/logical/pki/backend.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // Factory creates a new backend implementing the logical.Backend interface diff --git a/builtin/logical/pki/backend_test.go b/builtin/logical/pki/backend_test.go index 67591f3e6a..3d201cc711 100644 --- a/builtin/logical/pki/backend_test.go +++ b/builtin/logical/pki/backend_test.go @@ -28,11 +28,11 @@ import ( "github.com/fatih/structs" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/strutil" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/hashicorp/vault/vault" "github.com/mitchellh/mapstructure" "golang.org/x/net/idna" diff --git a/builtin/logical/pki/ca_test.go b/builtin/logical/pki/ca_test.go index 3956fa671e..079f9ea4f0 100644 --- a/builtin/logical/pki/ca_test.go +++ b/builtin/logical/pki/ca_test.go @@ -18,9 +18,9 @@ import ( "github.com/go-test/deep" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/certutil" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/builtin/logical/pki/ca_util.go b/builtin/logical/pki/ca_util.go index b8632a9b4b..9b96aae7f3 100644 --- a/builtin/logical/pki/ca_util.go +++ b/builtin/logical/pki/ca_util.go @@ -3,8 +3,8 @@ package pki import ( "time" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) getGenerationParams( diff --git a/builtin/logical/pki/cert_util.go b/builtin/logical/pki/cert_util.go index 7950ab2667..c003018b92 100644 --- a/builtin/logical/pki/cert_util.go +++ b/builtin/logical/pki/cert_util.go @@ -22,11 +22,11 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" glob "github.com/ryanuber/go-glob" "golang.org/x/crypto/cryptobyte" cbbasn1 "golang.org/x/crypto/cryptobyte/asn1" diff --git a/builtin/logical/pki/cert_util_test.go b/builtin/logical/pki/cert_util_test.go index 0f243df3d4..228b003811 100644 --- a/builtin/logical/pki/cert_util_test.go +++ b/builtin/logical/pki/cert_util_test.go @@ -7,7 +7,7 @@ import ( "strings" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestPki_FetchCertBySerial(t *testing.T) { diff --git a/builtin/logical/pki/cmd/pki/main.go b/builtin/logical/pki/cmd/pki/main.go index db530f7299..cc5aec999b 100644 --- a/builtin/logical/pki/cmd/pki/main.go +++ b/builtin/logical/pki/cmd/pki/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/logical/pki" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: pki.Factory, diff --git a/builtin/logical/pki/crl_test.go b/builtin/logical/pki/crl_test.go index bf71d28b74..e09f7fd4cb 100644 --- a/builtin/logical/pki/crl_test.go +++ b/builtin/logical/pki/crl_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/vault/api" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/builtin/logical/pki/crl_util.go b/builtin/logical/pki/crl_util.go index e5b873fb64..80cc497ac4 100644 --- a/builtin/logical/pki/crl_util.go +++ b/builtin/logical/pki/crl_util.go @@ -11,9 +11,9 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/logical" ) type revocationInfo struct { diff --git a/builtin/logical/pki/fields.go b/builtin/logical/pki/fields.go index 1a0be88a61..0f5266a77b 100644 --- a/builtin/logical/pki/fields.go +++ b/builtin/logical/pki/fields.go @@ -1,6 +1,6 @@ package pki -import "github.com/hashicorp/vault/logical/framework" +import "github.com/hashicorp/vault/sdk/framework" // addIssueAndSignCommonFields adds fields common to both CA and non-CA issuing // and signing diff --git a/builtin/logical/pki/path_config_ca.go b/builtin/logical/pki/path_config_ca.go index 3d2070f9ee..547804fe61 100644 --- a/builtin/logical/pki/path_config_ca.go +++ b/builtin/logical/pki/path_config_ca.go @@ -4,10 +4,10 @@ import ( "context" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigCA(b *backend) *framework.Path { diff --git a/builtin/logical/pki/path_config_crl.go b/builtin/logical/pki/path_config_crl.go index 8e6ccbbb49..3894b00c88 100644 --- a/builtin/logical/pki/path_config_crl.go +++ b/builtin/logical/pki/path_config_crl.go @@ -6,9 +6,9 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // CRLConfig holds basic CRL configuration information diff --git a/builtin/logical/pki/path_config_urls.go b/builtin/logical/pki/path_config_urls.go index e3a0d6f968..9d0481b748 100644 --- a/builtin/logical/pki/path_config_urls.go +++ b/builtin/logical/pki/path_config_urls.go @@ -6,8 +6,8 @@ import ( "github.com/asaskevich/govalidator" "github.com/fatih/structs" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigURLs(b *backend) *framework.Path { diff --git a/builtin/logical/pki/path_fetch.go b/builtin/logical/pki/path_fetch.go index 689e4a17e1..5c60cb3c96 100644 --- a/builtin/logical/pki/path_fetch.go +++ b/builtin/logical/pki/path_fetch.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // Returns the CA in raw format diff --git a/builtin/logical/pki/path_intermediate.go b/builtin/logical/pki/path_intermediate.go index 5a800e5c3d..1a46b0ddbf 100644 --- a/builtin/logical/pki/path_intermediate.go +++ b/builtin/logical/pki/path_intermediate.go @@ -6,10 +6,10 @@ import ( "fmt" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathGenerateIntermediate(b *backend) *framework.Path { diff --git a/builtin/logical/pki/path_issue_sign.go b/builtin/logical/pki/path_issue_sign.go index 118db41400..b45f88eaab 100644 --- a/builtin/logical/pki/path_issue_sign.go +++ b/builtin/logical/pki/path_issue_sign.go @@ -7,10 +7,10 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathIssue(b *backend) *framework.Path { diff --git a/builtin/logical/pki/path_revoke.go b/builtin/logical/pki/path_revoke.go index ff4c462cfb..3dbf1f9e51 100644 --- a/builtin/logical/pki/path_revoke.go +++ b/builtin/logical/pki/path_revoke.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathRevoke(b *backend) *framework.Path { diff --git a/builtin/logical/pki/path_roles.go b/builtin/logical/pki/path_roles.go index a39fe97cb9..66ad608557 100644 --- a/builtin/logical/pki/path_roles.go +++ b/builtin/logical/pki/path_roles.go @@ -8,10 +8,10 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathListRoles(b *backend) *framework.Path { diff --git a/builtin/logical/pki/path_roles_test.go b/builtin/logical/pki/path_roles_test.go index 9d732d8b3a..01e49983c5 100644 --- a/builtin/logical/pki/path_roles_test.go +++ b/builtin/logical/pki/path_roles_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/logical/pki/path_root.go b/builtin/logical/pki/path_root.go index 1ea4309f87..7edb3bf4a1 100644 --- a/builtin/logical/pki/path_root.go +++ b/builtin/logical/pki/path_root.go @@ -12,9 +12,9 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathGenerateRoot(b *backend) *framework.Path { diff --git a/builtin/logical/pki/path_tidy.go b/builtin/logical/pki/path_tidy.go index 275e006306..8b50e3d510 100644 --- a/builtin/logical/pki/path_tidy.go +++ b/builtin/logical/pki/path_tidy.go @@ -9,9 +9,9 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathTidy(b *backend) *framework.Path { diff --git a/builtin/logical/pki/secret_certs.go b/builtin/logical/pki/secret_certs.go index 9c1734e319..398b10ea9e 100644 --- a/builtin/logical/pki/secret_certs.go +++ b/builtin/logical/pki/secret_certs.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // SecretCertsType is the name used to identify this type diff --git a/builtin/logical/postgresql/backend.go b/builtin/logical/postgresql/backend.go index ad7c333284..4d2ed573b9 100644 --- a/builtin/logical/postgresql/backend.go +++ b/builtin/logical/postgresql/backend.go @@ -9,8 +9,8 @@ import ( log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { diff --git a/builtin/logical/postgresql/backend_test.go b/builtin/logical/postgresql/backend_test.go index 192cbe3820..2cfabc57d0 100644 --- a/builtin/logical/postgresql/backend_test.go +++ b/builtin/logical/postgresql/backend_test.go @@ -11,8 +11,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/lib/pq" "github.com/mitchellh/mapstructure" "github.com/ory/dockertest" diff --git a/builtin/logical/postgresql/cmd/postgresql/main.go b/builtin/logical/postgresql/cmd/postgresql/main.go index 19f89f6895..a69981b1e4 100644 --- a/builtin/logical/postgresql/cmd/postgresql/main.go +++ b/builtin/logical/postgresql/cmd/postgresql/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/logical/postgresql" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: postgresql.Factory, diff --git a/builtin/logical/postgresql/path_config_connection.go b/builtin/logical/postgresql/path_config_connection.go index ae43a30e5b..f7ff550485 100644 --- a/builtin/logical/postgresql/path_config_connection.go +++ b/builtin/logical/postgresql/path_config_connection.go @@ -5,8 +5,8 @@ import ( "database/sql" "fmt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" _ "github.com/lib/pq" ) diff --git a/builtin/logical/postgresql/path_config_lease.go b/builtin/logical/postgresql/path_config_lease.go index 54bc9b2cac..75e1efa28b 100644 --- a/builtin/logical/postgresql/path_config_lease.go +++ b/builtin/logical/postgresql/path_config_lease.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigLease(b *backend) *framework.Path { diff --git a/builtin/logical/postgresql/path_role_create.go b/builtin/logical/postgresql/path_role_create.go index 542bc3fa66..774e30adac 100644 --- a/builtin/logical/postgresql/path_role_create.go +++ b/builtin/logical/postgresql/path_role_create.go @@ -8,9 +8,9 @@ import ( uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/helper/dbtxn" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" _ "github.com/lib/pq" ) diff --git a/builtin/logical/postgresql/path_roles.go b/builtin/logical/postgresql/path_roles.go index 83400e9083..b31a196bff 100644 --- a/builtin/logical/postgresql/path_roles.go +++ b/builtin/logical/postgresql/path_roles.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathListRoles(b *backend) *framework.Path { diff --git a/builtin/logical/postgresql/secret_creds.go b/builtin/logical/postgresql/secret_creds.go index d00beacb65..4bb9507331 100644 --- a/builtin/logical/postgresql/secret_creds.go +++ b/builtin/logical/postgresql/secret_creds.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/helper/dbtxn" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/lib/pq" ) diff --git a/builtin/logical/rabbitmq/backend.go b/builtin/logical/rabbitmq/backend.go index 1cb911e9d3..8a6215723b 100644 --- a/builtin/logical/rabbitmq/backend.go +++ b/builtin/logical/rabbitmq/backend.go @@ -7,8 +7,8 @@ import ( "sync" cleanhttp "github.com/hashicorp/go-cleanhttp" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" rabbithole "github.com/michaelklishin/rabbit-hole" ) diff --git a/builtin/logical/rabbitmq/backend_test.go b/builtin/logical/rabbitmq/backend_test.go index 27b3a6c940..16ea02d1a1 100644 --- a/builtin/logical/rabbitmq/backend_test.go +++ b/builtin/logical/rabbitmq/backend_test.go @@ -8,9 +8,9 @@ import ( "strconv" "testing" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" rabbithole "github.com/michaelklishin/rabbit-hole" "github.com/mitchellh/mapstructure" "github.com/ory/dockertest" diff --git a/builtin/logical/rabbitmq/cmd/rabbitmq/main.go b/builtin/logical/rabbitmq/cmd/rabbitmq/main.go index 950a573f32..fb1f068cf3 100644 --- a/builtin/logical/rabbitmq/cmd/rabbitmq/main.go +++ b/builtin/logical/rabbitmq/cmd/rabbitmq/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/logical/rabbitmq" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: rabbitmq.Factory, diff --git a/builtin/logical/rabbitmq/path_config_connection.go b/builtin/logical/rabbitmq/path_config_connection.go index 55b6ac3ca9..fd587d0478 100644 --- a/builtin/logical/rabbitmq/path_config_connection.go +++ b/builtin/logical/rabbitmq/path_config_connection.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" rabbithole "github.com/michaelklishin/rabbit-hole" ) diff --git a/builtin/logical/rabbitmq/path_config_lease.go b/builtin/logical/rabbitmq/path_config_lease.go index 55d95073f3..71d1ca75bb 100644 --- a/builtin/logical/rabbitmq/path_config_lease.go +++ b/builtin/logical/rabbitmq/path_config_lease.go @@ -5,8 +5,8 @@ import ( "time" "github.com/fatih/structs" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfigLease(b *backend) *framework.Path { diff --git a/builtin/logical/rabbitmq/path_config_lease_test.go b/builtin/logical/rabbitmq/path_config_lease_test.go index b48e951e6b..ec7e7e169c 100644 --- a/builtin/logical/rabbitmq/path_config_lease_test.go +++ b/builtin/logical/rabbitmq/path_config_lease_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestBackend_config_lease_RU(t *testing.T) { diff --git a/builtin/logical/rabbitmq/path_role_create.go b/builtin/logical/rabbitmq/path_role_create.go index 78764472a2..2a4217e997 100644 --- a/builtin/logical/rabbitmq/path_role_create.go +++ b/builtin/logical/rabbitmq/path_role_create.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/errwrap" multierror "github.com/hashicorp/go-multierror" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" rabbithole "github.com/michaelklishin/rabbit-hole" ) diff --git a/builtin/logical/rabbitmq/path_roles.go b/builtin/logical/rabbitmq/path_roles.go index a1e97299eb..ad7ea7aa72 100644 --- a/builtin/logical/rabbitmq/path_roles.go +++ b/builtin/logical/rabbitmq/path_roles.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/fatih/structs" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathListRoles(b *backend) *framework.Path { diff --git a/builtin/logical/rabbitmq/secret_creds.go b/builtin/logical/rabbitmq/secret_creds.go index 3962c7bf86..0498b85b0b 100644 --- a/builtin/logical/rabbitmq/secret_creds.go +++ b/builtin/logical/rabbitmq/secret_creds.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // SecretCredsType is the key for this backend's secrets. diff --git a/builtin/logical/ssh/backend.go b/builtin/logical/ssh/backend.go index 0616b8f783..763e6f0498 100644 --- a/builtin/logical/ssh/backend.go +++ b/builtin/logical/ssh/backend.go @@ -5,9 +5,9 @@ import ( "strings" "sync" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) type backend struct { diff --git a/builtin/logical/ssh/backend_test.go b/builtin/logical/ssh/backend_test.go index dd84a92a77..3b11e2fd6c 100644 --- a/builtin/logical/ssh/backend_test.go +++ b/builtin/logical/ssh/backend_test.go @@ -17,8 +17,8 @@ import ( "strings" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/hashicorp/vault/vault" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/logical/ssh/cmd/ssh/main.go b/builtin/logical/ssh/cmd/ssh/main.go index 621430b717..eae0282f50 100644 --- a/builtin/logical/ssh/cmd/ssh/main.go +++ b/builtin/logical/ssh/cmd/ssh/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/logical/ssh" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: ssh.Factory, diff --git a/builtin/logical/ssh/path_config_ca.go b/builtin/logical/ssh/path_config_ca.go index fd1dfcdba8..15e4e31ea6 100644 --- a/builtin/logical/ssh/path_config_ca.go +++ b/builtin/logical/ssh/path_config_ca.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/errwrap" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "golang.org/x/crypto/ssh" ) diff --git a/builtin/logical/ssh/path_config_ca_test.go b/builtin/logical/ssh/path_config_ca_test.go index f77852c1cb..6fac8eb990 100644 --- a/builtin/logical/ssh/path_config_ca_test.go +++ b/builtin/logical/ssh/path_config_ca_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestSSH_ConfigCAStorageUpgrade(t *testing.T) { diff --git a/builtin/logical/ssh/path_config_zeroaddress.go b/builtin/logical/ssh/path_config_zeroaddress.go index 3f73dd96d7..c700df48bd 100644 --- a/builtin/logical/ssh/path_config_zeroaddress.go +++ b/builtin/logical/ssh/path_config_zeroaddress.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // Structure to hold roles that are allowed to accept any IP address. diff --git a/builtin/logical/ssh/path_creds_create.go b/builtin/logical/ssh/path_creds_create.go index 899a7eb3c9..cf9fdf820b 100644 --- a/builtin/logical/ssh/path_creds_create.go +++ b/builtin/logical/ssh/path_creds_create.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/errwrap" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) type sshOTP struct { diff --git a/builtin/logical/ssh/path_fetch.go b/builtin/logical/ssh/path_fetch.go index f29ddcee08..9e7589bd81 100644 --- a/builtin/logical/ssh/path_fetch.go +++ b/builtin/logical/ssh/path_fetch.go @@ -3,8 +3,8 @@ package ssh import ( "context" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathFetchPublicKey(b *backend) *framework.Path { diff --git a/builtin/logical/ssh/path_keys.go b/builtin/logical/ssh/path_keys.go index 593d80bc19..49101b9699 100644 --- a/builtin/logical/ssh/path_keys.go +++ b/builtin/logical/ssh/path_keys.go @@ -6,8 +6,8 @@ import ( "golang.org/x/crypto/ssh" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) type sshHostKey struct { diff --git a/builtin/logical/ssh/path_lookup.go b/builtin/logical/ssh/path_lookup.go index 5f802d19e0..1bcd065f88 100644 --- a/builtin/logical/ssh/path_lookup.go +++ b/builtin/logical/ssh/path_lookup.go @@ -5,8 +5,8 @@ import ( "fmt" "net" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathLookup(b *backend) *framework.Path { diff --git a/builtin/logical/ssh/path_roles.go b/builtin/logical/ssh/path_roles.go index 8d966062c0..c87b04f1b6 100644 --- a/builtin/logical/ssh/path_roles.go +++ b/builtin/logical/ssh/path_roles.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/helper/cidrutil" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/builtin/logical/ssh/path_sign.go b/builtin/logical/ssh/path_sign.go index 376a5dad43..4a9bb8ef41 100644 --- a/builtin/logical/ssh/path_sign.go +++ b/builtin/logical/ssh/path_sign.go @@ -14,11 +14,11 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "golang.org/x/crypto/ed25519" "golang.org/x/crypto/ssh" ) diff --git a/builtin/logical/ssh/path_verify.go b/builtin/logical/ssh/path_verify.go index da9bb4e6d3..a6d1397e22 100644 --- a/builtin/logical/ssh/path_verify.go +++ b/builtin/logical/ssh/path_verify.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathVerify(b *backend) *framework.Path { diff --git a/builtin/logical/ssh/secret_dynamic_key.go b/builtin/logical/ssh/secret_dynamic_key.go index 6078733f73..e7603527ca 100644 --- a/builtin/logical/ssh/secret_dynamic_key.go +++ b/builtin/logical/ssh/secret_dynamic_key.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/logical/ssh/secret_otp.go b/builtin/logical/ssh/secret_otp.go index 40f75a3081..c9543c04f5 100644 --- a/builtin/logical/ssh/secret_otp.go +++ b/builtin/logical/ssh/secret_otp.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const SecretOTPType = "secret_otp_type" diff --git a/builtin/logical/ssh/util.go b/builtin/logical/ssh/util.go index 70cc880153..736b100f69 100644 --- a/builtin/logical/ssh/util.go +++ b/builtin/logical/ssh/util.go @@ -14,8 +14,8 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/logical" log "github.com/hashicorp/go-hclog" "golang.org/x/crypto/ssh" diff --git a/builtin/logical/totp/backend.go b/builtin/logical/totp/backend.go index d14246608b..886da4d31c 100644 --- a/builtin/logical/totp/backend.go +++ b/builtin/logical/totp/backend.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" cache "github.com/patrickmn/go-cache" ) diff --git a/builtin/logical/totp/backend_test.go b/builtin/logical/totp/backend_test.go index eaf0261003..de4c2d0a19 100644 --- a/builtin/logical/totp/backend_test.go +++ b/builtin/logical/totp/backend_test.go @@ -11,8 +11,8 @@ import ( "time" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/mitchellh/mapstructure" otplib "github.com/pquerna/otp" totplib "github.com/pquerna/otp/totp" diff --git a/builtin/logical/totp/cmd/totp/main.go b/builtin/logical/totp/cmd/totp/main.go index a795245b19..55c70a773e 100644 --- a/builtin/logical/totp/cmd/totp/main.go +++ b/builtin/logical/totp/cmd/totp/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/logical/totp" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: totp.Factory, diff --git a/builtin/logical/totp/path_code.go b/builtin/logical/totp/path_code.go index cc21d666ac..d95574c8bd 100644 --- a/builtin/logical/totp/path_code.go +++ b/builtin/logical/totp/path_code.go @@ -6,8 +6,8 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" otplib "github.com/pquerna/otp" totplib "github.com/pquerna/otp/totp" ) diff --git a/builtin/logical/totp/path_keys.go b/builtin/logical/totp/path_keys.go index 2c6329f690..6e08e0a833 100644 --- a/builtin/logical/totp/path_keys.go +++ b/builtin/logical/totp/path_keys.go @@ -12,8 +12,8 @@ import ( "strings" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" otplib "github.com/pquerna/otp" totplib "github.com/pquerna/otp/totp" ) diff --git a/builtin/logical/transit/backend.go b/builtin/logical/transit/backend.go index 76e2bea1c4..d12a292ce0 100644 --- a/builtin/logical/transit/backend.go +++ b/builtin/logical/transit/backend.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { diff --git a/builtin/logical/transit/backend_test.go b/builtin/logical/transit/backend_test.go index 33f257c2f3..96f1a4198b 100644 --- a/builtin/logical/transit/backend_test.go +++ b/builtin/logical/transit/backend_test.go @@ -15,10 +15,10 @@ import ( "time" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/logical/transit/cmd/transit/main.go b/builtin/logical/transit/cmd/transit/main.go index 9c9dc69534..e6a53e9e7e 100644 --- a/builtin/logical/transit/cmd/transit/main.go +++ b/builtin/logical/transit/cmd/transit/main.go @@ -5,17 +5,17 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/logical/transit" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/plugin" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) if err := plugin.Serve(&plugin.ServeOpts{ BackendFactoryFunc: transit.Factory, diff --git a/builtin/logical/transit/path_backup.go b/builtin/logical/transit/path_backup.go index 174959125e..4c517c248c 100644 --- a/builtin/logical/transit/path_backup.go +++ b/builtin/logical/transit/path_backup.go @@ -3,8 +3,8 @@ package transit import ( "context" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) pathBackup() *framework.Path { diff --git a/builtin/logical/transit/path_backup_test.go b/builtin/logical/transit/path_backup_test.go index 24df517e24..415ff9ad09 100644 --- a/builtin/logical/transit/path_backup_test.go +++ b/builtin/logical/transit/path_backup_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestTransit_BackupRestore(t *testing.T) { diff --git a/builtin/logical/transit/path_config.go b/builtin/logical/transit/path_config.go index ae5624b63f..c788e1b009 100644 --- a/builtin/logical/transit/path_config.go +++ b/builtin/logical/transit/path_config.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) pathConfig() *framework.Path { diff --git a/builtin/logical/transit/path_config_test.go b/builtin/logical/transit/path_config_test.go index 32315140b8..5d5c70223f 100644 --- a/builtin/logical/transit/path_config_test.go +++ b/builtin/logical/transit/path_config_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestTransit_ConfigSettings(t *testing.T) { diff --git a/builtin/logical/transit/path_datakey.go b/builtin/logical/transit/path_datakey.go index 0141e1736b..2556a1acc8 100644 --- a/builtin/logical/transit/path_datakey.go +++ b/builtin/logical/transit/path_datakey.go @@ -6,10 +6,10 @@ import ( "encoding/base64" "fmt" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) pathDatakey() *framework.Path { diff --git a/builtin/logical/transit/path_decrypt.go b/builtin/logical/transit/path_decrypt.go index 2e31856644..1cc57bd170 100644 --- a/builtin/logical/transit/path_decrypt.go +++ b/builtin/logical/transit/path_decrypt.go @@ -5,10 +5,10 @@ import ( "encoding/base64" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/logical/transit/path_decrypt_test.go b/builtin/logical/transit/path_decrypt_test.go index 01c54f1e3e..df66e9d51d 100644 --- a/builtin/logical/transit/path_decrypt_test.go +++ b/builtin/logical/transit/path_decrypt_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestTransit_BatchDecryption(t *testing.T) { diff --git a/builtin/logical/transit/path_encrypt.go b/builtin/logical/transit/path_encrypt.go index 8c5e6c658b..fe9a3bdf8c 100644 --- a/builtin/logical/transit/path_encrypt.go +++ b/builtin/logical/transit/path_encrypt.go @@ -6,10 +6,10 @@ import ( "fmt" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/logical/transit/path_encrypt_test.go b/builtin/logical/transit/path_encrypt_test.go index c0ad33f589..73d138df96 100644 --- a/builtin/logical/transit/path_encrypt_test.go +++ b/builtin/logical/transit/path_encrypt_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/logical/transit/path_export.go b/builtin/logical/transit/path_export.go index 6b20fd3f04..9375d8ab73 100644 --- a/builtin/logical/transit/path_export.go +++ b/builtin/logical/transit/path_export.go @@ -13,9 +13,9 @@ import ( "strconv" "strings" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/builtin/logical/transit/path_export_test.go b/builtin/logical/transit/path_export_test.go index 9858e4a741..21b58d10cb 100644 --- a/builtin/logical/transit/path_export_test.go +++ b/builtin/logical/transit/path_export_test.go @@ -7,7 +7,7 @@ import ( "strconv" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestTransit_Export_KeyVersion_ExportsCorrectVersion(t *testing.T) { diff --git a/builtin/logical/transit/path_hash.go b/builtin/logical/transit/path_hash.go index 78e9bdd59b..0228d9c318 100644 --- a/builtin/logical/transit/path_hash.go +++ b/builtin/logical/transit/path_hash.go @@ -9,8 +9,8 @@ import ( "fmt" "hash" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) pathHash() *framework.Path { diff --git a/builtin/logical/transit/path_hash_test.go b/builtin/logical/transit/path_hash_test.go index f65c8937bc..a500bb2a42 100644 --- a/builtin/logical/transit/path_hash_test.go +++ b/builtin/logical/transit/path_hash_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestTransit_Hash(t *testing.T) { diff --git a/builtin/logical/transit/path_hmac.go b/builtin/logical/transit/path_hmac.go index a02916fce1..c16bd4d8ec 100644 --- a/builtin/logical/transit/path_hmac.go +++ b/builtin/logical/transit/path_hmac.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/logical/transit/path_hmac_test.go b/builtin/logical/transit/path_hmac_test.go index dd1971bf85..b85161399e 100644 --- a/builtin/logical/transit/path_hmac_test.go +++ b/builtin/logical/transit/path_hmac_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" ) func TestTransit_HMAC(t *testing.T) { diff --git a/builtin/logical/transit/path_keys.go b/builtin/logical/transit/path_keys.go index 94068e6316..279084f9fc 100644 --- a/builtin/logical/transit/path_keys.go +++ b/builtin/logical/transit/path_keys.go @@ -14,9 +14,9 @@ import ( "github.com/fatih/structs" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) pathListKeys() *framework.Path { diff --git a/builtin/logical/transit/path_keys_test.go b/builtin/logical/transit/path_keys_test.go index 7a87fdda72..3a7d9893d7 100644 --- a/builtin/logical/transit/path_keys_test.go +++ b/builtin/logical/transit/path_keys_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/vault/builtin/audit/file" "github.com/hashicorp/vault/builtin/logical/transit" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/builtin/logical/transit/path_random.go b/builtin/logical/transit/path_random.go index c5c82de50c..b637a92245 100644 --- a/builtin/logical/transit/path_random.go +++ b/builtin/logical/transit/path_random.go @@ -8,8 +8,8 @@ import ( "strconv" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) pathRandom() *framework.Path { diff --git a/builtin/logical/transit/path_random_test.go b/builtin/logical/transit/path_random_test.go index c857c1f9ea..260b22f573 100644 --- a/builtin/logical/transit/path_random_test.go +++ b/builtin/logical/transit/path_random_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestTransit_Random(t *testing.T) { diff --git a/builtin/logical/transit/path_restore.go b/builtin/logical/transit/path_restore.go index 1d1c513379..255b1e3e23 100644 --- a/builtin/logical/transit/path_restore.go +++ b/builtin/logical/transit/path_restore.go @@ -3,8 +3,8 @@ package transit import ( "context" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) pathRestore() *framework.Path { diff --git a/builtin/logical/transit/path_restore_test.go b/builtin/logical/transit/path_restore_test.go index 794e2c44cf..5278d144ed 100644 --- a/builtin/logical/transit/path_restore_test.go +++ b/builtin/logical/transit/path_restore_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/vault/helper/testhelpers" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestTransit_Restore(t *testing.T) { diff --git a/builtin/logical/transit/path_rewrap.go b/builtin/logical/transit/path_rewrap.go index a752454c35..02c3c528a0 100644 --- a/builtin/logical/transit/path_rewrap.go +++ b/builtin/logical/transit/path_rewrap.go @@ -6,10 +6,10 @@ import ( "fmt" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/logical/transit/path_rewrap_test.go b/builtin/logical/transit/path_rewrap_test.go index 539cc2d688..d9b048b75d 100644 --- a/builtin/logical/transit/path_rewrap_test.go +++ b/builtin/logical/transit/path_rewrap_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) // Check the normal flow of rewrap diff --git a/builtin/logical/transit/path_rotate.go b/builtin/logical/transit/path_rotate.go index 90b8d9e474..c25f5a4c69 100644 --- a/builtin/logical/transit/path_rotate.go +++ b/builtin/logical/transit/path_rotate.go @@ -3,9 +3,9 @@ package transit import ( "context" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) pathRotate() *framework.Path { diff --git a/builtin/logical/transit/path_sign_verify.go b/builtin/logical/transit/path_sign_verify.go index 5cda36776b..13c2c40d66 100644 --- a/builtin/logical/transit/path_sign_verify.go +++ b/builtin/logical/transit/path_sign_verify.go @@ -6,10 +6,10 @@ import ( "fmt" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/logical/transit/path_sign_verify_test.go b/builtin/logical/transit/path_sign_verify_test.go index ec6fb77c83..464010eec6 100644 --- a/builtin/logical/transit/path_sign_verify_test.go +++ b/builtin/logical/transit/path_sign_verify_test.go @@ -9,8 +9,8 @@ import ( "golang.org/x/crypto/ed25519" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" "github.com/mitchellh/mapstructure" ) diff --git a/builtin/logical/transit/path_trim.go b/builtin/logical/transit/path_trim.go index 363ad0e6a4..1c86928e10 100644 --- a/builtin/logical/transit/path_trim.go +++ b/builtin/logical/transit/path_trim.go @@ -3,9 +3,9 @@ package transit import ( "context" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) pathTrim() *framework.Path { diff --git a/builtin/logical/transit/path_trim_test.go b/builtin/logical/transit/path_trim_test.go index cab6fba56b..f95e86c187 100644 --- a/builtin/logical/transit/path_trim_test.go +++ b/builtin/logical/transit/path_trim_test.go @@ -3,9 +3,9 @@ package transit import ( "testing" - "github.com/hashicorp/vault/helper/keysutil" + "github.com/hashicorp/vault/sdk/helper/keysutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestTransit_Trim(t *testing.T) { diff --git a/builtin/plugin/backend.go b/builtin/plugin/backend.go index 34f0512e6f..934d8fb17c 100644 --- a/builtin/plugin/backend.go +++ b/builtin/plugin/backend.go @@ -8,10 +8,10 @@ import ( "sync" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" - bplugin "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" + bplugin "github.com/hashicorp/vault/sdk/plugin" ) var ( diff --git a/builtin/plugin/backend_test.go b/builtin/plugin/backend_test.go index 0b116db9c1..3794319597 100644 --- a/builtin/plugin/backend_test.go +++ b/builtin/plugin/backend_test.go @@ -8,13 +8,13 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/plugin" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/helper/pluginutil" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" - logicalPlugin "github.com/hashicorp/vault/logical/plugin" - "github.com/hashicorp/vault/logical/plugin/mock" + "github.com/hashicorp/vault/sdk/logical" + logicalPlugin "github.com/hashicorp/vault/sdk/plugin" + "github.com/hashicorp/vault/sdk/plugin/mock" "github.com/hashicorp/vault/vault" ) @@ -55,11 +55,11 @@ func TestBackend_PluginMain(t *testing.T) { args = append(args, fmt.Sprintf("--ca-cert=%s", caPEM)) - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(args) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) err := logicalPlugin.Serve(&logicalPlugin.ServeOpts{ BackendFactoryFunc: mock.Factory, diff --git a/command/agent.go b/command/agent.go index e9203216d5..8ea7691a8e 100644 --- a/command/agent.go +++ b/command/agent.go @@ -29,10 +29,10 @@ import ( "github.com/hashicorp/vault/command/agent/sink" "github.com/hashicorp/vault/command/agent/sink/file" "github.com/hashicorp/vault/command/agent/sink/inmem" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" gatedwriter "github.com/hashicorp/vault/helper/gated-writer" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/version" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/version" "github.com/kr/pretty" "github.com/mitchellh/cli" "github.com/posener/complete" diff --git a/command/agent/alicloud_end_to_end_test.go b/command/agent/alicloud_end_to_end_test.go index 3a35699116..99ef3d74a8 100644 --- a/command/agent/alicloud_end_to_end_test.go +++ b/command/agent/alicloud_end_to_end_test.go @@ -20,9 +20,9 @@ import ( agentalicloud "github.com/hashicorp/vault/command/agent/auth/alicloud" "github.com/hashicorp/vault/command/agent/sink" "github.com/hashicorp/vault/command/agent/sink/file" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/command/agent/approle_end_to_end_test.go b/command/agent/approle_end_to_end_test.go index 692a4de767..18e0ef4cf2 100644 --- a/command/agent/approle_end_to_end_test.go +++ b/command/agent/approle_end_to_end_test.go @@ -16,9 +16,9 @@ import ( agentapprole "github.com/hashicorp/vault/command/agent/auth/approle" "github.com/hashicorp/vault/command/agent/sink" "github.com/hashicorp/vault/command/agent/sink/file" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/command/agent/auth/approle/approle.go b/command/agent/auth/approle/approle.go index a3477136aa..5c319fafaa 100644 --- a/command/agent/auth/approle/approle.go +++ b/command/agent/auth/approle/approle.go @@ -12,7 +12,7 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/command/agent/auth" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" ) type approleMethod struct { diff --git a/command/agent/auth/auth.go b/command/agent/auth/auth.go index 73ccf6ea8e..0a14d8761d 100644 --- a/command/agent/auth/auth.go +++ b/command/agent/auth/auth.go @@ -7,7 +7,7 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" ) type AuthMethod interface { diff --git a/command/agent/auth/auth_test.go b/command/agent/auth/auth_test.go index 113ca5eb39..d934ac3d66 100644 --- a/command/agent/auth/auth_test.go +++ b/command/agent/auth/auth_test.go @@ -8,9 +8,9 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/credential/userpass" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/command/agent/auth/azure/azure.go b/command/agent/auth/azure/azure.go index 8e74c613c3..6f5356dee2 100644 --- a/command/agent/auth/azure/azure.go +++ b/command/agent/auth/azure/azure.go @@ -12,7 +12,7 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/command/agent/auth" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/helper/useragent" ) diff --git a/command/agent/auth/gcp/gcp.go b/command/agent/auth/gcp/gcp.go index 48e251be62..f4a7d92dce 100644 --- a/command/agent/auth/gcp/gcp.go +++ b/command/agent/auth/gcp/gcp.go @@ -15,7 +15,7 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/command/agent/auth" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" "golang.org/x/oauth2" iam "google.golang.org/api/iam/v1" ) diff --git a/command/agent/auth/kubernetes/kubernetes_test.go b/command/agent/auth/kubernetes/kubernetes_test.go index 9051406837..6ea560075e 100644 --- a/command/agent/auth/kubernetes/kubernetes_test.go +++ b/command/agent/auth/kubernetes/kubernetes_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/errwrap" hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/command/agent/auth" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" ) func TestKubernetesAuth_basic(t *testing.T) { diff --git a/command/agent/aws_end_to_end_test.go b/command/agent/aws_end_to_end_test.go index 5b9cbb9167..6fb4ce941d 100644 --- a/command/agent/aws_end_to_end_test.go +++ b/command/agent/aws_end_to_end_test.go @@ -20,9 +20,9 @@ import ( agentaws "github.com/hashicorp/vault/command/agent/auth/aws" "github.com/hashicorp/vault/command/agent/sink" "github.com/hashicorp/vault/command/agent/sink/file" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/command/agent/cache/api_proxy_test.go b/command/agent/cache/api_proxy_test.go index e2f6e06114..addd95a837 100644 --- a/command/agent/cache/api_proxy_test.go +++ b/command/agent/cache/api_proxy_test.go @@ -5,8 +5,8 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/helper/namespace" ) diff --git a/command/agent/cache/cache_test.go b/command/agent/cache/cache_test.go index 8c81c60bda..7201498463 100644 --- a/command/agent/cache/cache_test.go +++ b/command/agent/cache/cache_test.go @@ -19,11 +19,11 @@ import ( "github.com/hashicorp/vault/builtin/credential/userpass" "github.com/hashicorp/vault/command/agent/cache/cachememdb" "github.com/hashicorp/vault/command/agent/sink/mock" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/helper/namespace" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/command/agent/cache/handler.go b/command/agent/cache/handler.go index 24ceeeda5c..183acd1bbf 100644 --- a/command/agent/cache/handler.go +++ b/command/agent/cache/handler.go @@ -16,8 +16,8 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/command/agent/sink" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/logical" ) func Handler(ctx context.Context, logger hclog.Logger, proxier Proxier, inmemSink sink.Sink) http.Handler { diff --git a/command/agent/cache/lease_cache.go b/command/agent/cache/lease_cache.go index d9cd55f233..2125cf346b 100644 --- a/command/agent/cache/lease_cache.go +++ b/command/agent/cache/lease_cache.go @@ -20,13 +20,13 @@ import ( "github.com/hashicorp/vault/api" cachememdb "github.com/hashicorp/vault/command/agent/cache/cachememdb" "github.com/hashicorp/vault/helper/base62" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/cryptoutil" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/locksutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/cryptoutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/locksutil" "github.com/hashicorp/vault/helper/namespace" nshelper "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) const ( diff --git a/command/agent/cache/lease_cache_test.go b/command/agent/cache/lease_cache_test.go index 4f8bd758de..5dde2c35ed 100644 --- a/command/agent/cache/lease_cache_test.go +++ b/command/agent/cache/lease_cache_test.go @@ -15,8 +15,8 @@ import ( "github.com/go-test/deep" hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/logging" ) func testNewLeaseCache(t *testing.T, responses []*SendResponse) *LeaseCache { diff --git a/command/agent/cache_end_to_end_test.go b/command/agent/cache_end_to_end_test.go index 96f4de9035..e49e415b75 100644 --- a/command/agent/cache_end_to_end_test.go +++ b/command/agent/cache_end_to_end_test.go @@ -20,10 +20,10 @@ import ( "github.com/hashicorp/vault/command/agent/sink" "github.com/hashicorp/vault/command/agent/sink/file" "github.com/hashicorp/vault/command/agent/sink/inmem" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/logging" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/command/agent/config/config.go b/command/agent/config/config.go index e60e63ec6f..7c34aa1941 100644 --- a/command/agent/config/config.go +++ b/command/agent/config/config.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" diff --git a/command/agent/config/config_test.go b/command/agent/config/config_test.go index c7d50c1ce5..d82a20e0c2 100644 --- a/command/agent/config/config_test.go +++ b/command/agent/config/config_test.go @@ -7,7 +7,7 @@ import ( "github.com/go-test/deep" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" ) func TestLoadConfigFile_AgentCache(t *testing.T) { diff --git a/command/agent/jwt_end_to_end_test.go b/command/agent/jwt_end_to_end_test.go index d8cb11da75..bdb4c22f2c 100644 --- a/command/agent/jwt_end_to_end_test.go +++ b/command/agent/jwt_end_to_end_test.go @@ -16,10 +16,10 @@ import ( "github.com/hashicorp/vault/command/agent/sink" "github.com/hashicorp/vault/command/agent/sink/file" "github.com/hashicorp/vault/helper/dhutil" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/logging" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/command/agent/sink/file/file_sink_test.go b/command/agent/sink/file/file_sink_test.go index fc6649f23e..9cb3ca6a4b 100644 --- a/command/agent/sink/file/file_sink_test.go +++ b/command/agent/sink/file/file_sink_test.go @@ -10,7 +10,7 @@ import ( hclog "github.com/hashicorp/go-hclog" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/command/agent/sink" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" ) const ( diff --git a/command/agent/sink/file/sink_test.go b/command/agent/sink/file/sink_test.go index 8be1e45872..3863356fff 100644 --- a/command/agent/sink/file/sink_test.go +++ b/command/agent/sink/file/sink_test.go @@ -13,7 +13,7 @@ import ( hclog "github.com/hashicorp/go-hclog" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/command/agent/sink" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" ) func TestSinkServer(t *testing.T) { diff --git a/command/agent/sink/sink.go b/command/agent/sink/sink.go index 20742f7ac0..13e673c873 100644 --- a/command/agent/sink/sink.go +++ b/command/agent/sink/sink.go @@ -13,7 +13,7 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/helper/dhutil" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" ) type Sink interface { diff --git a/command/agent/testing.go b/command/agent/testing.go index 1f6056423a..d4de988a98 100644 --- a/command/agent/testing.go +++ b/command/agent/testing.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" jose "gopkg.in/square/go-jose.v2" "gopkg.in/square/go-jose.v2/jwt" ) diff --git a/command/agent_test.go b/command/agent_test.go index 0d8de93059..2ea38e622c 100644 --- a/command/agent_test.go +++ b/command/agent_test.go @@ -10,9 +10,9 @@ import ( vaultjwt "github.com/hashicorp/vault-plugin-auth-jwt" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/command/agent" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" "github.com/mitchellh/cli" ) diff --git a/command/approle_concurrency_integ_test.go b/command/approle_concurrency_integ_test.go index 4e940d6a23..597fc8d0eb 100644 --- a/command/approle_concurrency_integ_test.go +++ b/command/approle_concurrency_integ_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/vault/api" credAppRole "github.com/hashicorp/vault/builtin/credential/approle" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/command/auth_enable.go b/command/auth_enable.go index 796757239a..3325351294 100644 --- a/command/auth_enable.go +++ b/command/auth_enable.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/auth_enable_test.go b/command/auth_enable_test.go index 6813ded478..dbb7ea2f44 100644 --- a/command/auth_enable_test.go +++ b/command/auth_enable_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/vault/helper/builtinplugins" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/mitchellh/cli" ) diff --git a/command/base_predict.go b/command/base_predict.go index 51284343cd..4f2d712310 100644 --- a/command/base_predict.go +++ b/command/base_predict.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/posener/complete" ) diff --git a/command/command_test.go b/command/command_test.go index 861598e5b1..dec1b0ad01 100644 --- a/command/command_test.go +++ b/command/command_test.go @@ -17,8 +17,8 @@ import ( "github.com/hashicorp/vault/builtin/logical/ssh" "github.com/hashicorp/vault/builtin/logical/transit" "github.com/hashicorp/vault/helper/builtinplugins" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/physical/inmem" "github.com/hashicorp/vault/vault" "github.com/mitchellh/cli" diff --git a/command/commands.go b/command/commands.go index 4b894a1046..a2815bc811 100644 --- a/command/commands.go +++ b/command/commands.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/vault/audit" "github.com/hashicorp/vault/builtin/plugin" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/physical" - "github.com/hashicorp/vault/version" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/physical" + "github.com/hashicorp/vault/sdk/version" "github.com/mitchellh/cli" /* @@ -49,7 +49,7 @@ import ( physFile "github.com/hashicorp/vault/physical/file" physFoundationDB "github.com/hashicorp/vault/physical/foundationdb" physGCS "github.com/hashicorp/vault/physical/gcs" - physInmem "github.com/hashicorp/vault/physical/inmem" + physInmem "github.com/hashicorp/vault/sdk/physical/inmem" physManta "github.com/hashicorp/vault/physical/manta" physMSSQL "github.com/hashicorp/vault/physical/mssql" physMySQL "github.com/hashicorp/vault/physical/mysql" diff --git a/command/config/config.go b/command/config/config.go index 188924236d..4a9916e131 100644 --- a/command/config/config.go +++ b/command/config/config.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" - "github.com/hashicorp/vault/helper/hclutil" + "github.com/hashicorp/vault/sdk/helper/hclutil" homedir "github.com/mitchellh/go-homedir" ) diff --git a/command/format_test.go b/command/format_test.go index c9478301fa..660d09d29f 100644 --- a/command/format_test.go +++ b/command/format_test.go @@ -8,7 +8,7 @@ import ( "github.com/ghodss/yaml" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" ) var output string diff --git a/command/kv_helpers.go b/command/kv_helpers.go index 4b16c37631..654584089b 100644 --- a/command/kv_helpers.go +++ b/command/kv_helpers.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" ) func kvReadRequest(client *api.Client, path string, params map[string]string) (*api.Secret, error) { diff --git a/command/operator_migrate.go b/command/operator_migrate.go index 0e6000dd80..5e44533da9 100644 --- a/command/operator_migrate.go +++ b/command/operator_migrate.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" "github.com/hashicorp/vault/command/server" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" "github.com/hashicorp/vault/vault" "github.com/mitchellh/cli" "github.com/pkg/errors" diff --git a/command/operator_migrate_test.go b/command/operator_migrate_test.go index 812200d654..9179cbd594 100644 --- a/command/operator_migrate_test.go +++ b/command/operator_migrate_test.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/vault/command/server" "github.com/hashicorp/vault/helper/base62" "github.com/hashicorp/vault/helper/testhelpers" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" "github.com/hashicorp/vault/vault" ) diff --git a/command/path_map_upgrade_api_test.go b/command/path_map_upgrade_api_test.go index 14c84bffcf..57c1f77340 100644 --- a/command/path_map_upgrade_api_test.go +++ b/command/path_map_upgrade_api_test.go @@ -6,7 +6,7 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/api" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" credAppId "github.com/hashicorp/vault/builtin/credential/app-id" diff --git a/command/plugin_deregister.go b/command/plugin_deregister.go index 897c1292b1..7c5e4a16e8 100644 --- a/command/plugin_deregister.go +++ b/command/plugin_deregister.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/plugin_deregister_test.go b/command/plugin_deregister_test.go index 11671aef7c..9696c2f33c 100644 --- a/command/plugin_deregister_test.go +++ b/command/plugin_deregister_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/mitchellh/cli" ) diff --git a/command/plugin_info.go b/command/plugin_info.go index 63d6d71f11..bed47e3184 100644 --- a/command/plugin_info.go +++ b/command/plugin_info.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/plugin_info_test.go b/command/plugin_info_test.go index a3818a1af0..46dac68138 100644 --- a/command/plugin_info_test.go +++ b/command/plugin_info_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/mitchellh/cli" ) diff --git a/command/plugin_list.go b/command/plugin_list.go index 8ed9da9b90..837a165c5b 100644 --- a/command/plugin_list.go +++ b/command/plugin_list.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/plugin_register.go b/command/plugin_register.go index 718bb6b3c5..f53562bb6b 100644 --- a/command/plugin_register.go +++ b/command/plugin_register.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/plugin_register_test.go b/command/plugin_register_test.go index e84108d9ab..05b358e6f4 100644 --- a/command/plugin_register_test.go +++ b/command/plugin_register_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/mitchellh/cli" ) diff --git a/command/plugin_test.go b/command/plugin_test.go index fb0d87ce10..e45ea69335 100644 --- a/command/plugin_test.go +++ b/command/plugin_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" ) // testPluginDir creates a temporary directory suitable for holding plugins. diff --git a/command/seal_migration_test.go b/command/seal_migration_test.go index a2de2ef116..2eaad9ae16 100644 --- a/command/seal_migration_test.go +++ b/command/seal_migration_test.go @@ -9,10 +9,10 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/physical" - physInmem "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/physical" + physInmem "github.com/hashicorp/vault/sdk/physical/inmem" "github.com/hashicorp/vault/shamir" "github.com/hashicorp/vault/vault" "github.com/hashicorp/vault/vault/seal" diff --git a/command/secrets_enable.go b/command/secrets_enable.go index 8b0fdb3458..4335990f41 100644 --- a/command/secrets_enable.go +++ b/command/secrets_enable.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/secrets_enable_test.go b/command/secrets_enable_test.go index f3be8ffaf3..a81abdcc1a 100644 --- a/command/secrets_enable_test.go +++ b/command/secrets_enable_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/hashicorp/vault/helper/builtinplugins" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/mitchellh/cli" ) diff --git a/command/server.go b/command/server.go index b2f1c0bea8..7810daa0ff 100644 --- a/command/server.go +++ b/command/server.go @@ -35,18 +35,18 @@ import ( serverseal "github.com/hashicorp/vault/command/server/seal" "github.com/hashicorp/vault/helper/builtinplugins" gatedwriter "github.com/hashicorp/vault/helper/gated-writer" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/helper/mlock" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/helper/mlock" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" "github.com/hashicorp/vault/helper/reload" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/physical" "github.com/hashicorp/vault/vault" vaultseal "github.com/hashicorp/vault/vault/seal" - "github.com/hashicorp/vault/version" + "github.com/hashicorp/vault/sdk/version" "github.com/mitchellh/cli" testing "github.com/mitchellh/go-testing-interface" "github.com/posener/complete" diff --git a/command/server/config.go b/command/server/config.go index e80bcb0ddf..3f03200bae 100644 --- a/command/server/config.go +++ b/command/server/config.go @@ -17,7 +17,7 @@ import ( multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" ) const ( diff --git a/command/server/config_test.go b/command/server/config_test.go index dc6f345a41..e6e9dda429 100644 --- a/command/server/config_test.go +++ b/command/server/config_test.go @@ -9,7 +9,7 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" ) func TestLoadConfigFile(t *testing.T) { diff --git a/command/server/listener_tcp.go b/command/server/listener_tcp.go index ac5938fd53..5840db0bfb 100644 --- a/command/server/listener_tcp.go +++ b/command/server/listener_tcp.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/helper/listenerutil" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" "github.com/hashicorp/vault/helper/reload" "github.com/mitchellh/cli" ) diff --git a/command/server/seal/server_seal_alicloudkms.go b/command/server/seal/server_seal_alicloudkms.go index c928d60dcf..6d20da7a58 100644 --- a/command/server/seal/server_seal_alicloudkms.go +++ b/command/server/seal/server_seal_alicloudkms.go @@ -4,7 +4,7 @@ import ( "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/command/server" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" "github.com/hashicorp/vault/vault/seal/alicloudkms" ) diff --git a/command/server/seal/server_seal_awskms.go b/command/server/seal/server_seal_awskms.go index 0ab3a00566..f0cefcefd7 100644 --- a/command/server/seal/server_seal_awskms.go +++ b/command/server/seal/server_seal_awskms.go @@ -4,7 +4,7 @@ import ( "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/command/server" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" "github.com/hashicorp/vault/vault/seal/awskms" ) diff --git a/command/server/seal/server_seal_azurekeyvault.go b/command/server/seal/server_seal_azurekeyvault.go index cfbc942a2a..443b8dc708 100644 --- a/command/server/seal/server_seal_azurekeyvault.go +++ b/command/server/seal/server_seal_azurekeyvault.go @@ -4,7 +4,7 @@ import ( "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/command/server" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" "github.com/hashicorp/vault/vault/seal/azurekeyvault" ) diff --git a/command/server/seal/server_seal_gcpckms.go b/command/server/seal/server_seal_gcpckms.go index bd614b34a3..51f9b06cf3 100644 --- a/command/server/seal/server_seal_gcpckms.go +++ b/command/server/seal/server_seal_gcpckms.go @@ -4,7 +4,7 @@ import ( "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/command/server" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" "github.com/hashicorp/vault/vault/seal/gcpckms" ) diff --git a/command/server/seal/server_seal_transit.go b/command/server/seal/server_seal_transit.go index 1531daa94f..8382901651 100644 --- a/command/server/seal/server_seal_transit.go +++ b/command/server/seal/server_seal_transit.go @@ -4,7 +4,7 @@ import ( "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/command/server" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" "github.com/hashicorp/vault/vault/seal/transit" ) diff --git a/command/server_devfourcluster.go b/command/server_devfourcluster.go index 791de95957..c9d3ea110a 100644 --- a/command/server_devfourcluster.go +++ b/command/server_devfourcluster.go @@ -20,9 +20,9 @@ import ( "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/helper/testhelpers" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" - "github.com/hashicorp/vault/version" + "github.com/hashicorp/vault/sdk/version" testing "github.com/mitchellh/go-testing-interface" "github.com/pkg/errors" ) diff --git a/command/server_test.go b/command/server_test.go index 24d5125cb2..6bdf21fc55 100644 --- a/command/server_test.go +++ b/command/server_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - "github.com/hashicorp/vault/physical" - physInmem "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/physical" + physInmem "github.com/hashicorp/vault/sdk/physical/inmem" "github.com/mitchellh/cli" ) diff --git a/command/version.go b/command/version.go index 398036d3a1..15c1f048f6 100644 --- a/command/version.go +++ b/command/version.go @@ -3,7 +3,7 @@ package command import ( "strings" - "github.com/hashicorp/vault/version" + "github.com/hashicorp/vault/sdk/version" "github.com/mitchellh/cli" "github.com/posener/complete" ) diff --git a/command/version_test.go b/command/version_test.go index 0f59e9ffcb..b952cef01c 100644 --- a/command/version_test.go +++ b/command/version_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/hashicorp/vault/version" + "github.com/hashicorp/vault/sdk/version" "github.com/mitchellh/cli" ) diff --git a/helper/awsutil/error.go b/helper/awsutil/error.go index 64f72d263f..708382766f 100644 --- a/helper/awsutil/error.go +++ b/helper/awsutil/error.go @@ -3,7 +3,7 @@ package awsutil import ( awsRequest "github.com/aws/aws-sdk-go/aws/request" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) // CheckAWSError will examine an error and convert to a logical error if diff --git a/helper/awsutil/error_test.go b/helper/awsutil/error_test.go index 89299c8b5b..c6ea8456d9 100644 --- a/helper/awsutil/error_test.go +++ b/helper/awsutil/error_test.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func Test_CheckAWSError(t *testing.T) { diff --git a/helper/builtinplugins/registry.go b/helper/builtinplugins/registry.go index 1183f76266..92dd8573f9 100644 --- a/helper/builtinplugins/registry.go +++ b/helper/builtinplugins/registry.go @@ -1,8 +1,8 @@ package builtinplugins import ( - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/plugins/helper/database/credsutil" credAliCloud "github.com/hashicorp/vault-plugin-auth-alicloud" diff --git a/helper/cidrutil/cidr.go b/helper/cidrutil/cidr.go index 23c458fc37..a1e4d86eb3 100644 --- a/helper/cidrutil/cidr.go +++ b/helper/cidrutil/cidr.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/errwrap" sockaddr "github.com/hashicorp/go-sockaddr" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" ) // RemoteAddrIsOk checks if the given remote address is either: diff --git a/helper/forwarding/util.go b/helper/forwarding/util.go index d33e7e041b..90334052f0 100644 --- a/helper/forwarding/util.go +++ b/helper/forwarding/util.go @@ -12,8 +12,8 @@ import ( "os" "github.com/golang/protobuf/proto" - "github.com/hashicorp/vault/helper/compressutil" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/compressutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" ) type bufCloser struct { diff --git a/helper/kv-builder/builder.go b/helper/kv-builder/builder.go index b0292b92e7..212c661530 100644 --- a/helper/kv-builder/builder.go +++ b/helper/kv-builder/builder.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/mitchellh/mapstructure" ) diff --git a/helper/ldaputil/config.go b/helper/ldaputil/config.go index 7169a8c82b..7336532168 100644 --- a/helper/ldaputil/config.go +++ b/helper/ldaputil/config.go @@ -9,7 +9,7 @@ import ( "text/template" "github.com/hashicorp/vault/helper/tlsutil" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/framework" "github.com/hashicorp/errwrap" ) diff --git a/helper/listenerutil/listener.go b/helper/listenerutil/listener.go index 755dac0c59..b619e8467f 100644 --- a/helper/listenerutil/listener.go +++ b/helper/listenerutil/listener.go @@ -11,7 +11,7 @@ import ( "strconv" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" "github.com/hashicorp/vault/helper/reload" "github.com/hashicorp/vault/helper/tlsutil" "github.com/jefferai/isbadcipher" diff --git a/helper/metricsutil/metricsutil.go b/helper/metricsutil/metricsutil.go index 0599b4a0e0..f8b799bd52 100644 --- a/helper/metricsutil/metricsutil.go +++ b/helper/metricsutil/metricsutil.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" "github.com/armon/go-metrics" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/expfmt" "strings" diff --git a/helper/mfa/duo/duo.go b/helper/mfa/duo/duo.go index 51d33717cc..c508b55f93 100644 --- a/helper/mfa/duo/duo.go +++ b/helper/mfa/duo/duo.go @@ -9,8 +9,8 @@ import ( "net/url" "github.com/duosecurity/duo_api_golang/authapi" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // DuoPaths returns path functions to configure Duo. diff --git a/helper/mfa/duo/duo_test.go b/helper/mfa/duo/duo_test.go index fd31128efc..0360d2cb3f 100644 --- a/helper/mfa/duo/duo_test.go +++ b/helper/mfa/duo/duo_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/duosecurity/duo_api_golang/authapi" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/logical" ) type MockClientData struct { diff --git a/helper/mfa/duo/path_duo_access.go b/helper/mfa/duo/path_duo_access.go index 5a50c69722..1b0b4bae8b 100644 --- a/helper/mfa/duo/path_duo_access.go +++ b/helper/mfa/duo/path_duo_access.go @@ -7,8 +7,8 @@ import ( duoapi "github.com/duosecurity/duo_api_golang" "github.com/duosecurity/duo_api_golang/authapi" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) type AuthClient interface { diff --git a/helper/mfa/duo/path_duo_config.go b/helper/mfa/duo/path_duo_config.go index 9aee9b0bee..7da86a43e3 100644 --- a/helper/mfa/duo/path_duo_config.go +++ b/helper/mfa/duo/path_duo_config.go @@ -5,8 +5,8 @@ import ( "errors" "strings" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathDuoConfig() *framework.Path { diff --git a/helper/mfa/mfa.go b/helper/mfa/mfa.go index 69697f3c35..fa471d3e6e 100644 --- a/helper/mfa/mfa.go +++ b/helper/mfa/mfa.go @@ -16,8 +16,8 @@ import ( "context" "github.com/hashicorp/vault/helper/mfa/duo" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // MFAPaths returns paths to wrap the original login path and configure MFA. diff --git a/helper/mfa/mfa_test.go b/helper/mfa/mfa_test.go index 29ec0ec4e9..3343996c78 100644 --- a/helper/mfa/mfa_test.go +++ b/helper/mfa/mfa_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" - logicaltest "github.com/hashicorp/vault/logical/testing" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" + logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical" ) // MakeTestBackend creates a simple MFA enabled backend. diff --git a/helper/mfa/path_mfa_config.go b/helper/mfa/path_mfa_config.go index d290baa3f0..eeddf88f99 100644 --- a/helper/mfa/path_mfa_config.go +++ b/helper/mfa/path_mfa_config.go @@ -3,8 +3,8 @@ package mfa import ( "context" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathMFAConfig(b *backend) *framework.Path { diff --git a/helper/pgpkeys/keybase.go b/helper/pgpkeys/keybase.go index cba9a713b6..2157235053 100644 --- a/helper/pgpkeys/keybase.go +++ b/helper/pgpkeys/keybase.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/errwrap" cleanhttp "github.com/hashicorp/go-cleanhttp" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/keybase/go-crypto/openpgp" ) diff --git a/helper/policyutil/policyutil.go b/helper/policyutil/policyutil.go index 3d4340ee38..85beaf214d 100644 --- a/helper/policyutil/policyutil.go +++ b/helper/policyutil/policyutil.go @@ -4,7 +4,7 @@ import ( "sort" "strings" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" ) const ( diff --git a/helper/proxyutil/proxyutil.go b/helper/proxyutil/proxyutil.go index f18ec1d149..4c3734022e 100644 --- a/helper/proxyutil/proxyutil.go +++ b/helper/proxyutil/proxyutil.go @@ -9,7 +9,7 @@ import ( proxyproto "github.com/armon/go-proxyproto" "github.com/hashicorp/errwrap" sockaddr "github.com/hashicorp/go-sockaddr" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" ) // ProxyProtoConfig contains configuration for the PROXY protocol diff --git a/helper/storagepacker/storagepacker.go b/helper/storagepacker/storagepacker.go index 3518ed8f2d..3c69f290b1 100644 --- a/helper/storagepacker/storagepacker.go +++ b/helper/storagepacker/storagepacker.go @@ -11,9 +11,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/compressutil" - "github.com/hashicorp/vault/helper/locksutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/compressutil" + "github.com/hashicorp/vault/sdk/helper/locksutil" + "github.com/hashicorp/vault/sdk/logical" ) const ( diff --git a/helper/storagepacker/storagepacker_test.go b/helper/storagepacker/storagepacker_test.go index e7e3d5aa9c..0ce26f10b0 100644 --- a/helper/storagepacker/storagepacker_test.go +++ b/helper/storagepacker/storagepacker_test.go @@ -8,7 +8,7 @@ import ( log "github.com/hashicorp/go-hclog" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/helper/identity" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func BenchmarkStoragePacker(b *testing.B) { diff --git a/logical/testing/testing.go b/helper/testhelpers/logical/testing.go similarity index 99% rename from logical/testing/testing.go rename to helper/testhelpers/logical/testing.go index 0171330f17..9ab77ac4f0 100644 --- a/logical/testing/testing.go +++ b/helper/testhelpers/logical/testing.go @@ -13,11 +13,11 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/physical/inmem" "github.com/hashicorp/vault/vault" ) diff --git a/logical/testing/testing_test.go b/helper/testhelpers/logical/testing_test.go similarity index 100% rename from logical/testing/testing_test.go rename to helper/testhelpers/logical/testing_test.go diff --git a/helper/testhelpers/testhelpers.go b/helper/testhelpers/testhelpers.go index d039ca8013..c150f77c5b 100644 --- a/helper/testhelpers/testhelpers.go +++ b/helper/testhelpers/testhelpers.go @@ -12,16 +12,16 @@ import ( "time" "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/api" credAppRole "github.com/hashicorp/vault/builtin/credential/approle" credUserpass "github.com/hashicorp/vault/builtin/credential/userpass" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/xor" - "github.com/hashicorp/vault/physical" - "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/physical" + "github.com/hashicorp/vault/sdk/physical/inmem" "github.com/hashicorp/vault/vault" testing "github.com/mitchellh/go-testing-interface" ) diff --git a/helper/tlsutil/tlsutil.go b/helper/tlsutil/tlsutil.go index d7f3f29901..23fa8a6060 100644 --- a/helper/tlsutil/tlsutil.go +++ b/helper/tlsutil/tlsutil.go @@ -4,7 +4,7 @@ import ( "crypto/tls" "fmt" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" ) // TLSLookup maps the tls_min_version configuration to the internal value diff --git a/helper/useragent/useragent.go b/helper/useragent/useragent.go index 549b711316..5715437899 100644 --- a/helper/useragent/useragent.go +++ b/helper/useragent/useragent.go @@ -4,8 +4,8 @@ import ( "fmt" "runtime" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/version" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/version" ) var ( diff --git a/helper/useragent/useragent_test.go b/helper/useragent/useragent_test.go index 8b47e6105f..b56806e620 100644 --- a/helper/useragent/useragent_test.go +++ b/helper/useragent/useragent_test.go @@ -3,7 +3,7 @@ package useragent import ( "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestUserAgent(t *testing.T) { diff --git a/http/cors.go b/http/cors.go index 9e8b6fa195..de24c8caac 100644 --- a/http/cors.go +++ b/http/cors.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/vault" ) diff --git a/http/forwarding_bench_test.go b/http/forwarding_bench_test.go index 2028fa185c..dd33fa6f1f 100644 --- a/http/forwarding_bench_test.go +++ b/http/forwarding_bench_test.go @@ -11,10 +11,10 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/builtin/logical/transit" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/forwarding" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" "golang.org/x/net/http2" ) diff --git a/http/forwarding_test.go b/http/forwarding_test.go index da0850b2e8..1c068ee748 100644 --- a/http/forwarding_test.go +++ b/http/forwarding_test.go @@ -20,9 +20,9 @@ import ( "github.com/hashicorp/vault/api" credCert "github.com/hashicorp/vault/builtin/credential/cert" "github.com/hashicorp/vault/builtin/logical/transit" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/http/handler.go b/http/handler.go index d8f9a51480..2c1bb1416c 100644 --- a/http/handler.go +++ b/http/handler.go @@ -21,12 +21,12 @@ import ( "github.com/hashicorp/errwrap" cleanhttp "github.com/hashicorp/go-cleanhttp" sockaddr "github.com/hashicorp/go-sockaddr" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/helper/pathmanager" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/pathmanager" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/http/handler_test.go b/http/handler_test.go index 1fc223757a..1f82048fcb 100644 --- a/http/handler_test.go +++ b/http/handler_test.go @@ -13,9 +13,9 @@ import ( "testing" cleanhttp "github.com/hashicorp/go-cleanhttp" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/http/help.go b/http/help.go index b724393196..61941159c0 100644 --- a/http/help.go +++ b/http/help.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/http/http_test.go b/http/http_test.go index d7f4d8fcbd..1f2b204447 100644 --- a/http/http_test.go +++ b/http/http_test.go @@ -12,8 +12,8 @@ import ( "time" cleanhttp "github.com/hashicorp/go-cleanhttp" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/jsonutil" ) func testHttpGet(t *testing.T, token string, addr string) *http.Response { diff --git a/http/logical.go b/http/logical.go index 722643d1eb..5e1e700585 100644 --- a/http/logical.go +++ b/http/logical.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/errwrap" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/http/logical_test.go b/http/logical_test.go index e70604baaf..1bfcf1729e 100644 --- a/http/logical_test.go +++ b/http/logical_test.go @@ -16,12 +16,12 @@ import ( "github.com/go-test/deep" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/physical" - "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/physical" + "github.com/hashicorp/vault/sdk/physical/inmem" "github.com/hashicorp/vault/vault" ) diff --git a/http/plugin_test.go b/http/plugin_test.go index 71b051c69e..4126281740 100644 --- a/http/plugin_test.go +++ b/http/plugin_test.go @@ -11,13 +11,13 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/api" bplugin "github.com/hashicorp/vault/builtin/plugin" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/plugin" - "github.com/hashicorp/vault/logical/plugin/mock" - "github.com/hashicorp/vault/physical" - "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/plugin" + "github.com/hashicorp/vault/sdk/plugin/mock" + "github.com/hashicorp/vault/sdk/physical" + "github.com/hashicorp/vault/sdk/physical/inmem" "github.com/hashicorp/vault/vault" ) @@ -76,12 +76,12 @@ func TestPlugin_PluginMain(t *testing.T) { args := []string{"--ca-cert=" + caPEM} - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(args) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) factoryFunc := mock.FactoryType(logical.TypeLogical) diff --git a/http/sys_health.go b/http/sys_health.go index 02136ceca0..2a3f53aed1 100644 --- a/http/sys_health.go +++ b/http/sys_health.go @@ -8,9 +8,9 @@ import ( "strconv" "time" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/vault" - "github.com/hashicorp/vault/version" + "github.com/hashicorp/vault/sdk/version" ) func handleSysHealth(core *vault.Core) http.Handler { diff --git a/http/sys_health_test.go b/http/sys_health_test.go index 8a322f8f1b..1a7dc22c5f 100644 --- a/http/sys_health_test.go +++ b/http/sys_health_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/vault" ) diff --git a/http/sys_lease_test.go b/http/sys_lease_test.go index de1dc6c84e..a254be71c2 100644 --- a/http/sys_lease_test.go +++ b/http/sys_lease_test.go @@ -3,7 +3,7 @@ package http import ( "testing" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/vault" ) diff --git a/http/sys_rekey.go b/http/sys_rekey.go index 4e7a83f402..3acb9205ec 100644 --- a/http/sys_rekey.go +++ b/http/sys_rekey.go @@ -8,7 +8,7 @@ import ( "fmt" "net/http" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/pgpkeys" "github.com/hashicorp/vault/vault" ) diff --git a/http/sys_seal.go b/http/sys_seal.go index 37599201b2..596b3740eb 100644 --- a/http/sys_seal.go +++ b/http/sys_seal.go @@ -9,10 +9,10 @@ import ( "net/http" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" - "github.com/hashicorp/vault/version" + "github.com/hashicorp/vault/sdk/version" ) func handleSysSeal(core *vault.Core) http.Handler { diff --git a/http/sys_seal_test.go b/http/sys_seal_test.go index b38bedc1ec..fbd058e195 100644 --- a/http/sys_seal_test.go +++ b/http/sys_seal_test.go @@ -10,7 +10,7 @@ import ( "github.com/go-test/deep" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/http/sys_wrapping_test.go b/http/sys_wrapping_test.go index b88504e38f..ab82b927c5 100644 --- a/http/sys_wrapping_test.go +++ b/http/sys_wrapping_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/vault" ) diff --git a/http/unwrapping_raw_body_test.go b/http/unwrapping_raw_body_test.go index 358c81f5e8..6ba24b7c90 100644 --- a/http/unwrapping_raw_body_test.go +++ b/http/unwrapping_raw_body_test.go @@ -5,7 +5,7 @@ import ( kv "github.com/hashicorp/vault-plugin-secrets-kv" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/physical/alicloudoss/alicloudoss.go b/physical/alicloudoss/alicloudoss.go index e50227a1d6..ac47b60325 100644 --- a/physical/alicloudoss/alicloudoss.go +++ b/physical/alicloudoss/alicloudoss.go @@ -15,7 +15,7 @@ import ( metrics "github.com/armon/go-metrics" "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" ) // Verify AliCloudOSSBackend satisfies the correct interfaces diff --git a/physical/alicloudoss/alicloudoss_test.go b/physical/alicloudoss/alicloudoss_test.go index 1002c773a6..3e0091945c 100644 --- a/physical/alicloudoss/alicloudoss_test.go +++ b/physical/alicloudoss/alicloudoss_test.go @@ -9,8 +9,8 @@ import ( "github.com/aliyun/aliyun-oss-go-sdk/oss" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" ) func TestAliCloudOSSBackend(t *testing.T) { diff --git a/physical/azure/azure.go b/physical/azure/azure.go index 6241f9ee26..1f418891c9 100644 --- a/physical/azure/azure.go +++ b/physical/azure/azure.go @@ -17,8 +17,8 @@ import ( "github.com/hashicorp/errwrap" cleanhttp "github.com/hashicorp/go-cleanhttp" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/physical" ) const ( diff --git a/physical/azure/azure_test.go b/physical/azure/azure_test.go index 5b72f60273..8ec90b5d6b 100644 --- a/physical/azure/azure_test.go +++ b/physical/azure/azure_test.go @@ -12,8 +12,8 @@ import ( "github.com/Azure/go-autorest/autorest/azure" cleanhttp "github.com/hashicorp/go-cleanhttp" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" ) func environmentForCleanupClient(name string) (azure.Environment, error) { diff --git a/physical/cassandra/cassandra.go b/physical/cassandra/cassandra.go index 528e26ece8..0276e0ce39 100644 --- a/physical/cassandra/cassandra.go +++ b/physical/cassandra/cassandra.go @@ -15,8 +15,8 @@ import ( metrics "github.com/armon/go-metrics" "github.com/gocql/gocql" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/physical" ) // CassandraBackend is a physical backend that stores data in Cassandra. diff --git a/physical/cassandra/cassandra_test.go b/physical/cassandra/cassandra_test.go index f5cab6fcea..06534fc50b 100644 --- a/physical/cassandra/cassandra_test.go +++ b/physical/cassandra/cassandra_test.go @@ -10,8 +10,8 @@ import ( "github.com/gocql/gocql" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" "github.com/ory/dockertest" ) diff --git a/physical/cockroachdb/cockroachdb.go b/physical/cockroachdb/cockroachdb.go index 377b27429e..3900708e27 100644 --- a/physical/cockroachdb/cockroachdb.go +++ b/physical/cockroachdb/cockroachdb.go @@ -13,8 +13,8 @@ import ( "github.com/cockroachdb/cockroach-go/crdb" "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/physical" // CockroachDB uses the Postgres SQL driver _ "github.com/lib/pq" diff --git a/physical/cockroachdb/cockroachdb_test.go b/physical/cockroachdb/cockroachdb_test.go index e360937d07..97456e65e0 100644 --- a/physical/cockroachdb/cockroachdb_test.go +++ b/physical/cockroachdb/cockroachdb_test.go @@ -9,8 +9,8 @@ import ( "github.com/ory/dockertest" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" _ "github.com/lib/pq" ) diff --git a/physical/consul/consul.go b/physical/consul/consul.go index 0ad84dad89..da56a1088c 100644 --- a/physical/consul/consul.go +++ b/physical/consul/consul.go @@ -27,11 +27,11 @@ import ( "github.com/hashicorp/consul/lib" "github.com/hashicorp/errwrap" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/helper/tlsutil" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" ) const ( diff --git a/physical/consul/consul_test.go b/physical/consul/consul_test.go index 625c973b15..85e79170f3 100644 --- a/physical/consul/consul_test.go +++ b/physical/consul/consul_test.go @@ -12,9 +12,9 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/consul/api" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/physical" dockertest "gopkg.in/ory-am/dockertest.v2" ) diff --git a/physical/couchdb/couchdb.go b/physical/couchdb/couchdb.go index d2323f9c30..b19a1c9335 100644 --- a/physical/couchdb/couchdb.go +++ b/physical/couchdb/couchdb.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/errwrap" cleanhttp "github.com/hashicorp/go-cleanhttp" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" ) // CouchDBBackend allows the management of couchdb users diff --git a/physical/couchdb/couchdb_test.go b/physical/couchdb/couchdb_test.go index 92d0229582..aa023084bf 100644 --- a/physical/couchdb/couchdb_test.go +++ b/physical/couchdb/couchdb_test.go @@ -10,8 +10,8 @@ import ( "time" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" "github.com/ory/dockertest" ) diff --git a/physical/dynamodb/dynamodb.go b/physical/dynamodb/dynamodb.go index fd479acb22..c827ea2595 100644 --- a/physical/dynamodb/dynamodb.go +++ b/physical/dynamodb/dynamodb.go @@ -25,8 +25,8 @@ import ( cleanhttp "github.com/hashicorp/go-cleanhttp" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/helper/awsutil" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/physical" ) const ( diff --git a/physical/dynamodb/dynamodb_test.go b/physical/dynamodb/dynamodb_test.go index e11591b661..8ed7f88611 100644 --- a/physical/dynamodb/dynamodb_test.go +++ b/physical/dynamodb/dynamodb_test.go @@ -11,8 +11,8 @@ import ( "github.com/go-test/deep" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" "github.com/ory/dockertest" "github.com/aws/aws-sdk-go/aws" diff --git a/physical/etcd/etcd.go b/physical/etcd/etcd.go index f0f42f0238..c624a69886 100644 --- a/physical/etcd/etcd.go +++ b/physical/etcd/etcd.go @@ -10,7 +10,7 @@ import ( "github.com/coreos/go-semver/semver" "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" "go.etcd.io/etcd/client" ) diff --git a/physical/etcd/etcd2.go b/physical/etcd/etcd2.go index 7cc2baf9ed..b483ff2895 100644 --- a/physical/etcd/etcd2.go +++ b/physical/etcd/etcd2.go @@ -14,7 +14,7 @@ import ( metrics "github.com/armon/go-metrics" log "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" "go.etcd.io/etcd/client" "go.etcd.io/etcd/pkg/transport" ) diff --git a/physical/etcd/etcd3.go b/physical/etcd/etcd3.go index 15c2dc9c56..533f220cdc 100644 --- a/physical/etcd/etcd3.go +++ b/physical/etcd/etcd3.go @@ -14,9 +14,9 @@ import ( metrics "github.com/armon/go-metrics" "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/physical" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3/concurrency" "go.etcd.io/etcd/pkg/transport" diff --git a/physical/etcd/etcd3_test.go b/physical/etcd/etcd3_test.go index b77e2dd787..491cf3ffc3 100644 --- a/physical/etcd/etcd3_test.go +++ b/physical/etcd/etcd3_test.go @@ -7,8 +7,8 @@ import ( "time" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" ) func TestEtcd3Backend(t *testing.T) { diff --git a/physical/etcd/etcd_test.go b/physical/etcd/etcd_test.go index 77a79ea0c3..59d1d4ed8c 100644 --- a/physical/etcd/etcd_test.go +++ b/physical/etcd/etcd_test.go @@ -8,8 +8,8 @@ import ( "time" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" "go.etcd.io/etcd/client" ) diff --git a/physical/file/file.go b/physical/file/file.go index cf22f2b32d..736ec41597 100644 --- a/physical/file/file.go +++ b/physical/file/file.go @@ -15,9 +15,9 @@ import ( "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/physical" ) // Verify FileBackend satisfies the correct interfaces diff --git a/physical/file/file_test.go b/physical/file/file_test.go index 6ac0450b25..90da070e25 100644 --- a/physical/file/file_test.go +++ b/physical/file/file_test.go @@ -10,8 +10,8 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" ) func TestFileBackend_Base64URLEncoding(t *testing.T) { diff --git a/physical/foundationdb/foundationdb.go b/physical/foundationdb/foundationdb.go index 96b2c65934..a4e2f10a60 100644 --- a/physical/foundationdb/foundationdb.go +++ b/physical/foundationdb/foundationdb.go @@ -23,7 +23,7 @@ import ( metrics "github.com/armon/go-metrics" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" ) const ( diff --git a/physical/foundationdb/foundationdb_test.go b/physical/foundationdb/foundationdb_test.go index 031d962791..706c201bde 100644 --- a/physical/foundationdb/foundationdb_test.go +++ b/physical/foundationdb/foundationdb_test.go @@ -16,8 +16,8 @@ import ( "github.com/apple/foundationdb/bindings/go/src/fdb" "github.com/apple/foundationdb/bindings/go/src/fdb/directory" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" dockertest "gopkg.in/ory-am/dockertest.v3" ) diff --git a/physical/foundationdb/foundationdbstub.go b/physical/foundationdb/foundationdbstub.go index ed74990dd2..34ff9a0fa7 100644 --- a/physical/foundationdb/foundationdbstub.go +++ b/physical/foundationdb/foundationdbstub.go @@ -7,7 +7,7 @@ import ( log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" ) func NewFDBBackend(conf map[string]string, logger log.Logger) (physical.Backend, error) { diff --git a/physical/gcs/gcs.go b/physical/gcs/gcs.go index c9a68ebc1a..1c29f40db7 100644 --- a/physical/gcs/gcs.go +++ b/physical/gcs/gcs.go @@ -17,7 +17,7 @@ import ( log "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/vault/helper/useragent" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" "cloud.google.com/go/storage" "google.golang.org/api/iterator" diff --git a/physical/gcs/gcs_ha.go b/physical/gcs/gcs_ha.go index e6934df68c..bb61059590 100644 --- a/physical/gcs/gcs_ha.go +++ b/physical/gcs/gcs_ha.go @@ -11,7 +11,7 @@ import ( metrics "github.com/armon/go-metrics" "github.com/hashicorp/errwrap" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" "github.com/pkg/errors" "google.golang.org/api/googleapi" ) diff --git a/physical/gcs/gcs_ha_test.go b/physical/gcs/gcs_ha_test.go index 2370b39e8c..8e1b91e777 100644 --- a/physical/gcs/gcs_ha_test.go +++ b/physical/gcs/gcs_ha_test.go @@ -10,8 +10,8 @@ import ( "cloud.google.com/go/storage" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" ) func TestHABackend(t *testing.T) { diff --git a/physical/gcs/gcs_test.go b/physical/gcs/gcs_test.go index 79dfebef83..64aeaaeb4d 100644 --- a/physical/gcs/gcs_test.go +++ b/physical/gcs/gcs_test.go @@ -10,8 +10,8 @@ import ( "cloud.google.com/go/storage" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" "google.golang.org/api/googleapi" ) diff --git a/physical/manta/manta.go b/physical/manta/manta.go index cd3ec76fd0..4b687694d1 100644 --- a/physical/manta/manta.go +++ b/physical/manta/manta.go @@ -15,7 +15,7 @@ import ( metrics "github.com/armon/go-metrics" "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" triton "github.com/joyent/triton-go" "github.com/joyent/triton-go/authentication" "github.com/joyent/triton-go/errors" diff --git a/physical/manta/manta_test.go b/physical/manta/manta_test.go index ffeb562bde..8db52c53ab 100644 --- a/physical/manta/manta_test.go +++ b/physical/manta/manta_test.go @@ -10,8 +10,8 @@ import ( "time" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" triton "github.com/joyent/triton-go" "github.com/joyent/triton-go/authentication" tt "github.com/joyent/triton-go/errors" diff --git a/physical/mssql/mssql.go b/physical/mssql/mssql.go index d0029dd160..7488c4e3f7 100644 --- a/physical/mssql/mssql.go +++ b/physical/mssql/mssql.go @@ -13,8 +13,8 @@ import ( _ "github.com/denisenkom/go-mssqldb" "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/physical" ) // Verify MSSQLBackend satisfies the correct interfaces diff --git a/physical/mssql/mssql_test.go b/physical/mssql/mssql_test.go index 9c55228018..23d12cd06c 100644 --- a/physical/mssql/mssql_test.go +++ b/physical/mssql/mssql_test.go @@ -5,8 +5,8 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" _ "github.com/denisenkom/go-mssqldb" ) diff --git a/physical/mysql/mysql.go b/physical/mysql/mysql.go index 621d5c8b65..007933afbb 100644 --- a/physical/mysql/mysql.go +++ b/physical/mysql/mysql.go @@ -21,8 +21,8 @@ import ( metrics "github.com/armon/go-metrics" mysql "github.com/go-sql-driver/mysql" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/physical" ) // Verify MySQLBackend satisfies the correct interfaces diff --git a/physical/mysql/mysql_test.go b/physical/mysql/mysql_test.go index fe45bcc889..380de92f3f 100644 --- a/physical/mysql/mysql_test.go +++ b/physical/mysql/mysql_test.go @@ -5,8 +5,8 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" _ "github.com/go-sql-driver/mysql" ) diff --git a/physical/postgresql/postgresql.go b/physical/postgresql/postgresql.go index 4dbe02b9cb..d850ec0b27 100644 --- a/physical/postgresql/postgresql.go +++ b/physical/postgresql/postgresql.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" log "github.com/hashicorp/go-hclog" diff --git a/physical/postgresql/postgresql_test.go b/physical/postgresql/postgresql_test.go index ffa44fa50e..3ce70244bf 100644 --- a/physical/postgresql/postgresql_test.go +++ b/physical/postgresql/postgresql_test.go @@ -6,8 +6,8 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" _ "github.com/lib/pq" "github.com/ory/dockertest" diff --git a/physical/s3/s3.go b/physical/s3/s3.go index 0fd940624e..89db6cdc6d 100644 --- a/physical/s3/s3.go +++ b/physical/s3/s3.go @@ -22,9 +22,9 @@ import ( "github.com/hashicorp/errwrap" cleanhttp "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/vault/helper/awsutil" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/physical" ) // Verify S3Backend satisfies the correct interfaces diff --git a/physical/s3/s3_test.go b/physical/s3/s3_test.go index 2d0d004316..0ff0bdca95 100644 --- a/physical/s3/s3_test.go +++ b/physical/s3/s3_test.go @@ -9,8 +9,8 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/helper/awsutil" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" diff --git a/physical/spanner/spanner.go b/physical/spanner/spanner.go index 4724bec18f..6de36b1a33 100644 --- a/physical/spanner/spanner.go +++ b/physical/spanner/spanner.go @@ -12,9 +12,9 @@ import ( metrics "github.com/armon/go-metrics" "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/helper/useragent" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" "google.golang.org/api/iterator" "google.golang.org/api/option" "google.golang.org/grpc/codes" diff --git a/physical/spanner/spanner_ha.go b/physical/spanner/spanner_ha.go index 2e7b73965d..f8ab94a1d0 100644 --- a/physical/spanner/spanner_ha.go +++ b/physical/spanner/spanner_ha.go @@ -10,7 +10,7 @@ import ( metrics "github.com/armon/go-metrics" "github.com/hashicorp/errwrap" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" "github.com/pkg/errors" "google.golang.org/grpc/codes" ) diff --git a/physical/spanner/spanner_ha_test.go b/physical/spanner/spanner_ha_test.go index ee9f370258..49a818b393 100644 --- a/physical/spanner/spanner_ha_test.go +++ b/physical/spanner/spanner_ha_test.go @@ -7,8 +7,8 @@ import ( "cloud.google.com/go/spanner" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" ) func TestHABackend(t *testing.T) { diff --git a/physical/spanner/spanner_test.go b/physical/spanner/spanner_test.go index 0ab460646c..d484dd316c 100644 --- a/physical/spanner/spanner_test.go +++ b/physical/spanner/spanner_test.go @@ -7,8 +7,8 @@ import ( "cloud.google.com/go/spanner" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" ) func testCleanup(t testing.TB, client *spanner.Client, table string) { diff --git a/physical/swift/swift.go b/physical/swift/swift.go index a7de719b60..dc15564fa6 100644 --- a/physical/swift/swift.go +++ b/physical/swift/swift.go @@ -14,8 +14,8 @@ import ( metrics "github.com/armon/go-metrics" "github.com/hashicorp/errwrap" cleanhttp "github.com/hashicorp/go-cleanhttp" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/physical" "github.com/ncw/swift" ) diff --git a/physical/swift/swift_test.go b/physical/swift/swift_test.go index dca1bd0399..c385285437 100644 --- a/physical/swift/swift_test.go +++ b/physical/swift/swift_test.go @@ -9,8 +9,8 @@ import ( log "github.com/hashicorp/go-hclog" cleanhttp "github.com/hashicorp/go-cleanhttp" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" "github.com/ncw/swift" ) diff --git a/physical/zookeeper/zookeeper.go b/physical/zookeeper/zookeeper.go index 362a957355..adbdcd4af4 100644 --- a/physical/zookeeper/zookeeper.go +++ b/physical/zookeeper/zookeeper.go @@ -15,8 +15,8 @@ import ( "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/physical" metrics "github.com/armon/go-metrics" "github.com/hashicorp/vault/helper/tlsutil" diff --git a/physical/zookeeper/zookeeper_test.go b/physical/zookeeper/zookeeper_test.go index 4ee265c172..3edc55f104 100644 --- a/physical/zookeeper/zookeeper_test.go +++ b/physical/zookeeper/zookeeper_test.go @@ -7,8 +7,8 @@ import ( "time" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" "github.com/samuel/go-zookeeper/zk" ) diff --git a/plugins/database/cassandra/cassandra-database-plugin/main.go b/plugins/database/cassandra/cassandra-database-plugin/main.go index f9bfdeb05b..3dc998a8e0 100644 --- a/plugins/database/cassandra/cassandra-database-plugin/main.go +++ b/plugins/database/cassandra/cassandra-database-plugin/main.go @@ -4,12 +4,12 @@ import ( "log" "os" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" "github.com/hashicorp/vault/plugins/database/cassandra" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) diff --git a/plugins/database/cassandra/cassandra.go b/plugins/database/cassandra/cassandra.go index 05ad662619..4153df00af 100644 --- a/plugins/database/cassandra/cassandra.go +++ b/plugins/database/cassandra/cassandra.go @@ -9,7 +9,7 @@ import ( multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/plugins" "github.com/hashicorp/vault/plugins/helper/database/credsutil" "github.com/hashicorp/vault/plugins/helper/database/dbutil" diff --git a/plugins/database/cassandra/connection_producer.go b/plugins/database/cassandra/connection_producer.go index dcabf591ea..d434e8de49 100644 --- a/plugins/database/cassandra/connection_producer.go +++ b/plugins/database/cassandra/connection_producer.go @@ -12,8 +12,8 @@ import ( "github.com/gocql/gocql" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" "github.com/hashicorp/vault/helper/tlsutil" "github.com/hashicorp/vault/plugins/helper/database/connutil" "github.com/hashicorp/vault/plugins/helper/database/dbutil" diff --git a/plugins/database/hana/hana-database-plugin/main.go b/plugins/database/hana/hana-database-plugin/main.go index f995fe001d..874613b0e1 100644 --- a/plugins/database/hana/hana-database-plugin/main.go +++ b/plugins/database/hana/hana-database-plugin/main.go @@ -4,12 +4,12 @@ import ( "log" "os" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" "github.com/hashicorp/vault/plugins/database/hana" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) diff --git a/plugins/database/hana/hana.go b/plugins/database/hana/hana.go index 62e739a669..bf3e380a48 100644 --- a/plugins/database/hana/hana.go +++ b/plugins/database/hana/hana.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" "github.com/hashicorp/vault/helper/dbtxn" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/plugins" "github.com/hashicorp/vault/plugins/helper/database/connutil" "github.com/hashicorp/vault/plugins/helper/database/credsutil" diff --git a/plugins/database/influxdb/connection_producer.go b/plugins/database/influxdb/connection_producer.go index 7a217df2e0..87b48826fe 100644 --- a/plugins/database/influxdb/connection_producer.go +++ b/plugins/database/influxdb/connection_producer.go @@ -8,8 +8,8 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" "github.com/hashicorp/vault/helper/tlsutil" "github.com/hashicorp/vault/plugins/helper/database/connutil" influx "github.com/influxdata/influxdb/client/v2" diff --git a/plugins/database/influxdb/influxdb-database-plugin/main.go b/plugins/database/influxdb/influxdb-database-plugin/main.go index 82d2d10d7e..5b4e7121e7 100644 --- a/plugins/database/influxdb/influxdb-database-plugin/main.go +++ b/plugins/database/influxdb/influxdb-database-plugin/main.go @@ -4,12 +4,12 @@ import ( "log" "os" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" "github.com/hashicorp/vault/plugins/database/influxdb" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) diff --git a/plugins/database/influxdb/influxdb.go b/plugins/database/influxdb/influxdb.go index c4ed0d06a4..8e010f9c80 100644 --- a/plugins/database/influxdb/influxdb.go +++ b/plugins/database/influxdb/influxdb.go @@ -8,7 +8,7 @@ import ( multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/plugins" "github.com/hashicorp/vault/plugins/helper/database/credsutil" "github.com/hashicorp/vault/plugins/helper/database/dbutil" diff --git a/plugins/database/mongodb/mongodb-database-plugin/main.go b/plugins/database/mongodb/mongodb-database-plugin/main.go index eedb0d0214..f7395bd357 100644 --- a/plugins/database/mongodb/mongodb-database-plugin/main.go +++ b/plugins/database/mongodb/mongodb-database-plugin/main.go @@ -4,12 +4,12 @@ import ( "log" "os" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" "github.com/hashicorp/vault/plugins/database/mongodb" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) diff --git a/plugins/database/mssql/mssql-database-plugin/main.go b/plugins/database/mssql/mssql-database-plugin/main.go index 9201b4843d..d6cf5548f6 100644 --- a/plugins/database/mssql/mssql-database-plugin/main.go +++ b/plugins/database/mssql/mssql-database-plugin/main.go @@ -4,12 +4,12 @@ import ( "log" "os" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" "github.com/hashicorp/vault/plugins/database/mssql" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) diff --git a/plugins/database/mssql/mssql.go b/plugins/database/mssql/mssql.go index 4506041a56..8be6e5ed66 100644 --- a/plugins/database/mssql/mssql.go +++ b/plugins/database/mssql/mssql.go @@ -14,7 +14,7 @@ import ( "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" "github.com/hashicorp/vault/helper/dbtxn" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/plugins" "github.com/hashicorp/vault/plugins/helper/database/connutil" "github.com/hashicorp/vault/plugins/helper/database/credsutil" diff --git a/plugins/database/mysql/mysql-database-plugin/main.go b/plugins/database/mysql/mysql-database-plugin/main.go index 917f1b3caf..88448f9704 100644 --- a/plugins/database/mysql/mysql-database-plugin/main.go +++ b/plugins/database/mysql/mysql-database-plugin/main.go @@ -4,12 +4,12 @@ import ( "log" "os" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" "github.com/hashicorp/vault/plugins/database/mysql" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) diff --git a/plugins/database/mysql/mysql-legacy-database-plugin/main.go b/plugins/database/mysql/mysql-legacy-database-plugin/main.go index 2b950e0a39..24942fbd5c 100644 --- a/plugins/database/mysql/mysql-legacy-database-plugin/main.go +++ b/plugins/database/mysql/mysql-legacy-database-plugin/main.go @@ -4,12 +4,12 @@ import ( "log" "os" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" "github.com/hashicorp/vault/plugins/database/mysql" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) diff --git a/plugins/database/mysql/mysql.go b/plugins/database/mysql/mysql.go index bdf1fd383f..874a4a96e3 100644 --- a/plugins/database/mysql/mysql.go +++ b/plugins/database/mysql/mysql.go @@ -10,7 +10,7 @@ import ( stdmysql "github.com/go-sql-driver/mysql" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/plugins" "github.com/hashicorp/vault/plugins/helper/database/connutil" "github.com/hashicorp/vault/plugins/helper/database/credsutil" diff --git a/plugins/database/postgresql/postgresql-database-plugin/main.go b/plugins/database/postgresql/postgresql-database-plugin/main.go index a3b178969a..002a36ae79 100644 --- a/plugins/database/postgresql/postgresql-database-plugin/main.go +++ b/plugins/database/postgresql/postgresql-database-plugin/main.go @@ -4,12 +4,12 @@ import ( "log" "os" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" "github.com/hashicorp/vault/plugins/database/postgresql" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args[1:]) diff --git a/plugins/database/postgresql/postgresql.go b/plugins/database/postgresql/postgresql.go index 36dd0036a9..7a541335c1 100644 --- a/plugins/database/postgresql/postgresql.go +++ b/plugins/database/postgresql/postgresql.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" "github.com/hashicorp/vault/helper/dbtxn" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/hashicorp/vault/plugins" "github.com/hashicorp/vault/plugins/helper/database/connutil" "github.com/hashicorp/vault/plugins/helper/database/credsutil" diff --git a/plugins/helper/database/connutil/sql.go b/plugins/helper/database/connutil/sql.go index 38685d0be4..c0c60cbc13 100644 --- a/plugins/helper/database/connutil/sql.go +++ b/plugins/helper/database/connutil/sql.go @@ -9,7 +9,7 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" "github.com/hashicorp/vault/plugins/helper/database/dbutil" "github.com/mitchellh/mapstructure" ) diff --git a/plugins/serve.go b/plugins/serve.go index af80e6ce6d..40e85d6177 100644 --- a/plugins/serve.go +++ b/plugins/serve.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" ) // Serve is used to start a plugin's RPC server. It takes an interface that must @@ -13,7 +13,7 @@ import ( // use during the initial unwrap request to vault. The api config is particularly // useful when vault is setup to require client cert checking. func Serve(plugin interface{}, tlsConfig *api.TLSConfig) { - tlsProvider := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProvider := api.VaultPluginTLSProvider(tlsConfig) err := pluginutil.OptionallyEnableMlock() if err != nil { diff --git a/scripts/build.sh b/scripts/build.sh index 03ba7e91fb..a62d49726b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -52,7 +52,7 @@ echo "==> Building..." gox \ -osarch="${XC_OSARCH}" \ -gcflags "${GCFLAGS}" \ - -ldflags "${LD_FLAGS}-X github.com/hashicorp/vault/version.GitCommit='${GIT_COMMIT}${GIT_DIRTY}'" \ + -ldflags "${LD_FLAGS}-X github.com/hashicorp/vault/sdk/version.GitCommit='${GIT_COMMIT}${GIT_DIRTY}'" \ -output "pkg/{{.OS}}_{{.Arch}}/vault" \ ${GOX_PARALLEL_BUILDS+-parallel="${GOX_PARALLEL_BUILDS}"} \ -tags="${BUILD_TAGS}" \ diff --git a/scripts/windows/build.bat b/scripts/windows/build.bat index 0e33e4c673..524fbacb2f 100644 --- a/scripts/windows/build.bat +++ b/scripts/windows/build.bat @@ -60,7 +60,7 @@ echo ==^> Building... gox^ -os="%_XC_OS%"^ -arch="%_XC_ARCH%"^ - -ldflags "-X github.com/hashicorp/vault/version.GitCommit=%_GIT_COMMIT%%_GIT_DIRTY%"^ + -ldflags "-X github.com/hashicorp/vault/sdk/version.GitCommit=%_GIT_COMMIT%%_GIT_DIRTY%"^ -output "pkg/{{.OS}}_{{.Arch}}/vault"^ . diff --git a/sdk/README.md b/sdk/README.md new file mode 100644 index 0000000000..d106210535 --- /dev/null +++ b/sdk/README.md @@ -0,0 +1,12 @@ +Vault SDK libs +================= + +This package provides the `sdk` package which contains code useful for +developing Vault plugins. + +Although we try not to break functionality, we reserve the right to reorganize +the code at will and may occasionally cause breaks if they are warranted. As +such we expect the tag of this module will stay less than `v1.0.0`. + +For any major changes we will try to give advance notice in the CHANGES section +of Vault's CHANGELOG.md. diff --git a/logical/framework/backend.go b/sdk/framework/backend.go similarity index 98% rename from logical/framework/backend.go rename to sdk/framework/backend.go index 6891319444..1482826d2b 100644 --- a/logical/framework/backend.go +++ b/sdk/framework/backend.go @@ -15,11 +15,11 @@ import ( "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/helper/license" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/helper/license" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/logical" ) // Backend is an implementation of logical.Backend that allows diff --git a/logical/framework/backend_test.go b/sdk/framework/backend_test.go similarity index 99% rename from logical/framework/backend_test.go rename to sdk/framework/backend_test.go index 6ddb1ef404..f32e61cc66 100644 --- a/logical/framework/backend_test.go +++ b/sdk/framework/backend_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func BenchmarkBackendRoute(b *testing.B) { diff --git a/logical/framework/field_data.go b/sdk/framework/field_data.go similarity index 98% rename from logical/framework/field_data.go rename to sdk/framework/field_data.go index 1ed83c005e..f55c5334fd 100644 --- a/logical/framework/field_data.go +++ b/sdk/framework/field_data.go @@ -10,9 +10,9 @@ import ( "strings" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/mitchellh/mapstructure" ) diff --git a/logical/framework/field_data_test.go b/sdk/framework/field_data_test.go similarity index 100% rename from logical/framework/field_data_test.go rename to sdk/framework/field_data_test.go diff --git a/logical/framework/field_type.go b/sdk/framework/field_type.go similarity index 100% rename from logical/framework/field_type.go rename to sdk/framework/field_type.go diff --git a/logical/framework/lease.go b/sdk/framework/lease.go similarity index 98% rename from logical/framework/lease.go rename to sdk/framework/lease.go index 4f55ae0de3..c79f3cbbab 100644 --- a/logical/framework/lease.go +++ b/sdk/framework/lease.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) // LeaseExtend is left for backwards compatibility for plugins. This function diff --git a/logical/framework/lease_test.go b/sdk/framework/lease_test.go similarity index 98% rename from logical/framework/lease_test.go rename to sdk/framework/lease_test.go index 86ef28222e..e145c2a82b 100644 --- a/logical/framework/lease_test.go +++ b/sdk/framework/lease_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestCalculateTTL(t *testing.T) { diff --git a/logical/framework/openapi.go b/sdk/framework/openapi.go similarity index 99% rename from logical/framework/openapi.go rename to sdk/framework/openapi.go index 5061d59157..9d97337f13 100644 --- a/logical/framework/openapi.go +++ b/sdk/framework/openapi.go @@ -9,9 +9,9 @@ import ( "strings" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/wrapping" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/version" + "github.com/hashicorp/vault/sdk/helper/wrapping" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/version" "github.com/mitchellh/mapstructure" ) diff --git a/logical/framework/openapi_test.go b/sdk/framework/openapi_test.go similarity index 98% rename from logical/framework/openapi_test.go rename to sdk/framework/openapi_test.go index 524362aec8..a9966ca312 100644 --- a/logical/framework/openapi_test.go +++ b/sdk/framework/openapi_test.go @@ -12,10 +12,10 @@ import ( "testing" "github.com/go-test/deep" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/wrapping" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/version" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/wrapping" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/version" ) func TestOpenAPI_Regex(t *testing.T) { diff --git a/logical/framework/path.go b/sdk/framework/path.go similarity index 99% rename from logical/framework/path.go rename to sdk/framework/path.go index 4093caa00f..419ce34f6c 100644 --- a/logical/framework/path.go +++ b/sdk/framework/path.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/license" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/license" + "github.com/hashicorp/vault/sdk/logical" ) // Helper which returns a generic regex string for creating endpoint patterns diff --git a/logical/framework/path_map.go b/sdk/framework/path_map.go similarity index 98% rename from logical/framework/path_map.go rename to sdk/framework/path_map.go index 83aa0bafaa..bb675cee01 100644 --- a/logical/framework/path_map.go +++ b/sdk/framework/path_map.go @@ -6,8 +6,8 @@ import ( "strings" "sync" - saltpkg "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" + saltpkg "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" ) // PathMap can be used to generate a path that stores mappings in the diff --git a/logical/framework/path_map_test.go b/sdk/framework/path_map_test.go similarity index 98% rename from logical/framework/path_map_test.go rename to sdk/framework/path_map_test.go index 97ab774aee..11e1f37c9d 100644 --- a/logical/framework/path_map_test.go +++ b/sdk/framework/path_map_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - saltpkg "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" + saltpkg "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" ) func TestPathMap(t *testing.T) { diff --git a/logical/framework/path_struct.go b/sdk/framework/path_struct.go similarity index 96% rename from logical/framework/path_struct.go rename to sdk/framework/path_struct.go index beaed52d6d..2a2848e585 100644 --- a/logical/framework/path_struct.go +++ b/sdk/framework/path_struct.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/logical" ) // PathStruct can be used to generate a path that stores a struct diff --git a/logical/framework/path_struct_test.go b/sdk/framework/path_struct_test.go similarity index 97% rename from logical/framework/path_struct_test.go rename to sdk/framework/path_struct_test.go index 91030d4e06..4a9aa6b43f 100644 --- a/logical/framework/path_struct_test.go +++ b/sdk/framework/path_struct_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestPathStruct(t *testing.T) { diff --git a/logical/framework/path_test.go b/sdk/framework/path_test.go similarity index 100% rename from logical/framework/path_test.go rename to sdk/framework/path_test.go diff --git a/logical/framework/policy_map.go b/sdk/framework/policy_map.go similarity index 96% rename from logical/framework/policy_map.go rename to sdk/framework/policy_map.go index 089cf7f2c4..a20405561e 100644 --- a/logical/framework/policy_map.go +++ b/sdk/framework/policy_map.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) // PolicyMap is a specialization of PathMap that expects the values to diff --git a/logical/framework/policy_map_test.go b/sdk/framework/policy_map_test.go similarity index 93% rename from logical/framework/policy_map_test.go rename to sdk/framework/policy_map_test.go index d31cd10e72..6a88b80511 100644 --- a/logical/framework/policy_map_test.go +++ b/sdk/framework/policy_map_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestPolicyMap(t *testing.T) { diff --git a/logical/framework/secret.go b/sdk/framework/secret.go similarity index 98% rename from logical/framework/secret.go rename to sdk/framework/secret.go index c29e790771..d338e06f03 100644 --- a/logical/framework/secret.go +++ b/sdk/framework/secret.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) // Secret is a type of secret that can be returned from a backend. diff --git a/logical/framework/secret_test.go b/sdk/framework/secret_test.go similarity index 100% rename from logical/framework/secret_test.go rename to sdk/framework/secret_test.go diff --git a/logical/framework/template.go b/sdk/framework/template.go similarity index 100% rename from logical/framework/template.go rename to sdk/framework/template.go diff --git a/logical/framework/testdata/legacy.json b/sdk/framework/testdata/legacy.json similarity index 100% rename from logical/framework/testdata/legacy.json rename to sdk/framework/testdata/legacy.json diff --git a/logical/framework/testdata/operations.json b/sdk/framework/testdata/operations.json similarity index 100% rename from logical/framework/testdata/operations.json rename to sdk/framework/testdata/operations.json diff --git a/logical/framework/testdata/responses.json b/sdk/framework/testdata/responses.json similarity index 100% rename from logical/framework/testdata/responses.json rename to sdk/framework/testdata/responses.json diff --git a/logical/framework/testing.go b/sdk/framework/testing.go similarity index 100% rename from logical/framework/testing.go rename to sdk/framework/testing.go diff --git a/logical/framework/wal.go b/sdk/framework/wal.go similarity index 96% rename from logical/framework/wal.go rename to sdk/framework/wal.go index 0347f4003f..7e7bb1afa9 100644 --- a/logical/framework/wal.go +++ b/sdk/framework/wal.go @@ -7,8 +7,8 @@ import ( "time" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/logical" ) // WALPrefix is the prefix within Storage where WAL entries will be written. diff --git a/logical/framework/wal_test.go b/sdk/framework/wal_test.go similarity index 96% rename from logical/framework/wal_test.go rename to sdk/framework/wal_test.go index 96b3211a99..958be7e79e 100644 --- a/logical/framework/wal_test.go +++ b/sdk/framework/wal_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestWAL(t *testing.T) { diff --git a/sdk/go.mod b/sdk/go.mod new file mode 100644 index 0000000000..f3bfbc861a --- /dev/null +++ b/sdk/go.mod @@ -0,0 +1,34 @@ +module github.com/hashicorp/vault/sdk + +go 1.12 + +require ( + github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 + github.com/fatih/structs v1.1.0 + github.com/go-test/deep v1.0.1 + github.com/gogo/protobuf v1.2.1 + github.com/golang/protobuf v1.3.1 + github.com/golang/snappy v0.0.1 + github.com/hashicorp/errwrap v1.0.0 + github.com/hashicorp/go-hclog v0.8.0 + github.com/hashicorp/go-immutable-radix v1.0.0 + github.com/hashicorp/go-multierror v1.0.0 + github.com/hashicorp/go-plugin v1.0.0 + github.com/hashicorp/go-sockaddr v1.0.2 + github.com/hashicorp/go-uuid v1.0.1 + github.com/hashicorp/go-version v1.1.0 + github.com/hashicorp/golang-lru v0.5.1 + github.com/hashicorp/hcl v1.0.0 + github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect + github.com/mitchellh/copystructure v1.0.0 + github.com/mitchellh/go-testing-interface v1.0.0 + github.com/mitchellh/mapstructure v1.1.2 + github.com/pierrec/lz4 v2.0.5+incompatible + github.com/ryanuber/go-glob v1.0.0 + golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 + golang.org/x/net v0.0.0-20190311183353-d8887717615a + golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e + golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db // indirect + google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107 // indirect + google.golang.org/grpc v1.19.1 +) diff --git a/sdk/go.sum b/sdk/go.sum new file mode 100644 index 0000000000..7bf7de508b --- /dev/null +++ b/sdk/go.sum @@ -0,0 +1,136 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 h1:BUAU3CGlLvorLI26FmByPp2eC2qla6E1Tw+scpcg/to= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/go-test/deep v1.0.1 h1:UQhStjbkDClarlmv0am7OXXO4/GaPdCGiUiMTvi28sg= +github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= +github.com/hashicorp/go-hclog v0.8.0 h1:z3ollgGRg8RjfJH6UVBaG54R70GFd++QOkvnJH3VSBY= +github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= +github.com/hashicorp/go-immutable-radix v1.0.0 h1:AKDB1HM5PWEA7i4nhcpwOrO2byshxBjXVn/J/3+z5/0= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-plugin v1.0.0 h1:/gQ1sNR8/LHpoxKRQq4PmLBuacfZb4tC93e9B30o/7c= +github.com/hashicorp/go-plugin v1.0.0/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= +github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= +github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0= +github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M= +github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ= +github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mitchellh/cli v1.0.0 h1:iGBIsUe3+HZ/AD/Vd7DErOt5sU9fa8Uj7A2s1aggv1Y= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= +github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= +github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 h1:7GoSOOW2jpsfkntVKaS2rAr1TJqfcxotyaUcuxoZSzg= +github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= +github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= +github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1 h1:ccV59UEOTzVDnDUEFdT95ZzHVZ+5+158q8+SJb2QV5w= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/ryanuber/columnize v2.1.0+incompatible h1:j1Wcmh8OrK4Q7GXY+V7SVSY8nUWQxHW5TkBe7YUl+2s= +github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= +github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d h1:g9qWBGx4puODJTMVyoPrpoxPFgVGd+z1DZwjfRu4d0I= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc h1:MeuS1UDyZyFH++6vVy44PuufTeFF0d0nfI6XB87YGSk= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc h1:WiYx1rIFmx8c0mXAFtv5D/mHyKe1+jmuP7PViuwqwuQ= +golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e h1:nFYrTHrdrAOpShe27kaFHjsqYSEQ0KWqdWLu3xuZJts= +golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db h1:6/JqlYfC1CCaLnGceQTI+sDGhC9UBSPAsBqI0Gun6kU= +golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107 h1:xtNn7qFlagY2mQNFHMSRPjT2RkOV4OXM7P5TVy9xATo= +google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/grpc v1.14.0 h1:ArxJuB1NWfPY6r9Gp9gqwplT0Ge7nqv9msgu03lHLmo= +google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.19.1 h1:TrBcJ1yqAl1G++wO39nD/qtgpsW9/1+QGrluyMGEYgM= +google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/helper/certutil/certutil_test.go b/sdk/helper/certutil/certutil_test.go similarity index 99% rename from helper/certutil/certutil_test.go rename to sdk/helper/certutil/certutil_test.go index 06be21f86a..1de9c4ee88 100644 --- a/helper/certutil/certutil_test.go +++ b/sdk/helper/certutil/certutil_test.go @@ -20,7 +20,6 @@ import ( "time" "github.com/fatih/structs" - "github.com/hashicorp/vault/api" ) // Tests converting back and forth between a CertBundle and a ParsedCertBundle. @@ -123,10 +122,8 @@ func TestCertBundleParsing(t *testing.T) { t.Fatalf(err.Error()) } - secret := &api.Secret{ - Data: structs.New(cbut).Map(), - } - pcbut, err = ParsePKIMap(secret.Data) + dataMap := structs.New(cbut).Map() + pcbut, err = ParsePKIMap(dataMap) if err != nil { t.Logf("Error occurred with bundle %d in test array (index %d).\n", i+1, i) t.Fatalf("Error during JSON bundle handling: %s", err) diff --git a/helper/certutil/helpers.go b/sdk/helper/certutil/helpers.go similarity index 98% rename from helper/certutil/helpers.go rename to sdk/helper/certutil/helpers.go index 7c66519428..d1cc281596 100644 --- a/helper/certutil/helpers.go +++ b/sdk/helper/certutil/helpers.go @@ -16,8 +16,8 @@ import ( "strconv" "strings" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/mitchellh/mapstructure" ) diff --git a/helper/certutil/types.go b/sdk/helper/certutil/types.go similarity index 99% rename from helper/certutil/types.go rename to sdk/helper/certutil/types.go index 06c3b3b114..62b494b19a 100644 --- a/helper/certutil/types.go +++ b/sdk/helper/certutil/types.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/errutil" + "github.com/hashicorp/vault/sdk/helper/errutil" ) // This can be one of a few key types so the different params may or may not be filled diff --git a/helper/compressutil/compress.go b/sdk/helper/compressutil/compress.go similarity index 100% rename from helper/compressutil/compress.go rename to sdk/helper/compressutil/compress.go diff --git a/helper/compressutil/compress_test.go b/sdk/helper/compressutil/compress_test.go similarity index 100% rename from helper/compressutil/compress_test.go rename to sdk/helper/compressutil/compress_test.go diff --git a/helper/consts/agent.go b/sdk/helper/consts/agent.go similarity index 100% rename from helper/consts/agent.go rename to sdk/helper/consts/agent.go diff --git a/helper/consts/consts.go b/sdk/helper/consts/consts.go similarity index 100% rename from helper/consts/consts.go rename to sdk/helper/consts/consts.go diff --git a/helper/consts/error.go b/sdk/helper/consts/error.go similarity index 100% rename from helper/consts/error.go rename to sdk/helper/consts/error.go diff --git a/helper/consts/plugin_types.go b/sdk/helper/consts/plugin_types.go similarity index 100% rename from helper/consts/plugin_types.go rename to sdk/helper/consts/plugin_types.go diff --git a/helper/consts/replication.go b/sdk/helper/consts/replication.go similarity index 100% rename from helper/consts/replication.go rename to sdk/helper/consts/replication.go diff --git a/helper/cryptoutil/cryptoutil.go b/sdk/helper/cryptoutil/cryptoutil.go similarity index 100% rename from helper/cryptoutil/cryptoutil.go rename to sdk/helper/cryptoutil/cryptoutil.go diff --git a/helper/cryptoutil/cryptoutil_test.go b/sdk/helper/cryptoutil/cryptoutil_test.go similarity index 100% rename from helper/cryptoutil/cryptoutil_test.go rename to sdk/helper/cryptoutil/cryptoutil_test.go diff --git a/helper/errutil/error.go b/sdk/helper/errutil/error.go similarity index 100% rename from helper/errutil/error.go rename to sdk/helper/errutil/error.go diff --git a/helper/hclutil/hcl.go b/sdk/helper/hclutil/hcl.go similarity index 100% rename from helper/hclutil/hcl.go rename to sdk/helper/hclutil/hcl.go diff --git a/helper/jsonutil/json.go b/sdk/helper/jsonutil/json.go similarity index 98% rename from helper/jsonutil/json.go rename to sdk/helper/jsonutil/json.go index d03ddef5f0..c03a4f8c8d 100644 --- a/helper/jsonutil/json.go +++ b/sdk/helper/jsonutil/json.go @@ -8,7 +8,7 @@ import ( "io" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/compressutil" + "github.com/hashicorp/vault/sdk/helper/compressutil" ) // Encodes/Marshals the given object into JSON diff --git a/helper/jsonutil/json_test.go b/sdk/helper/jsonutil/json_test.go similarity index 98% rename from helper/jsonutil/json_test.go rename to sdk/helper/jsonutil/json_test.go index 53d4adffa9..739d5e734a 100644 --- a/helper/jsonutil/json_test.go +++ b/sdk/helper/jsonutil/json_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/hashicorp/vault/helper/compressutil" + "github.com/hashicorp/vault/sdk/helper/compressutil" ) func TestJSONUtil_CompressDecompressJSON(t *testing.T) { diff --git a/helper/kdf/kdf.go b/sdk/helper/kdf/kdf.go similarity index 100% rename from helper/kdf/kdf.go rename to sdk/helper/kdf/kdf.go diff --git a/helper/kdf/kdf_test.go b/sdk/helper/kdf/kdf_test.go similarity index 100% rename from helper/kdf/kdf_test.go rename to sdk/helper/kdf/kdf_test.go diff --git a/helper/keysutil/consts.go b/sdk/helper/keysutil/consts.go similarity index 100% rename from helper/keysutil/consts.go rename to sdk/helper/keysutil/consts.go diff --git a/helper/keysutil/encrypted_key_storage.go b/sdk/helper/keysutil/encrypted_key_storage.go similarity index 99% rename from helper/keysutil/encrypted_key_storage.go rename to sdk/helper/keysutil/encrypted_key_storage.go index 88bfdf48b6..90eaaf0bba 100644 --- a/helper/keysutil/encrypted_key_storage.go +++ b/sdk/helper/keysutil/encrypted_key_storage.go @@ -10,7 +10,7 @@ import ( "strings" lru "github.com/hashicorp/golang-lru" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) const ( diff --git a/helper/keysutil/encrypted_key_storage_test.go b/sdk/helper/keysutil/encrypted_key_storage_test.go similarity index 98% rename from helper/keysutil/encrypted_key_storage_test.go rename to sdk/helper/keysutil/encrypted_key_storage_test.go index 0077786d3c..c18037301a 100644 --- a/helper/keysutil/encrypted_key_storage_test.go +++ b/sdk/helper/keysutil/encrypted_key_storage_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" ) var compilerOpt []string diff --git a/helper/keysutil/lock_manager.go b/sdk/helper/keysutil/lock_manager.go similarity index 98% rename from helper/keysutil/lock_manager.go rename to sdk/helper/keysutil/lock_manager.go index 5c8539a21c..95064ff7a8 100644 --- a/helper/keysutil/lock_manager.go +++ b/sdk/helper/keysutil/lock_manager.go @@ -10,9 +10,9 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/locksutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/locksutil" + "github.com/hashicorp/vault/sdk/logical" ) const ( diff --git a/helper/keysutil/policy.go b/sdk/helper/keysutil/policy.go similarity index 99% rename from helper/keysutil/policy.go rename to sdk/helper/keysutil/policy.go index 4a0d9cbfb7..31e7f613ff 100644 --- a/helper/keysutil/policy.go +++ b/sdk/helper/keysutil/policy.go @@ -34,10 +34,10 @@ import ( "github.com/hashicorp/errwrap" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/kdf" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/kdf" + "github.com/hashicorp/vault/sdk/logical" ) // Careful with iota; don't put anything before it in this const block because diff --git a/helper/keysutil/policy_test.go b/sdk/helper/keysutil/policy_test.go similarity index 99% rename from helper/keysutil/policy_test.go rename to sdk/helper/keysutil/policy_test.go index bfa626a15c..20f71c5aed 100644 --- a/helper/keysutil/policy_test.go +++ b/sdk/helper/keysutil/policy_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/logical" "github.com/mitchellh/copystructure" ) diff --git a/helper/license/feature.go b/sdk/helper/license/feature.go similarity index 100% rename from helper/license/feature.go rename to sdk/helper/license/feature.go diff --git a/helper/locksutil/locks.go b/sdk/helper/locksutil/locks.go similarity index 96% rename from helper/locksutil/locks.go rename to sdk/helper/locksutil/locks.go index 2ec4cf4e24..1c85402493 100644 --- a/helper/locksutil/locks.go +++ b/sdk/helper/locksutil/locks.go @@ -3,7 +3,7 @@ package locksutil import ( "sync" - "github.com/hashicorp/vault/helper/cryptoutil" + "github.com/hashicorp/vault/sdk/helper/cryptoutil" ) const ( diff --git a/helper/locksutil/locks_test.go b/sdk/helper/locksutil/locks_test.go similarity index 100% rename from helper/locksutil/locks_test.go rename to sdk/helper/locksutil/locks_test.go diff --git a/helper/logging/vault.go b/sdk/helper/logging/vault.go similarity index 100% rename from helper/logging/vault.go rename to sdk/helper/logging/vault.go diff --git a/helper/mlock/mlock.go b/sdk/helper/mlock/mlock.go similarity index 100% rename from helper/mlock/mlock.go rename to sdk/helper/mlock/mlock.go diff --git a/helper/mlock/mlock_unavail.go b/sdk/helper/mlock/mlock_unavail.go similarity index 100% rename from helper/mlock/mlock_unavail.go rename to sdk/helper/mlock/mlock_unavail.go diff --git a/helper/mlock/mlock_unix.go b/sdk/helper/mlock/mlock_unix.go similarity index 100% rename from helper/mlock/mlock_unix.go rename to sdk/helper/mlock/mlock_unix.go diff --git a/helper/parseutil/parseutil.go b/sdk/helper/parseutil/parseutil.go similarity index 98% rename from helper/parseutil/parseutil.go rename to sdk/helper/parseutil/parseutil.go index 8ce5eae4a4..6acf70d426 100644 --- a/helper/parseutil/parseutil.go +++ b/sdk/helper/parseutil/parseutil.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/errwrap" sockaddr "github.com/hashicorp/go-sockaddr" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/mitchellh/mapstructure" ) diff --git a/helper/parseutil/parseutil_test.go b/sdk/helper/parseutil/parseutil_test.go similarity index 100% rename from helper/parseutil/parseutil_test.go rename to sdk/helper/parseutil/parseutil_test.go diff --git a/helper/pathmanager/pathmanager.go b/sdk/helper/pathmanager/pathmanager.go similarity index 100% rename from helper/pathmanager/pathmanager.go rename to sdk/helper/pathmanager/pathmanager.go diff --git a/helper/pathmanager/pathmanager_test.go b/sdk/helper/pathmanager/pathmanager_test.go similarity index 100% rename from helper/pathmanager/pathmanager_test.go rename to sdk/helper/pathmanager/pathmanager_test.go diff --git a/helper/pluginutil/env.go b/sdk/helper/pluginutil/env.go similarity index 83% rename from helper/pluginutil/env.go rename to sdk/helper/pluginutil/env.go index ed40c7fbf8..e5e2a8e00b 100644 --- a/helper/pluginutil/env.go +++ b/sdk/helper/pluginutil/env.go @@ -4,7 +4,7 @@ import ( "os" version "github.com/hashicorp/go-version" - "github.com/hashicorp/vault/helper/mlock" + "github.com/hashicorp/vault/sdk/helper/mlock" ) var ( @@ -19,6 +19,14 @@ var ( // PluginMetadataModeEnv is an ENV name used to disable TLS communication // to bootstrap mounting plugins. PluginMetadataModeEnv = "VAULT_PLUGIN_METADATA_MODE" + + // PluginUnwrapTokenEnv is the ENV name used to pass unwrap tokens to the + // plugin. + PluginUnwrapTokenEnv = "VAULT_UNWRAP_TOKEN" + + // PluginCACertPEMEnv is an ENV name used for holding a CA PEM-encoded + // string. Used for testing. + PluginCACertPEMEnv = "VAULT_TESTING_PLUGIN_CA_PEM" ) // OptionallyEnableMlock determines if mlock should be called, and if so enables diff --git a/helper/pluginutil/env_test.go b/sdk/helper/pluginutil/env_test.go similarity index 100% rename from helper/pluginutil/env_test.go rename to sdk/helper/pluginutil/env_test.go diff --git a/helper/pluginutil/runner.go b/sdk/helper/pluginutil/runner.go similarity index 76% rename from helper/pluginutil/runner.go rename to sdk/helper/pluginutil/runner.go index 2323684dff..a572363020 100644 --- a/helper/pluginutil/runner.go +++ b/sdk/helper/pluginutil/runner.go @@ -4,17 +4,15 @@ import ( "context" "crypto/sha256" "crypto/tls" - "flag" "fmt" "os/exec" "time" log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/wrapping" - "github.com/hashicorp/vault/version" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/wrapping" + "github.com/hashicorp/vault/sdk/version" ) // Looker defines the plugin Lookup function that looks into the plugin catalog @@ -60,7 +58,7 @@ func (r *PluginRunner) Run(ctx context.Context, wrapper RunnerUtil, pluginSets m // RunMetadataMode returns a configured plugin.Client that will dispense a plugin // in metadata mode. The PluginMetadataModeEnv is passed in as part of the Cmd to -// plugin.Client, and consumed by the plugin process on pluginutil.VaultPluginTLSProvider. +// plugin.Client, and consumed by the plugin process on api.VaultPluginTLSProvider. func (r *PluginRunner) RunMetadataMode(ctx context.Context, wrapper RunnerUtil, pluginSets map[int]plugin.PluginSet, hs plugin.HandshakeConfig, env []string, logger log.Logger) (*plugin.Client, error) { return r.runCommon(ctx, wrapper, pluginSets, hs, env, logger, true) @@ -134,49 +132,6 @@ func (r *PluginRunner) runCommon(ctx context.Context, wrapper RunnerUtil, plugin return client, nil } -// APIClientMeta is a helper that plugins can use to configure TLS connections -// back to Vault. -type APIClientMeta struct { - // These are set by the command line flags. - flagCACert string - flagCAPath string - flagClientCert string - flagClientKey string - flagInsecure bool -} - -// FlagSet returns the flag set for configuring the TLS connection -func (f *APIClientMeta) FlagSet() *flag.FlagSet { - fs := flag.NewFlagSet("vault plugin settings", flag.ContinueOnError) - - fs.StringVar(&f.flagCACert, "ca-cert", "", "") - fs.StringVar(&f.flagCAPath, "ca-path", "", "") - fs.StringVar(&f.flagClientCert, "client-cert", "", "") - fs.StringVar(&f.flagClientKey, "client-key", "", "") - fs.BoolVar(&f.flagInsecure, "tls-skip-verify", false, "") - - return fs -} - -// GetTLSConfig will return a TLSConfig based off the values from the flags -func (f *APIClientMeta) GetTLSConfig() *api.TLSConfig { - // If we need custom TLS configuration, then set it - if f.flagCACert != "" || f.flagCAPath != "" || f.flagClientCert != "" || f.flagClientKey != "" || f.flagInsecure { - t := &api.TLSConfig{ - CACert: f.flagCACert, - CAPath: f.flagCAPath, - ClientCert: f.flagClientCert, - ClientKey: f.flagClientKey, - TLSServerName: "", - Insecure: f.flagInsecure, - } - - return t - } - - return nil -} - // CtxCancelIfCanceled takes a context cancel func and a context. If the context is // shutdown the cancelfunc is called. This is useful for merging two cancel // functions. diff --git a/sdk/helper/pluginutil/tls.go b/sdk/helper/pluginutil/tls.go new file mode 100644 index 0000000000..f78f04014c --- /dev/null +++ b/sdk/helper/pluginutil/tls.go @@ -0,0 +1,108 @@ +package pluginutil + +import ( + "context" + "crypto/ecdsa" + "crypto/elliptic" + "crypto/rand" + "crypto/tls" + "crypto/x509" + "crypto/x509/pkix" + "time" + + "github.com/hashicorp/errwrap" + "github.com/hashicorp/go-uuid" + "github.com/hashicorp/vault/sdk/helper/certutil" +) + +// generateCert is used internally to create certificates for the plugin +// client and server. +func generateCert() ([]byte, *ecdsa.PrivateKey, error) { + key, err := ecdsa.GenerateKey(elliptic.P521(), rand.Reader) + if err != nil { + return nil, nil, err + } + + host, err := uuid.GenerateUUID() + if err != nil { + return nil, nil, err + } + + sn, err := certutil.GenerateSerialNumber() + if err != nil { + return nil, nil, err + } + + template := &x509.Certificate{ + Subject: pkix.Name{ + CommonName: host, + }, + DNSNames: []string{host}, + ExtKeyUsage: []x509.ExtKeyUsage{ + x509.ExtKeyUsageClientAuth, + x509.ExtKeyUsageServerAuth, + }, + KeyUsage: x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment | x509.KeyUsageKeyAgreement, + SerialNumber: sn, + NotBefore: time.Now().Add(-30 * time.Second), + NotAfter: time.Now().Add(262980 * time.Hour), + IsCA: true, + } + + certBytes, err := x509.CreateCertificate(rand.Reader, template, template, key.Public(), key) + if err != nil { + return nil, nil, errwrap.Wrapf("unable to generate client certificate: {{err}}", err) + } + + return certBytes, key, nil +} + +// createClientTLSConfig creates a signed certificate and returns a configured +// TLS config. +func createClientTLSConfig(certBytes []byte, key *ecdsa.PrivateKey) (*tls.Config, error) { + clientCert, err := x509.ParseCertificate(certBytes) + if err != nil { + return nil, errwrap.Wrapf("error parsing generated plugin certificate: {{err}}", err) + } + + cert := tls.Certificate{ + Certificate: [][]byte{certBytes}, + PrivateKey: key, + Leaf: clientCert, + } + + clientCertPool := x509.NewCertPool() + clientCertPool.AddCert(clientCert) + + tlsConfig := &tls.Config{ + Certificates: []tls.Certificate{cert}, + RootCAs: clientCertPool, + ClientCAs: clientCertPool, + ClientAuth: tls.RequireAndVerifyClientCert, + ServerName: clientCert.Subject.CommonName, + MinVersion: tls.VersionTLS12, + } + + tlsConfig.BuildNameToCertificate() + + return tlsConfig, nil +} + +// wrapServerConfig is used to create a server certificate and private key, then +// wrap them in an unwrap token for later retrieval by the plugin. +func wrapServerConfig(ctx context.Context, sys RunnerUtil, certBytes []byte, key *ecdsa.PrivateKey) (string, error) { + rawKey, err := x509.MarshalECPrivateKey(key) + if err != nil { + return "", err + } + + wrapInfo, err := sys.ResponseWrapData(ctx, map[string]interface{}{ + "ServerCert": certBytes, + "ServerKey": rawKey, + }, time.Second*60, true) + if err != nil { + return "", err + } + + return wrapInfo.Token, nil +} diff --git a/helper/salt/salt.go b/sdk/helper/salt/salt.go similarity index 99% rename from helper/salt/salt.go rename to sdk/helper/salt/salt.go index 7d7729a8a2..6c097a25a6 100644 --- a/helper/salt/salt.go +++ b/sdk/helper/salt/salt.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/errwrap" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) const ( diff --git a/helper/salt/salt_test.go b/sdk/helper/salt/salt_test.go similarity index 97% rename from helper/salt/salt_test.go rename to sdk/helper/salt/salt_test.go index f2798cecff..99fcb06bd0 100644 --- a/helper/salt/salt_test.go +++ b/sdk/helper/salt/salt_test.go @@ -7,7 +7,7 @@ import ( "testing" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestSalt(t *testing.T) { diff --git a/helper/strutil/strutil.go b/sdk/helper/strutil/strutil.go similarity index 100% rename from helper/strutil/strutil.go rename to sdk/helper/strutil/strutil.go diff --git a/helper/strutil/strutil_test.go b/sdk/helper/strutil/strutil_test.go similarity index 100% rename from helper/strutil/strutil_test.go rename to sdk/helper/strutil/strutil_test.go diff --git a/helper/wrapping/wrapinfo.go b/sdk/helper/wrapping/wrapinfo.go similarity index 100% rename from helper/wrapping/wrapinfo.go rename to sdk/helper/wrapping/wrapinfo.go diff --git a/logical/auth.go b/sdk/logical/auth.go similarity index 100% rename from logical/auth.go rename to sdk/logical/auth.go diff --git a/logical/connection.go b/sdk/logical/connection.go similarity index 100% rename from logical/connection.go rename to sdk/logical/connection.go diff --git a/logical/controlgroup.go b/sdk/logical/controlgroup.go similarity index 100% rename from logical/controlgroup.go rename to sdk/logical/controlgroup.go diff --git a/logical/error.go b/sdk/logical/error.go similarity index 100% rename from logical/error.go rename to sdk/logical/error.go diff --git a/logical/identity.pb.go b/sdk/logical/identity.pb.go similarity index 71% rename from logical/identity.pb.go rename to sdk/logical/identity.pb.go index cd19652215..be0f341427 100644 --- a/logical/identity.pb.go +++ b/sdk/logical/identity.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: logical/identity.proto +// source: sdk/logical/identity.proto package logical @@ -38,7 +38,7 @@ func (m *Entity) Reset() { *m = Entity{} } func (m *Entity) String() string { return proto.CompactTextString(m) } func (*Entity) ProtoMessage() {} func (*Entity) Descriptor() ([]byte, []int) { - return fileDescriptor_04442ca37d5e30be, []int{0} + return fileDescriptor_4a34d35719c603a1, []int{0} } func (m *Entity) XXX_Unmarshal(b []byte) error { @@ -106,7 +106,7 @@ func (m *Alias) Reset() { *m = Alias{} } func (m *Alias) String() string { return proto.CompactTextString(m) } func (*Alias) ProtoMessage() {} func (*Alias) Descriptor() ([]byte, []int) { - return fileDescriptor_04442ca37d5e30be, []int{1} + return fileDescriptor_4a34d35719c603a1, []int{1} } func (m *Alias) XXX_Unmarshal(b []byte) error { @@ -162,26 +162,27 @@ func init() { proto.RegisterMapType((map[string]string)(nil), "logical.Alias.MetadataEntry") } -func init() { proto.RegisterFile("logical/identity.proto", fileDescriptor_04442ca37d5e30be) } +func init() { proto.RegisterFile("sdk/logical/identity.proto", fileDescriptor_4a34d35719c603a1) } -var fileDescriptor_04442ca37d5e30be = []byte{ - // 287 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x91, 0x4f, 0x4b, 0xc3, 0x40, - 0x10, 0xc5, 0x49, 0xd2, 0x3f, 0x76, 0xa4, 0x45, 0x06, 0x91, 0x20, 0x16, 0x4a, 0x50, 0xc8, 0x29, - 0x01, 0xbd, 0x54, 0x3d, 0x55, 0xda, 0x43, 0x0f, 0x5e, 0x82, 0x27, 0x2f, 0x32, 0x4d, 0x97, 0x66, - 0x31, 0xc9, 0x86, 0x64, 0x52, 0xc8, 0x97, 0xf4, 0xec, 0xc7, 0x91, 0x6e, 0xb6, 0xc1, 0xe2, 0xd9, - 0xdb, 0xec, 0xef, 0xcd, 0xce, 0xbe, 0x79, 0x0b, 0x57, 0xa9, 0xda, 0xc9, 0x98, 0xd2, 0x50, 0x6e, - 0x45, 0xce, 0x92, 0x9b, 0xa0, 0x28, 0x15, 0x2b, 0x1c, 0x1a, 0xee, 0x7d, 0x59, 0x30, 0x58, 0x69, - 0x05, 0x27, 0x60, 0xaf, 0x97, 0xae, 0x35, 0xb3, 0xfc, 0x51, 0x64, 0xaf, 0x97, 0x88, 0xd0, 0xcb, - 0x29, 0x13, 0xae, 0xad, 0x89, 0xae, 0xd1, 0x87, 0x21, 0xa5, 0x92, 0x2a, 0x51, 0xb9, 0xce, 0xcc, - 0xf1, 0xcf, 0xef, 0x27, 0x81, 0x99, 0x14, 0x2c, 0x0e, 0x3c, 0x3a, 0xca, 0xf8, 0x08, 0x67, 0x99, - 0x60, 0xda, 0x12, 0x93, 0xdb, 0xd3, 0xad, 0xd3, 0xae, 0xb5, 0x7d, 0x30, 0x78, 0x35, 0xfa, 0x2a, - 0xe7, 0xb2, 0x89, 0xba, 0xf6, 0xeb, 0x67, 0x18, 0x9f, 0x48, 0x78, 0x01, 0xce, 0xa7, 0x68, 0x8c, - 0xb5, 0x43, 0x89, 0x97, 0xd0, 0xdf, 0x53, 0x5a, 0x1f, 0xcd, 0xb5, 0x87, 0x27, 0x7b, 0x6e, 0x79, - 0xdf, 0x16, 0xf4, 0xb5, 0x15, 0x9c, 0x02, 0x64, 0xaa, 0xce, 0xf9, 0x83, 0x9b, 0x42, 0x98, 0xcb, - 0x23, 0x4d, 0xde, 0x9a, 0x42, 0xe0, 0x1d, 0x4c, 0x5a, 0x99, 0xe2, 0x58, 0x54, 0x95, 0x2a, 0xcd, - 0xac, 0xb1, 0xa6, 0x0b, 0x03, 0xbb, 0x14, 0x9c, 0x5f, 0x29, 0xcc, 0xff, 0xec, 0x76, 0x73, 0x1a, - 0xc3, 0xbf, 0xac, 0xf6, 0x72, 0xfb, 0xee, 0xed, 0x24, 0x27, 0xf5, 0x26, 0x88, 0x55, 0x16, 0x26, - 0x54, 0x25, 0x32, 0x56, 0x65, 0x11, 0xee, 0xa9, 0x4e, 0x39, 0x34, 0x06, 0x36, 0x03, 0xfd, 0xc3, - 0x0f, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbf, 0xfb, 0x6f, 0x8c, 0xfb, 0x01, 0x00, 0x00, +var fileDescriptor_4a34d35719c603a1 = []byte{ + // 291 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x91, 0x4f, 0x6b, 0x83, 0x40, + 0x10, 0xc5, 0x51, 0xf3, 0xa7, 0x99, 0x12, 0x29, 0x4b, 0x0f, 0x12, 0x1a, 0x08, 0x81, 0x16, 0x4f, + 0x0a, 0xed, 0x25, 0x6d, 0x4f, 0x29, 0xc9, 0x21, 0x87, 0x5e, 0xa4, 0xa7, 0x5e, 0xca, 0x44, 0x97, + 0xb8, 0x44, 0x5d, 0x71, 0xc7, 0x80, 0x5f, 0xb2, 0xe7, 0x7e, 0x9c, 0x92, 0x75, 0x23, 0x09, 0x3d, + 0xf7, 0x36, 0xfe, 0xde, 0x38, 0xfb, 0xe6, 0x0d, 0x4c, 0x54, 0xb2, 0x0f, 0x33, 0xb9, 0x13, 0x31, + 0x66, 0xa1, 0x48, 0x78, 0x41, 0x82, 0x9a, 0xa0, 0xac, 0x24, 0x49, 0x36, 0x34, 0x7c, 0xfe, 0x6d, + 0xc1, 0x60, 0xad, 0x15, 0xe6, 0x82, 0xbd, 0x59, 0x79, 0xd6, 0xcc, 0xf2, 0x47, 0x91, 0xbd, 0x59, + 0x31, 0x06, 0xbd, 0x02, 0x73, 0xee, 0xd9, 0x9a, 0xe8, 0x9a, 0xf9, 0x30, 0xc4, 0x4c, 0xa0, 0xe2, + 0xca, 0x73, 0x66, 0x8e, 0x7f, 0xfd, 0xe8, 0x06, 0x66, 0x52, 0xb0, 0x3c, 0xf2, 0xe8, 0x24, 0xb3, + 0x67, 0xb8, 0xca, 0x39, 0x61, 0x82, 0x84, 0x5e, 0x4f, 0xb7, 0x4e, 0xbb, 0xd6, 0xf6, 0xc1, 0xe0, + 0xdd, 0xe8, 0xeb, 0x82, 0xaa, 0x26, 0xea, 0xda, 0x27, 0xaf, 0x30, 0xbe, 0x90, 0xd8, 0x0d, 0x38, + 0x7b, 0xde, 0x18, 0x6b, 0xc7, 0x92, 0xdd, 0x42, 0xff, 0x80, 0x59, 0x7d, 0x32, 0xd7, 0x7e, 0xbc, + 0xd8, 0x0b, 0x6b, 0xfe, 0x63, 0x41, 0x5f, 0x5b, 0x61, 0x53, 0x80, 0x5c, 0xd6, 0x05, 0x7d, 0x51, + 0x53, 0x72, 0xf3, 0xf3, 0x48, 0x93, 0x8f, 0xa6, 0xe4, 0xec, 0x1e, 0xdc, 0x56, 0xc6, 0x38, 0xe6, + 0x4a, 0xc9, 0xca, 0xcc, 0x1a, 0x6b, 0xba, 0x34, 0xb0, 0x4b, 0xc1, 0x39, 0x4b, 0x61, 0xf1, 0x67, + 0xb7, 0xbb, 0xcb, 0x18, 0xfe, 0x65, 0xb5, 0x37, 0xff, 0xf3, 0x61, 0x27, 0x28, 0xad, 0xb7, 0x41, + 0x2c, 0xf3, 0x30, 0x45, 0x95, 0x8a, 0x58, 0x56, 0x65, 0x78, 0xc0, 0x3a, 0xa3, 0xf0, 0xec, 0xda, + 0xdb, 0x81, 0xbe, 0xf2, 0xd3, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x36, 0xa9, 0x44, 0x63, 0x03, + 0x02, 0x00, 0x00, } diff --git a/logical/identity.proto b/sdk/logical/identity.proto similarity index 92% rename from logical/identity.proto rename to sdk/logical/identity.proto index b9c567138e..6e060538df 100644 --- a/logical/identity.proto +++ b/sdk/logical/identity.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = "github.com/hashicorp/vault/logical"; +option go_package = "github.com/hashicorp/vault/sdk/logical"; package logical; diff --git a/logical/lease.go b/sdk/logical/lease.go similarity index 100% rename from logical/lease.go rename to sdk/logical/lease.go diff --git a/logical/lease_test.go b/sdk/logical/lease_test.go similarity index 100% rename from logical/lease_test.go rename to sdk/logical/lease_test.go diff --git a/logical/logical.go b/sdk/logical/logical.go similarity index 100% rename from logical/logical.go rename to sdk/logical/logical.go diff --git a/logical/logical_storage.go b/sdk/logical/logical_storage.go similarity index 96% rename from logical/logical_storage.go rename to sdk/logical/logical_storage.go index cece9e3b21..16b85cd797 100644 --- a/logical/logical_storage.go +++ b/sdk/logical/logical_storage.go @@ -3,7 +3,7 @@ package logical import ( "context" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" ) type LogicalStorage struct { diff --git a/logical/plugin.pb.go b/sdk/logical/plugin.pb.go similarity index 67% rename from logical/plugin.pb.go rename to sdk/logical/plugin.pb.go index b66bea544b..dca764e57c 100644 --- a/logical/plugin.pb.go +++ b/sdk/logical/plugin.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: logical/plugin.proto +// source: sdk/logical/plugin.proto package logical @@ -32,7 +32,7 @@ func (m *PluginEnvironment) Reset() { *m = PluginEnvironment{} } func (m *PluginEnvironment) String() string { return proto.CompactTextString(m) } func (*PluginEnvironment) ProtoMessage() {} func (*PluginEnvironment) Descriptor() ([]byte, []int) { - return fileDescriptor_0f04cd6a1a3a5255, []int{0} + return fileDescriptor_23bde88b42ca47d4, []int{0} } func (m *PluginEnvironment) XXX_Unmarshal(b []byte) error { @@ -64,17 +64,17 @@ func init() { proto.RegisterType((*PluginEnvironment)(nil), "logical.PluginEnvironment") } -func init() { proto.RegisterFile("logical/plugin.proto", fileDescriptor_0f04cd6a1a3a5255) } +func init() { proto.RegisterFile("sdk/logical/plugin.proto", fileDescriptor_23bde88b42ca47d4) } -var fileDescriptor_0f04cd6a1a3a5255 = []byte{ - // 133 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xc9, 0xc9, 0x4f, 0xcf, - 0x4c, 0x4e, 0xcc, 0xd1, 0x2f, 0xc8, 0x29, 0x4d, 0xcf, 0xcc, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, - 0x17, 0x62, 0x87, 0x8a, 0x2a, 0x59, 0x70, 0x09, 0x06, 0x80, 0x25, 0x5c, 0xf3, 0xca, 0x32, 0x8b, - 0xf2, 0xf3, 0x72, 0x53, 0xf3, 0x4a, 0x84, 0x94, 0xb9, 0x78, 0xcb, 0x12, 0x4b, 0x73, 0x4a, 0xe2, - 0xcb, 0x52, 0x8b, 0x8a, 0x33, 0xf3, 0xf3, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0x78, 0xc0, - 0x82, 0x61, 0x10, 0x31, 0x27, 0x95, 0x28, 0xa5, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, - 0xfc, 0x5c, 0xfd, 0x8c, 0xc4, 0xe2, 0x8c, 0xcc, 0xe4, 0xfc, 0xa2, 0x02, 0x7d, 0xb0, 0x22, 0x7d, - 0xa8, 0xf9, 0x49, 0x6c, 0x60, 0xfb, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa3, 0xff, 0x48, - 0xa9, 0x87, 0x00, 0x00, 0x00, +var fileDescriptor_23bde88b42ca47d4 = []byte{ + // 137 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x4e, 0xc9, 0xd6, + 0xcf, 0xc9, 0x4f, 0xcf, 0x4c, 0x4e, 0xcc, 0xd1, 0x2f, 0xc8, 0x29, 0x4d, 0xcf, 0xcc, 0xd3, 0x2b, + 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x87, 0x8a, 0x2a, 0x59, 0x70, 0x09, 0x06, 0x80, 0x25, 0x5c, + 0xf3, 0xca, 0x32, 0x8b, 0xf2, 0xf3, 0x72, 0x53, 0xf3, 0x4a, 0x84, 0x94, 0xb9, 0x78, 0xcb, 0x12, + 0x4b, 0x73, 0x4a, 0xe2, 0xcb, 0x52, 0x8b, 0x8a, 0x33, 0xf3, 0xf3, 0x24, 0x18, 0x15, 0x18, 0x35, + 0x38, 0x83, 0x78, 0xc0, 0x82, 0x61, 0x10, 0x31, 0x27, 0x8d, 0x28, 0xb5, 0xf4, 0xcc, 0x92, 0x8c, + 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0x8c, 0xc4, 0xe2, 0x8c, 0xcc, 0xe4, 0xfc, 0xa2, 0x02, + 0x7d, 0xb0, 0x22, 0x7d, 0x24, 0x9b, 0x93, 0xd8, 0xc0, 0x76, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, + 0xff, 0xe8, 0xb8, 0xfa, 0x4e, 0x8f, 0x00, 0x00, 0x00, } diff --git a/logical/plugin.proto b/sdk/logical/plugin.proto similarity index 70% rename from logical/plugin.proto rename to sdk/logical/plugin.proto index ec84934725..5992c21395 100644 --- a/logical/plugin.proto +++ b/sdk/logical/plugin.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = "github.com/hashicorp/vault/logical"; +option go_package = "github.com/hashicorp/vault/sdk/logical"; package logical; diff --git a/logical/request.go b/sdk/logical/request.go similarity index 100% rename from logical/request.go rename to sdk/logical/request.go diff --git a/logical/response.go b/sdk/logical/response.go similarity index 99% rename from logical/response.go rename to sdk/logical/response.go index 2dbf8172af..cb6e08b40f 100644 --- a/logical/response.go +++ b/sdk/logical/response.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/hashicorp/vault/helper/wrapping" + "github.com/hashicorp/vault/sdk/helper/wrapping" ) const ( diff --git a/logical/response_util.go b/sdk/logical/response_util.go similarity index 98% rename from logical/response_util.go rename to sdk/logical/response_util.go index 79ef852a48..ee57f8e05a 100644 --- a/logical/response_util.go +++ b/sdk/logical/response_util.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/errwrap" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" ) // RespondErrorCommon pulls most of the functionality from http's diff --git a/logical/response_util_test.go b/sdk/logical/response_util_test.go similarity index 100% rename from logical/response_util_test.go rename to sdk/logical/response_util_test.go diff --git a/logical/secret.go b/sdk/logical/secret.go similarity index 100% rename from logical/secret.go rename to sdk/logical/secret.go diff --git a/logical/storage.go b/sdk/logical/storage.go similarity index 98% rename from logical/storage.go rename to sdk/logical/storage.go index 116fd301c5..15f480978c 100644 --- a/logical/storage.go +++ b/sdk/logical/storage.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" ) // ErrReadOnly is returned when a backend does not support diff --git a/logical/storage_inmem.go b/sdk/logical/storage_inmem.go similarity index 93% rename from logical/storage_inmem.go rename to sdk/logical/storage_inmem.go index e0ff75f144..4c7afa1b92 100644 --- a/logical/storage_inmem.go +++ b/sdk/logical/storage_inmem.go @@ -4,8 +4,8 @@ import ( "context" "sync" - "github.com/hashicorp/vault/physical" - "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/physical" + "github.com/hashicorp/vault/sdk/physical/inmem" ) // InmemStorage implements Storage and stores all data in memory. It is diff --git a/logical/storage_inmem_test.go b/sdk/logical/storage_inmem_test.go similarity index 100% rename from logical/storage_inmem_test.go rename to sdk/logical/storage_inmem_test.go diff --git a/logical/storage_view.go b/sdk/logical/storage_view.go similarity index 100% rename from logical/storage_view.go rename to sdk/logical/storage_view.go diff --git a/logical/system_view.go b/sdk/logical/system_view.go similarity index 95% rename from logical/system_view.go rename to sdk/logical/system_view.go index dff258b11c..82f995176b 100644 --- a/logical/system_view.go +++ b/sdk/logical/system_view.go @@ -5,10 +5,10 @@ import ( "errors" "time" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/license" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/helper/wrapping" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/license" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/wrapping" ) // SystemView exposes system configuration information in a safe way diff --git a/logical/testing.go b/sdk/logical/testing.go similarity index 97% rename from logical/testing.go rename to sdk/logical/testing.go index 472dd68d90..c5a7d9ce34 100644 --- a/logical/testing.go +++ b/sdk/logical/testing.go @@ -8,7 +8,7 @@ import ( testing "github.com/mitchellh/go-testing-interface" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" ) // TestRequest is a helper to create a purely in-memory Request struct. diff --git a/logical/token.go b/sdk/logical/token.go similarity index 100% rename from logical/token.go rename to sdk/logical/token.go diff --git a/logical/translate_response.go b/sdk/logical/translate_response.go similarity index 100% rename from logical/translate_response.go rename to sdk/logical/translate_response.go diff --git a/physical/cache.go b/sdk/physical/cache.go similarity index 97% rename from physical/cache.go rename to sdk/physical/cache.go index 0485c54276..56b98a54e6 100644 --- a/physical/cache.go +++ b/sdk/physical/cache.go @@ -6,8 +6,8 @@ import ( log "github.com/hashicorp/go-hclog" lru "github.com/hashicorp/golang-lru" - "github.com/hashicorp/vault/helper/locksutil" - "github.com/hashicorp/vault/helper/pathmanager" + "github.com/hashicorp/vault/sdk/helper/locksutil" + "github.com/hashicorp/vault/sdk/helper/pathmanager" ) const ( diff --git a/physical/encoding.go b/sdk/physical/encoding.go similarity index 100% rename from physical/encoding.go rename to sdk/physical/encoding.go diff --git a/physical/error.go b/sdk/physical/error.go similarity index 100% rename from physical/error.go rename to sdk/physical/error.go diff --git a/physical/inmem/cache_test.go b/sdk/physical/inmem/cache_test.go similarity index 98% rename from physical/inmem/cache_test.go rename to sdk/physical/inmem/cache_test.go index 90561f3a37..cbab37deac 100644 --- a/physical/inmem/cache_test.go +++ b/sdk/physical/inmem/cache_test.go @@ -5,8 +5,8 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" ) func TestCache(t *testing.T) { diff --git a/physical/inmem/inmem.go b/sdk/physical/inmem/inmem.go similarity index 99% rename from physical/inmem/inmem.go rename to sdk/physical/inmem/inmem.go index d9cca52610..42ae9959da 100644 --- a/physical/inmem/inmem.go +++ b/sdk/physical/inmem/inmem.go @@ -9,7 +9,7 @@ import ( "sync/atomic" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" radix "github.com/armon/go-radix" ) diff --git a/physical/inmem/inmem_ha.go b/sdk/physical/inmem/inmem_ha.go similarity index 98% rename from physical/inmem/inmem_ha.go rename to sdk/physical/inmem/inmem_ha.go index 6755100704..64fcb3a66d 100644 --- a/physical/inmem/inmem_ha.go +++ b/sdk/physical/inmem/inmem_ha.go @@ -5,7 +5,7 @@ import ( "sync" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" ) type InmemHABackend struct { diff --git a/physical/inmem/inmem_ha_test.go b/sdk/physical/inmem/inmem_ha_test.go similarity index 80% rename from physical/inmem/inmem_ha_test.go rename to sdk/physical/inmem/inmem_ha_test.go index e04622a5df..850d63a230 100644 --- a/physical/inmem/inmem_ha_test.go +++ b/sdk/physical/inmem/inmem_ha_test.go @@ -4,8 +4,8 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" ) func TestInmemHA(t *testing.T) { diff --git a/physical/inmem/inmem_test.go b/sdk/physical/inmem/inmem_test.go similarity index 76% rename from physical/inmem/inmem_test.go rename to sdk/physical/inmem/inmem_test.go index 61fcf04857..678061326a 100644 --- a/physical/inmem/inmem_test.go +++ b/sdk/physical/inmem/inmem_test.go @@ -4,8 +4,8 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" ) func TestInmem(t *testing.T) { diff --git a/physical/inmem/physical_view_test.go b/sdk/physical/inmem/physical_view_test.go similarity index 96% rename from physical/inmem/physical_view_test.go rename to sdk/physical/inmem/physical_view_test.go index 1a8f5e43b8..ea4a3ce24f 100644 --- a/physical/inmem/physical_view_test.go +++ b/sdk/physical/inmem/physical_view_test.go @@ -5,8 +5,8 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" ) func TestPhysicalView_impl(t *testing.T) { diff --git a/physical/inmem/transactions_test.go b/sdk/physical/inmem/transactions_test.go similarity index 97% rename from physical/inmem/transactions_test.go rename to sdk/physical/inmem/transactions_test.go index a505c606af..7ed3d59492 100644 --- a/physical/inmem/transactions_test.go +++ b/sdk/physical/inmem/transactions_test.go @@ -9,8 +9,8 @@ import ( radix "github.com/armon/go-radix" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" ) type faultyPseudo struct { diff --git a/physical/latency.go b/sdk/physical/latency.go similarity index 100% rename from physical/latency.go rename to sdk/physical/latency.go diff --git a/physical/physical.go b/sdk/physical/physical.go similarity index 100% rename from physical/physical.go rename to sdk/physical/physical.go diff --git a/physical/physical_access.go b/sdk/physical/physical_access.go similarity index 100% rename from physical/physical_access.go rename to sdk/physical/physical_access.go diff --git a/physical/physical_util.go b/sdk/physical/physical_util.go similarity index 100% rename from physical/physical_util.go rename to sdk/physical/physical_util.go diff --git a/physical/physical_view.go b/sdk/physical/physical_view.go similarity index 100% rename from physical/physical_view.go rename to sdk/physical/physical_view.go diff --git a/physical/testing.go b/sdk/physical/testing.go similarity index 100% rename from physical/testing.go rename to sdk/physical/testing.go diff --git a/physical/transactions.go b/sdk/physical/transactions.go similarity index 100% rename from physical/transactions.go rename to sdk/physical/transactions.go diff --git a/physical/types.pb.go b/sdk/physical/types.pb.go similarity index 72% rename from physical/types.pb.go rename to sdk/physical/types.pb.go index 91fbb0e812..9b976b9b57 100644 --- a/physical/types.pb.go +++ b/sdk/physical/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: physical/types.proto +// source: sdk/physical/types.proto package physical @@ -38,7 +38,7 @@ func (m *EncryptedBlobInfo) Reset() { *m = EncryptedBlobInfo{} } func (m *EncryptedBlobInfo) String() string { return proto.CompactTextString(m) } func (*EncryptedBlobInfo) ProtoMessage() {} func (*EncryptedBlobInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_deea33bd14ea5328, []int{0} + return fileDescriptor_21dce1f497d1541e, []int{0} } func (m *EncryptedBlobInfo) XXX_Unmarshal(b []byte) error { @@ -126,7 +126,7 @@ func (m *SealKeyInfo) Reset() { *m = SealKeyInfo{} } func (m *SealKeyInfo) String() string { return proto.CompactTextString(m) } func (*SealKeyInfo) ProtoMessage() {} func (*SealKeyInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_deea33bd14ea5328, []int{1} + return fileDescriptor_21dce1f497d1541e, []int{1} } func (m *SealKeyInfo) XXX_Unmarshal(b []byte) error { @@ -194,28 +194,28 @@ func init() { proto.RegisterType((*SealKeyInfo)(nil), "physical.SealKeyInfo") } -func init() { proto.RegisterFile("physical/types.proto", fileDescriptor_deea33bd14ea5328) } +func init() { proto.RegisterFile("sdk/physical/types.proto", fileDescriptor_21dce1f497d1541e) } -var fileDescriptor_deea33bd14ea5328 = []byte{ - // 312 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0x5f, 0x4b, 0xc3, 0x30, - 0x14, 0xc5, 0x69, 0xd7, 0xfd, 0xbb, 0x9b, 0xa2, 0x61, 0x42, 0x1e, 0x44, 0xca, 0x54, 0xe8, 0x53, - 0x2b, 0xfa, 0x09, 0x9c, 0x7f, 0x50, 0xc6, 0x5e, 0xe2, 0x83, 0xe0, 0x8b, 0x64, 0x59, 0xb6, 0x84, - 0x75, 0x4d, 0x68, 0xb3, 0x69, 0x3e, 0x98, 0x4f, 0x7e, 0x39, 0x49, 0x4a, 0xd9, 0x7c, 0xbb, 0xf7, - 0x97, 0xc3, 0xe1, 0x9c, 0x1b, 0x18, 0x69, 0x61, 0x2b, 0xc9, 0x68, 0x9e, 0x19, 0xab, 0x79, 0x95, - 0xea, 0x52, 0x19, 0x85, 0x7a, 0x0d, 0x1d, 0xff, 0x04, 0x70, 0xfa, 0x54, 0xb0, 0xd2, 0x6a, 0xc3, - 0x17, 0x93, 0x5c, 0xcd, 0x5f, 0x8b, 0xa5, 0x42, 0x17, 0x00, 0x4c, 0x6a, 0xc1, 0x4b, 0xc3, 0xbf, - 0x0d, 0x0e, 0xe2, 0x20, 0x19, 0x92, 0x03, 0x82, 0x8e, 0x21, 0x94, 0x3b, 0x1c, 0x7a, 0x1e, 0xca, - 0x1d, 0x42, 0x10, 0x89, 0x0d, 0x65, 0xb8, 0xe5, 0x89, 0x9f, 0x11, 0x86, 0xee, 0x57, 0x49, 0xb5, - 0xe6, 0x0b, 0x1c, 0xc5, 0x41, 0xd2, 0x23, 0xcd, 0x8a, 0x6e, 0xa0, 0xb7, 0xe6, 0xf6, 0x53, 0x16, - 0x4b, 0x85, 0xdb, 0x71, 0x90, 0x0c, 0x6e, 0xcf, 0xd2, 0x26, 0x50, 0xfa, 0xc6, 0x69, 0x3e, 0xe5, - 0xd6, 0xc5, 0x20, 0xdd, 0x75, 0x3d, 0xa0, 0x13, 0x68, 0xad, 0xb9, 0xc5, 0x9d, 0x38, 0x48, 0xfa, - 0xc4, 0x8d, 0xe3, 0xdf, 0x00, 0x06, 0x07, 0x52, 0x74, 0x0e, 0xfd, 0x19, 0x67, 0x82, 0x16, 0xb2, - 0xda, 0xf8, 0xc0, 0x11, 0xd9, 0x03, 0x74, 0x05, 0x47, 0x2f, 0xb3, 0xfb, 0x87, 0xbd, 0x22, 0xf4, - 0x8a, 0xff, 0x10, 0x8d, 0xa0, 0xed, 0xec, 0x1e, 0x7d, 0x8d, 0x3e, 0xa9, 0x17, 0xe7, 0xec, 0x64, - 0xf5, 0x4b, 0xe4, 0x5f, 0xf6, 0xc0, 0x5d, 0xea, 0xbd, 0xae, 0x35, 0xe5, 0xd6, 0xb7, 0x19, 0x92, - 0x03, 0xe2, 0x3c, 0x9f, 0x73, 0xba, 0xaa, 0x7c, 0xf6, 0x88, 0xd4, 0xcb, 0xe4, 0xfa, 0xe3, 0x72, - 0x25, 0x8d, 0xd8, 0xce, 0x53, 0xa6, 0x36, 0x99, 0xa0, 0x95, 0x90, 0x4c, 0x95, 0x3a, 0xdb, 0xd1, - 0x6d, 0x6e, 0xb2, 0xe6, 0x16, 0xf3, 0x8e, 0xff, 0xad, 0xbb, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x01, 0x95, 0xea, 0x9d, 0xc5, 0x01, 0x00, 0x00, +var fileDescriptor_21dce1f497d1541e = []byte{ + // 316 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0x5d, 0x4b, 0xfb, 0x30, + 0x14, 0xc6, 0x69, 0xd7, 0xbd, 0x9d, 0xed, 0xff, 0x47, 0x83, 0x42, 0x2e, 0x44, 0xca, 0x10, 0xac, + 0x37, 0xad, 0xe8, 0x27, 0x70, 0xbe, 0xa0, 0x8c, 0xdd, 0xc4, 0x0b, 0xc1, 0x1b, 0xc9, 0xb2, 0x6c, + 0x09, 0xed, 0x9a, 0xd0, 0x66, 0xd3, 0x7c, 0x30, 0xaf, 0xfc, 0x72, 0x92, 0x94, 0xb1, 0x7a, 0x77, + 0xce, 0x2f, 0x0f, 0x0f, 0xcf, 0x93, 0x03, 0xb8, 0x5e, 0xe6, 0x99, 0x16, 0xb6, 0x96, 0x8c, 0x16, + 0x99, 0xb1, 0x9a, 0xd7, 0xa9, 0xae, 0x94, 0x51, 0x68, 0xb0, 0xa7, 0x93, 0xef, 0x00, 0x8e, 0x1f, + 0x4b, 0x56, 0x59, 0x6d, 0xf8, 0x72, 0x5a, 0xa8, 0xc5, 0x4b, 0xb9, 0x52, 0xe8, 0x1c, 0x80, 0x49, + 0x2d, 0x78, 0x65, 0xf8, 0x97, 0xc1, 0x41, 0x1c, 0x24, 0x63, 0xd2, 0x22, 0xe8, 0x3f, 0x84, 0x72, + 0x87, 0x43, 0xcf, 0x43, 0xb9, 0x43, 0x08, 0x22, 0xb1, 0xa1, 0x0c, 0x77, 0x3c, 0xf1, 0x33, 0xc2, + 0xd0, 0xff, 0xac, 0xa8, 0xd6, 0x7c, 0x89, 0xa3, 0x38, 0x48, 0x06, 0x64, 0xbf, 0xa2, 0x6b, 0x18, + 0xe4, 0xdc, 0x7e, 0xc8, 0x72, 0xa5, 0x70, 0x37, 0x0e, 0x92, 0xd1, 0xcd, 0x69, 0xba, 0x0f, 0x94, + 0xbe, 0x72, 0x5a, 0xcc, 0xb8, 0x75, 0x31, 0x48, 0x3f, 0x6f, 0x06, 0x74, 0x04, 0x9d, 0x9c, 0x5b, + 0xdc, 0x8b, 0x83, 0x64, 0x48, 0xdc, 0x38, 0xf9, 0x09, 0x60, 0xd4, 0x92, 0xa2, 0x33, 0x18, 0xce, + 0x39, 0x13, 0xb4, 0x94, 0xf5, 0xc6, 0x07, 0x8e, 0xc8, 0x01, 0xa0, 0x0b, 0xf8, 0xf7, 0x3c, 0xbf, + 0xbb, 0x3f, 0x28, 0x42, 0xaf, 0xf8, 0x0b, 0xd1, 0x09, 0x74, 0x9d, 0xdd, 0x83, 0xaf, 0x31, 0x24, + 0xcd, 0xe2, 0x9c, 0x9d, 0xac, 0x79, 0x89, 0xfc, 0xcb, 0x01, 0xb8, 0x9f, 0x7a, 0x6b, 0x6a, 0xcd, + 0xb8, 0xf5, 0x6d, 0xc6, 0xa4, 0x45, 0x9c, 0xe7, 0x53, 0x41, 0xd7, 0xb5, 0xcf, 0x1e, 0x91, 0x66, + 0x99, 0x5e, 0xbd, 0x5f, 0xae, 0xa5, 0x11, 0xdb, 0x45, 0xca, 0xd4, 0x26, 0x13, 0xb4, 0x16, 0x92, + 0xa9, 0x4a, 0x67, 0x3b, 0xba, 0x2d, 0x4c, 0xd6, 0x3e, 0xdb, 0xa2, 0xe7, 0x2f, 0x76, 0xfb, 0x1b, + 0x00, 0x00, 0xff, 0xff, 0xc6, 0x34, 0xf8, 0x45, 0xcd, 0x01, 0x00, 0x00, } diff --git a/physical/types.proto b/sdk/physical/types.proto similarity index 94% rename from physical/types.proto rename to sdk/physical/types.proto index 0cc2eb53cb..1241382d3b 100644 --- a/physical/types.proto +++ b/sdk/physical/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = "github.com/hashicorp/vault/physical"; +option go_package = "github.com/hashicorp/vault/sdk/physical"; package physical; diff --git a/logical/plugin/backend.go b/sdk/plugin/backend.go similarity index 93% rename from logical/plugin/backend.go rename to sdk/plugin/backend.go index 8859a59371..17932efe40 100644 --- a/logical/plugin/backend.go +++ b/sdk/plugin/backend.go @@ -8,8 +8,8 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/plugin/pb" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/plugin/pb" ) var _ plugin.Plugin = (*GRPCBackendPlugin)(nil) diff --git a/logical/plugin/grpc_backend.go b/sdk/plugin/grpc_backend.go similarity index 100% rename from logical/plugin/grpc_backend.go rename to sdk/plugin/grpc_backend.go diff --git a/logical/plugin/grpc_backend_client.go b/sdk/plugin/grpc_backend_client.go similarity index 97% rename from logical/plugin/grpc_backend_client.go rename to sdk/plugin/grpc_backend_client.go index 17b386c9ca..169c1e23a6 100644 --- a/logical/plugin/grpc_backend_client.go +++ b/sdk/plugin/grpc_backend_client.go @@ -10,9 +10,9 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/plugin/pb" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/plugin/pb" ) var ErrPluginShutdown = errors.New("plugin is shut down") diff --git a/logical/plugin/grpc_backend_server.go b/sdk/plugin/grpc_backend_server.go similarity index 96% rename from logical/plugin/grpc_backend_server.go rename to sdk/plugin/grpc_backend_server.go index 0d105b8c39..4bbb045f31 100644 --- a/logical/plugin/grpc_backend_server.go +++ b/sdk/plugin/grpc_backend_server.go @@ -6,9 +6,9 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/plugin/pb" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/plugin/pb" "google.golang.org/grpc" ) diff --git a/logical/plugin/grpc_backend_test.go b/sdk/plugin/grpc_backend_test.go similarity index 96% rename from logical/plugin/grpc_backend_test.go rename to sdk/plugin/grpc_backend_test.go index 4765bd51ce..2911b289a2 100644 --- a/logical/plugin/grpc_backend_test.go +++ b/sdk/plugin/grpc_backend_test.go @@ -8,9 +8,9 @@ import ( log "github.com/hashicorp/go-hclog" gplugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/plugin/mock" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/plugin/mock" ) func TestGRPCBackendPlugin_impl(t *testing.T) { diff --git a/logical/plugin/grpc_storage.go b/sdk/plugin/grpc_storage.go similarity index 97% rename from logical/plugin/grpc_storage.go rename to sdk/plugin/grpc_storage.go index 9957d4190b..8eb5665009 100644 --- a/logical/plugin/grpc_storage.go +++ b/sdk/plugin/grpc_storage.go @@ -6,8 +6,8 @@ import ( "google.golang.org/grpc" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/plugin/pb" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/plugin/pb" ) func newGRPCStorageClient(conn *grpc.ClientConn) *GRPCStorageClient { diff --git a/logical/plugin/grpc_system.go b/sdk/plugin/grpc_system.go similarity index 95% rename from logical/plugin/grpc_system.go rename to sdk/plugin/grpc_system.go index 5b7a5824c4..e7c7871879 100644 --- a/logical/plugin/grpc_system.go +++ b/sdk/plugin/grpc_system.go @@ -7,12 +7,12 @@ import ( "fmt" "time" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/license" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/helper/wrapping" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/plugin/pb" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/license" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/wrapping" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/plugin/pb" "google.golang.org/grpc" ) diff --git a/logical/plugin/grpc_system_test.go b/sdk/plugin/grpc_system_test.go similarity index 97% rename from logical/plugin/grpc_system_test.go rename to sdk/plugin/grpc_system_test.go index 98ec70f65a..1bbd824783 100644 --- a/logical/plugin/grpc_system_test.go +++ b/sdk/plugin/grpc_system_test.go @@ -10,9 +10,9 @@ import ( "github.com/gogo/protobuf/proto" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/plugin/pb" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/plugin/pb" ) func TestSystem_GRPC_GRPC_impl(t *testing.T) { diff --git a/logical/plugin/logger.go b/sdk/plugin/logger.go similarity index 100% rename from logical/plugin/logger.go rename to sdk/plugin/logger.go diff --git a/logical/plugin/logger_test.go b/sdk/plugin/logger_test.go similarity index 99% rename from logical/plugin/logger_test.go rename to sdk/plugin/logger_test.go index 7a7e080453..800710d308 100644 --- a/logical/plugin/logger_test.go +++ b/sdk/plugin/logger_test.go @@ -10,7 +10,7 @@ import ( hclog "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" ) func TestLogger_levels(t *testing.T) { diff --git a/logical/plugin/middleware.go b/sdk/plugin/middleware.go similarity index 98% rename from logical/plugin/middleware.go rename to sdk/plugin/middleware.go index d9aeed0f7a..cd92a42bd0 100644 --- a/logical/plugin/middleware.go +++ b/sdk/plugin/middleware.go @@ -5,7 +5,7 @@ import ( "time" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) // backendPluginClient implements logical.Backend and is the diff --git a/logical/plugin/mock/backend.go b/sdk/plugin/mock/backend.go similarity index 95% rename from logical/plugin/mock/backend.go rename to sdk/plugin/mock/backend.go index 45c72a148c..92a11582de 100644 --- a/logical/plugin/mock/backend.go +++ b/sdk/plugin/mock/backend.go @@ -3,8 +3,8 @@ package mock import ( "context" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // New returns a new backend as an interface. This func diff --git a/logical/plugin/mock/backend_test.go b/sdk/plugin/mock/backend_test.go similarity index 73% rename from logical/plugin/mock/backend_test.go rename to sdk/plugin/mock/backend_test.go index 075911ccd0..15860906d4 100644 --- a/logical/plugin/mock/backend_test.go +++ b/sdk/plugin/mock/backend_test.go @@ -3,7 +3,7 @@ package mock import ( "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestBackend_impl(t *testing.T) { diff --git a/logical/plugin/mock/mock-plugin/main.go b/sdk/plugin/mock/mock-plugin/main.go similarity index 59% rename from logical/plugin/mock/mock-plugin/main.go rename to sdk/plugin/mock/mock-plugin/main.go index b1b7fbd713..68601e2782 100644 --- a/logical/plugin/mock/mock-plugin/main.go +++ b/sdk/plugin/mock/mock-plugin/main.go @@ -4,19 +4,19 @@ import ( "log" "os" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/plugin" - "github.com/hashicorp/vault/logical/plugin/mock" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/plugin" + "github.com/hashicorp/vault/sdk/plugin/mock" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} 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 := mock.FactoryType(logical.TypeLogical) diff --git a/logical/plugin/mock/path_errors.go b/sdk/plugin/mock/path_errors.go similarity index 91% rename from logical/plugin/mock/path_errors.go rename to sdk/plugin/mock/path_errors.go index e43be6fcd8..de0d114b1c 100644 --- a/logical/plugin/mock/path_errors.go +++ b/sdk/plugin/mock/path_errors.go @@ -5,10 +5,10 @@ import ( "errors" "net/rpc" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" - "github.com/hashicorp/vault/logical/plugin/pb" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" + "github.com/hashicorp/vault/sdk/plugin/pb" ) // pathInternal is used to test viewing internal backend values. In this case, diff --git a/logical/plugin/mock/path_internal.go b/sdk/plugin/mock/path_internal.go similarity index 92% rename from logical/plugin/mock/path_internal.go rename to sdk/plugin/mock/path_internal.go index c8743e079d..eb3ed84be0 100644 --- a/logical/plugin/mock/path_internal.go +++ b/sdk/plugin/mock/path_internal.go @@ -3,8 +3,8 @@ package mock import ( "context" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // pathInternal is used to test viewing internal backend values. In this case, diff --git a/logical/plugin/mock/path_kv.go b/sdk/plugin/mock/path_kv.go similarity index 97% rename from logical/plugin/mock/path_kv.go rename to sdk/plugin/mock/path_kv.go index 4fcd246e8a..c4a7d9a7a1 100644 --- a/logical/plugin/mock/path_kv.go +++ b/sdk/plugin/mock/path_kv.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // kvPaths is used to test CRUD and List operations. It is a simplified diff --git a/logical/plugin/mock/path_raw.go b/sdk/plugin/mock/path_raw.go similarity index 87% rename from logical/plugin/mock/path_raw.go rename to sdk/plugin/mock/path_raw.go index 1321556295..3421594cad 100644 --- a/logical/plugin/mock/path_raw.go +++ b/sdk/plugin/mock/path_raw.go @@ -3,8 +3,8 @@ package mock import ( "context" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // pathRaw is used to test raw responses. diff --git a/logical/plugin/mock/path_special.go b/sdk/plugin/mock/path_special.go similarity index 86% rename from logical/plugin/mock/path_special.go rename to sdk/plugin/mock/path_special.go index 90068db29c..3ea10ffcba 100644 --- a/logical/plugin/mock/path_special.go +++ b/sdk/plugin/mock/path_special.go @@ -3,8 +3,8 @@ package mock import ( "context" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // pathSpecial is used to test special paths. diff --git a/logical/plugin/pb/backend.pb.go b/sdk/plugin/pb/backend.pb.go similarity index 87% rename from logical/plugin/pb/backend.pb.go rename to sdk/plugin/pb/backend.pb.go index f68538c6f6..e0a4a97e19 100644 --- a/logical/plugin/pb/backend.pb.go +++ b/sdk/plugin/pb/backend.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: logical/plugin/pb/backend.proto +// source: sdk/plugin/pb/backend.proto package pb @@ -7,7 +7,7 @@ import ( fmt "fmt" proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" - logical "github.com/hashicorp/vault/logical" + logical "github.com/hashicorp/vault/sdk/logical" context "golang.org/x/net/context" grpc "google.golang.org/grpc" math "math" @@ -34,7 +34,7 @@ func (m *Empty) Reset() { *m = Empty{} } func (m *Empty) String() string { return proto.CompactTextString(m) } func (*Empty) ProtoMessage() {} func (*Empty) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{0} + return fileDescriptor_4dbf1dfe0c11846b, []int{0} } func (m *Empty) XXX_Unmarshal(b []byte) error { @@ -66,7 +66,7 @@ func (m *Header) Reset() { *m = Header{} } func (m *Header) String() string { return proto.CompactTextString(m) } func (*Header) ProtoMessage() {} func (*Header) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{1} + return fileDescriptor_4dbf1dfe0c11846b, []int{1} } func (m *Header) XXX_Unmarshal(b []byte) error { @@ -118,7 +118,7 @@ func (m *ProtoError) Reset() { *m = ProtoError{} } func (m *ProtoError) String() string { return proto.CompactTextString(m) } func (*ProtoError) ProtoMessage() {} func (*ProtoError) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{2} + return fileDescriptor_4dbf1dfe0c11846b, []int{2} } func (m *ProtoError) XXX_Unmarshal(b []byte) error { @@ -182,7 +182,7 @@ func (m *Paths) Reset() { *m = Paths{} } func (m *Paths) String() string { return proto.CompactTextString(m) } func (*Paths) ProtoMessage() {} func (*Paths) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{3} + return fileDescriptor_4dbf1dfe0c11846b, []int{3} } func (m *Paths) XXX_Unmarshal(b []byte) error { @@ -307,7 +307,7 @@ func (m *Request) Reset() { *m = Request{} } func (m *Request) String() string { return proto.CompactTextString(m) } func (*Request) ProtoMessage() {} func (*Request) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{4} + return fileDescriptor_4dbf1dfe0c11846b, []int{4} } func (m *Request) XXX_Unmarshal(b []byte) error { @@ -536,7 +536,7 @@ func (m *Auth) Reset() { *m = Auth{} } func (m *Auth) String() string { return proto.CompactTextString(m) } func (*Auth) ProtoMessage() {} func (*Auth) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{5} + return fileDescriptor_4dbf1dfe0c11846b, []int{5} } func (m *Auth) XXX_Unmarshal(b []byte) error { @@ -704,7 +704,7 @@ func (m *TokenEntry) Reset() { *m = TokenEntry{} } func (m *TokenEntry) String() string { return proto.CompactTextString(m) } func (*TokenEntry) ProtoMessage() {} func (*TokenEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{6} + return fileDescriptor_4dbf1dfe0c11846b, []int{6} } func (m *TokenEntry) XXX_Unmarshal(b []byte) error { @@ -866,7 +866,7 @@ func (m *LeaseOptions) Reset() { *m = LeaseOptions{} } func (m *LeaseOptions) String() string { return proto.CompactTextString(m) } func (*LeaseOptions) ProtoMessage() {} func (*LeaseOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{7} + return fileDescriptor_4dbf1dfe0c11846b, []int{7} } func (m *LeaseOptions) XXX_Unmarshal(b []byte) error { @@ -941,7 +941,7 @@ func (m *Secret) Reset() { *m = Secret{} } func (m *Secret) String() string { return proto.CompactTextString(m) } func (*Secret) ProtoMessage() {} func (*Secret) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{8} + return fileDescriptor_4dbf1dfe0c11846b, []int{8} } func (m *Secret) XXX_Unmarshal(b []byte) error { @@ -1017,7 +1017,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{9} + return fileDescriptor_4dbf1dfe0c11846b, []int{9} } func (m *Response) XXX_Unmarshal(b []byte) error { @@ -1120,7 +1120,7 @@ func (m *ResponseWrapInfo) Reset() { *m = ResponseWrapInfo{} } func (m *ResponseWrapInfo) String() string { return proto.CompactTextString(m) } func (*ResponseWrapInfo) ProtoMessage() {} func (*ResponseWrapInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{10} + return fileDescriptor_4dbf1dfe0c11846b, []int{10} } func (m *ResponseWrapInfo) XXX_Unmarshal(b []byte) error { @@ -1223,7 +1223,7 @@ func (m *RequestWrapInfo) Reset() { *m = RequestWrapInfo{} } func (m *RequestWrapInfo) String() string { return proto.CompactTextString(m) } func (*RequestWrapInfo) ProtoMessage() {} func (*RequestWrapInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{11} + return fileDescriptor_4dbf1dfe0c11846b, []int{11} } func (m *RequestWrapInfo) XXX_Unmarshal(b []byte) error { @@ -1278,7 +1278,7 @@ func (m *HandleRequestArgs) Reset() { *m = HandleRequestArgs{} } func (m *HandleRequestArgs) String() string { return proto.CompactTextString(m) } func (*HandleRequestArgs) ProtoMessage() {} func (*HandleRequestArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{12} + return fileDescriptor_4dbf1dfe0c11846b, []int{12} } func (m *HandleRequestArgs) XXX_Unmarshal(b []byte) error { @@ -1326,7 +1326,7 @@ func (m *HandleRequestReply) Reset() { *m = HandleRequestReply{} } func (m *HandleRequestReply) String() string { return proto.CompactTextString(m) } func (*HandleRequestReply) ProtoMessage() {} func (*HandleRequestReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{13} + return fileDescriptor_4dbf1dfe0c11846b, []int{13} } func (m *HandleRequestReply) XXX_Unmarshal(b []byte) error { @@ -1373,7 +1373,7 @@ func (m *SpecialPathsReply) Reset() { *m = SpecialPathsReply{} } func (m *SpecialPathsReply) String() string { return proto.CompactTextString(m) } func (*SpecialPathsReply) ProtoMessage() {} func (*SpecialPathsReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{14} + return fileDescriptor_4dbf1dfe0c11846b, []int{14} } func (m *SpecialPathsReply) XXX_Unmarshal(b []byte) error { @@ -1414,7 +1414,7 @@ func (m *HandleExistenceCheckArgs) Reset() { *m = HandleExistenceCheckAr func (m *HandleExistenceCheckArgs) String() string { return proto.CompactTextString(m) } func (*HandleExistenceCheckArgs) ProtoMessage() {} func (*HandleExistenceCheckArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{15} + return fileDescriptor_4dbf1dfe0c11846b, []int{15} } func (m *HandleExistenceCheckArgs) XXX_Unmarshal(b []byte) error { @@ -1463,7 +1463,7 @@ func (m *HandleExistenceCheckReply) Reset() { *m = HandleExistenceCheckR func (m *HandleExistenceCheckReply) String() string { return proto.CompactTextString(m) } func (*HandleExistenceCheckReply) ProtoMessage() {} func (*HandleExistenceCheckReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{16} + return fileDescriptor_4dbf1dfe0c11846b, []int{16} } func (m *HandleExistenceCheckReply) XXX_Unmarshal(b []byte) error { @@ -1519,7 +1519,7 @@ func (m *SetupArgs) Reset() { *m = SetupArgs{} } func (m *SetupArgs) String() string { return proto.CompactTextString(m) } func (*SetupArgs) ProtoMessage() {} func (*SetupArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{17} + return fileDescriptor_4dbf1dfe0c11846b, []int{17} } func (m *SetupArgs) XXX_Unmarshal(b []byte) error { @@ -1573,7 +1573,7 @@ func (m *SetupReply) Reset() { *m = SetupReply{} } func (m *SetupReply) String() string { return proto.CompactTextString(m) } func (*SetupReply) ProtoMessage() {} func (*SetupReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{18} + return fileDescriptor_4dbf1dfe0c11846b, []int{18} } func (m *SetupReply) XXX_Unmarshal(b []byte) error { @@ -1613,7 +1613,7 @@ func (m *TypeReply) Reset() { *m = TypeReply{} } func (m *TypeReply) String() string { return proto.CompactTextString(m) } func (*TypeReply) ProtoMessage() {} func (*TypeReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{19} + return fileDescriptor_4dbf1dfe0c11846b, []int{19} } func (m *TypeReply) XXX_Unmarshal(b []byte) error { @@ -1652,7 +1652,7 @@ func (m *InvalidateKeyArgs) Reset() { *m = InvalidateKeyArgs{} } func (m *InvalidateKeyArgs) String() string { return proto.CompactTextString(m) } func (*InvalidateKeyArgs) ProtoMessage() {} func (*InvalidateKeyArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{20} + return fileDescriptor_4dbf1dfe0c11846b, []int{20} } func (m *InvalidateKeyArgs) XXX_Unmarshal(b []byte) error { @@ -1693,7 +1693,7 @@ func (m *StorageEntry) Reset() { *m = StorageEntry{} } func (m *StorageEntry) String() string { return proto.CompactTextString(m) } func (*StorageEntry) ProtoMessage() {} func (*StorageEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{21} + return fileDescriptor_4dbf1dfe0c11846b, []int{21} } func (m *StorageEntry) XXX_Unmarshal(b []byte) error { @@ -1746,7 +1746,7 @@ func (m *StorageListArgs) Reset() { *m = StorageListArgs{} } func (m *StorageListArgs) String() string { return proto.CompactTextString(m) } func (*StorageListArgs) ProtoMessage() {} func (*StorageListArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{22} + return fileDescriptor_4dbf1dfe0c11846b, []int{22} } func (m *StorageListArgs) XXX_Unmarshal(b []byte) error { @@ -1786,7 +1786,7 @@ func (m *StorageListReply) Reset() { *m = StorageListReply{} } func (m *StorageListReply) String() string { return proto.CompactTextString(m) } func (*StorageListReply) ProtoMessage() {} func (*StorageListReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{23} + return fileDescriptor_4dbf1dfe0c11846b, []int{23} } func (m *StorageListReply) XXX_Unmarshal(b []byte) error { @@ -1832,7 +1832,7 @@ func (m *StorageGetArgs) Reset() { *m = StorageGetArgs{} } func (m *StorageGetArgs) String() string { return proto.CompactTextString(m) } func (*StorageGetArgs) ProtoMessage() {} func (*StorageGetArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{24} + return fileDescriptor_4dbf1dfe0c11846b, []int{24} } func (m *StorageGetArgs) XXX_Unmarshal(b []byte) error { @@ -1872,7 +1872,7 @@ func (m *StorageGetReply) Reset() { *m = StorageGetReply{} } func (m *StorageGetReply) String() string { return proto.CompactTextString(m) } func (*StorageGetReply) ProtoMessage() {} func (*StorageGetReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{25} + return fileDescriptor_4dbf1dfe0c11846b, []int{25} } func (m *StorageGetReply) XXX_Unmarshal(b []byte) error { @@ -1918,7 +1918,7 @@ func (m *StoragePutArgs) Reset() { *m = StoragePutArgs{} } func (m *StoragePutArgs) String() string { return proto.CompactTextString(m) } func (*StoragePutArgs) ProtoMessage() {} func (*StoragePutArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{26} + return fileDescriptor_4dbf1dfe0c11846b, []int{26} } func (m *StoragePutArgs) XXX_Unmarshal(b []byte) error { @@ -1957,7 +1957,7 @@ func (m *StoragePutReply) Reset() { *m = StoragePutReply{} } func (m *StoragePutReply) String() string { return proto.CompactTextString(m) } func (*StoragePutReply) ProtoMessage() {} func (*StoragePutReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{27} + return fileDescriptor_4dbf1dfe0c11846b, []int{27} } func (m *StoragePutReply) XXX_Unmarshal(b []byte) error { @@ -1996,7 +1996,7 @@ func (m *StorageDeleteArgs) Reset() { *m = StorageDeleteArgs{} } func (m *StorageDeleteArgs) String() string { return proto.CompactTextString(m) } func (*StorageDeleteArgs) ProtoMessage() {} func (*StorageDeleteArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{28} + return fileDescriptor_4dbf1dfe0c11846b, []int{28} } func (m *StorageDeleteArgs) XXX_Unmarshal(b []byte) error { @@ -2035,7 +2035,7 @@ func (m *StorageDeleteReply) Reset() { *m = StorageDeleteReply{} } func (m *StorageDeleteReply) String() string { return proto.CompactTextString(m) } func (*StorageDeleteReply) ProtoMessage() {} func (*StorageDeleteReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{29} + return fileDescriptor_4dbf1dfe0c11846b, []int{29} } func (m *StorageDeleteReply) XXX_Unmarshal(b []byte) error { @@ -2074,7 +2074,7 @@ func (m *TTLReply) Reset() { *m = TTLReply{} } func (m *TTLReply) String() string { return proto.CompactTextString(m) } func (*TTLReply) ProtoMessage() {} func (*TTLReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{30} + return fileDescriptor_4dbf1dfe0c11846b, []int{30} } func (m *TTLReply) XXX_Unmarshal(b []byte) error { @@ -2114,7 +2114,7 @@ func (m *SudoPrivilegeArgs) Reset() { *m = SudoPrivilegeArgs{} } func (m *SudoPrivilegeArgs) String() string { return proto.CompactTextString(m) } func (*SudoPrivilegeArgs) ProtoMessage() {} func (*SudoPrivilegeArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{31} + return fileDescriptor_4dbf1dfe0c11846b, []int{31} } func (m *SudoPrivilegeArgs) XXX_Unmarshal(b []byte) error { @@ -2160,7 +2160,7 @@ func (m *SudoPrivilegeReply) Reset() { *m = SudoPrivilegeReply{} } func (m *SudoPrivilegeReply) String() string { return proto.CompactTextString(m) } func (*SudoPrivilegeReply) ProtoMessage() {} func (*SudoPrivilegeReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{32} + return fileDescriptor_4dbf1dfe0c11846b, []int{32} } func (m *SudoPrivilegeReply) XXX_Unmarshal(b []byte) error { @@ -2199,7 +2199,7 @@ func (m *TaintedReply) Reset() { *m = TaintedReply{} } func (m *TaintedReply) String() string { return proto.CompactTextString(m) } func (*TaintedReply) ProtoMessage() {} func (*TaintedReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{33} + return fileDescriptor_4dbf1dfe0c11846b, []int{33} } func (m *TaintedReply) XXX_Unmarshal(b []byte) error { @@ -2238,7 +2238,7 @@ func (m *CachingDisabledReply) Reset() { *m = CachingDisabledReply{} } func (m *CachingDisabledReply) String() string { return proto.CompactTextString(m) } func (*CachingDisabledReply) ProtoMessage() {} func (*CachingDisabledReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{34} + return fileDescriptor_4dbf1dfe0c11846b, []int{34} } func (m *CachingDisabledReply) XXX_Unmarshal(b []byte) error { @@ -2277,7 +2277,7 @@ func (m *ReplicationStateReply) Reset() { *m = ReplicationStateReply{} } func (m *ReplicationStateReply) String() string { return proto.CompactTextString(m) } func (*ReplicationStateReply) ProtoMessage() {} func (*ReplicationStateReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{35} + return fileDescriptor_4dbf1dfe0c11846b, []int{35} } func (m *ReplicationStateReply) XXX_Unmarshal(b []byte) error { @@ -2318,7 +2318,7 @@ func (m *ResponseWrapDataArgs) Reset() { *m = ResponseWrapDataArgs{} } func (m *ResponseWrapDataArgs) String() string { return proto.CompactTextString(m) } func (*ResponseWrapDataArgs) ProtoMessage() {} func (*ResponseWrapDataArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{36} + return fileDescriptor_4dbf1dfe0c11846b, []int{36} } func (m *ResponseWrapDataArgs) XXX_Unmarshal(b []byte) error { @@ -2372,7 +2372,7 @@ func (m *ResponseWrapDataReply) Reset() { *m = ResponseWrapDataReply{} } func (m *ResponseWrapDataReply) String() string { return proto.CompactTextString(m) } func (*ResponseWrapDataReply) ProtoMessage() {} func (*ResponseWrapDataReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{37} + return fileDescriptor_4dbf1dfe0c11846b, []int{37} } func (m *ResponseWrapDataReply) XXX_Unmarshal(b []byte) error { @@ -2418,7 +2418,7 @@ func (m *MlockEnabledReply) Reset() { *m = MlockEnabledReply{} } func (m *MlockEnabledReply) String() string { return proto.CompactTextString(m) } func (*MlockEnabledReply) ProtoMessage() {} func (*MlockEnabledReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{38} + return fileDescriptor_4dbf1dfe0c11846b, []int{38} } func (m *MlockEnabledReply) XXX_Unmarshal(b []byte) error { @@ -2457,7 +2457,7 @@ func (m *LocalMountReply) Reset() { *m = LocalMountReply{} } func (m *LocalMountReply) String() string { return proto.CompactTextString(m) } func (*LocalMountReply) ProtoMessage() {} func (*LocalMountReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{39} + return fileDescriptor_4dbf1dfe0c11846b, []int{39} } func (m *LocalMountReply) XXX_Unmarshal(b []byte) error { @@ -2496,7 +2496,7 @@ func (m *EntityInfoArgs) Reset() { *m = EntityInfoArgs{} } func (m *EntityInfoArgs) String() string { return proto.CompactTextString(m) } func (*EntityInfoArgs) ProtoMessage() {} func (*EntityInfoArgs) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{40} + return fileDescriptor_4dbf1dfe0c11846b, []int{40} } func (m *EntityInfoArgs) XXX_Unmarshal(b []byte) error { @@ -2536,7 +2536,7 @@ func (m *EntityInfoReply) Reset() { *m = EntityInfoReply{} } func (m *EntityInfoReply) String() string { return proto.CompactTextString(m) } func (*EntityInfoReply) ProtoMessage() {} func (*EntityInfoReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{41} + return fileDescriptor_4dbf1dfe0c11846b, []int{41} } func (m *EntityInfoReply) XXX_Unmarshal(b []byte) error { @@ -2583,7 +2583,7 @@ func (m *PluginEnvReply) Reset() { *m = PluginEnvReply{} } func (m *PluginEnvReply) String() string { return proto.CompactTextString(m) } func (*PluginEnvReply) ProtoMessage() {} func (*PluginEnvReply) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{42} + return fileDescriptor_4dbf1dfe0c11846b, []int{42} } func (m *PluginEnvReply) XXX_Unmarshal(b []byte) error { @@ -2630,7 +2630,7 @@ func (m *Connection) Reset() { *m = Connection{} } func (m *Connection) String() string { return proto.CompactTextString(m) } func (*Connection) ProtoMessage() {} func (*Connection) Descriptor() ([]byte, []int) { - return fileDescriptor_25821d34acc7c5ef, []int{43} + return fileDescriptor_4dbf1dfe0c11846b, []int{43} } func (m *Connection) XXX_Unmarshal(b []byte) error { @@ -2710,166 +2710,167 @@ func init() { proto.RegisterType((*Connection)(nil), "pb.Connection") } -func init() { proto.RegisterFile("logical/plugin/pb/backend.proto", fileDescriptor_25821d34acc7c5ef) } +func init() { proto.RegisterFile("sdk/plugin/pb/backend.proto", fileDescriptor_4dbf1dfe0c11846b) } -var fileDescriptor_25821d34acc7c5ef = []byte{ - // 2495 bytes of a gzipped FileDescriptorProto +var fileDescriptor_4dbf1dfe0c11846b = []byte{ + // 2499 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0xdb, 0x72, 0x1b, 0xc7, - 0xd1, 0x2e, 0x00, 0xc4, 0xa9, 0x71, 0x22, 0x46, 0x34, 0xff, 0x15, 0x2c, 0xff, 0x82, 0xd7, 0x91, - 0x44, 0x2b, 0x12, 0x68, 0x51, 0x71, 0x2c, 0x27, 0x65, 0xa7, 0x68, 0x8a, 0x96, 0x19, 0x93, 0x36, + 0xd1, 0x2e, 0x00, 0xc4, 0xa9, 0x71, 0x22, 0x46, 0xb4, 0xfe, 0x15, 0x24, 0xff, 0x82, 0xd7, 0x91, + 0x0c, 0x2b, 0x36, 0x68, 0x51, 0x71, 0x2c, 0x27, 0x65, 0xa7, 0x68, 0x8a, 0x96, 0x19, 0x93, 0x36, 0x6b, 0x09, 0xc5, 0x39, 0x55, 0xc1, 0x83, 0xdd, 0x21, 0xb8, 0xc5, 0xc5, 0xee, 0x66, 0x76, 0x96, 0x22, 0xae, 0xf2, 0x16, 0x79, 0x8d, 0xdc, 0xa6, 0x72, 0x93, 0xbb, 0x94, 0x2b, 0xf7, 0x79, 0x8d, 0x3c, 0x43, 0x6a, 0x7a, 0x66, 0x4f, 0x00, 0x68, 0xc9, 0x55, 0xce, 0xdd, 0x4c, 0x77, 0xcf, 0xa9, - 0xe7, 0xeb, 0xaf, 0x7b, 0x76, 0xe1, 0xae, 0x17, 0xcc, 0x5c, 0x9b, 0x7a, 0xbb, 0xa1, 0x17, 0xcf, - 0x5c, 0x7f, 0x37, 0x9c, 0xee, 0x4e, 0xa9, 0x7d, 0xc9, 0x7c, 0x67, 0x14, 0xf2, 0x40, 0x04, 0xa4, - 0x1c, 0x4e, 0x07, 0x77, 0x67, 0x41, 0x30, 0xf3, 0xd8, 0x2e, 0x4a, 0xa6, 0xf1, 0xf9, 0xae, 0x70, - 0xe7, 0x2c, 0x12, 0x74, 0x1e, 0x2a, 0xa3, 0xc1, 0x76, 0x32, 0x8b, 0xeb, 0x30, 0x5f, 0xb8, 0x62, - 0xa1, 0xe5, 0x5b, 0xc5, 0xd9, 0x95, 0xd4, 0xac, 0x43, 0xf5, 0x70, 0x1e, 0x8a, 0x85, 0x39, 0x84, - 0xda, 0x17, 0x8c, 0x3a, 0x8c, 0x93, 0x6d, 0xa8, 0x5d, 0x60, 0xcb, 0x28, 0x0d, 0x2b, 0x3b, 0x4d, - 0x4b, 0xf7, 0xcc, 0x3f, 0x00, 0x9c, 0xca, 0x31, 0x87, 0x9c, 0x07, 0x9c, 0xdc, 0x86, 0x06, 0xe3, - 0x7c, 0x22, 0x16, 0x21, 0x33, 0x4a, 0xc3, 0xd2, 0x4e, 0xc7, 0xaa, 0x33, 0xce, 0xc7, 0x8b, 0x90, - 0x91, 0xff, 0x03, 0xd9, 0x9c, 0xcc, 0xa3, 0x99, 0x51, 0x1e, 0x96, 0xe4, 0x0c, 0x8c, 0xf3, 0x93, - 0x68, 0x96, 0x8c, 0xb1, 0x03, 0x87, 0x19, 0x95, 0x61, 0x69, 0xa7, 0x82, 0x63, 0x0e, 0x02, 0x87, - 0x99, 0x7f, 0x29, 0x41, 0xf5, 0x94, 0x8a, 0x8b, 0x88, 0x10, 0xd8, 0xe0, 0x41, 0x20, 0xf4, 0xe2, - 0xd8, 0x26, 0x3b, 0xd0, 0x8b, 0x7d, 0x1a, 0x8b, 0x0b, 0x79, 0x22, 0x9b, 0x0a, 0xe6, 0x18, 0x65, - 0x54, 0x2f, 0x8b, 0xc9, 0x7b, 0xd0, 0xf1, 0x02, 0x9b, 0x7a, 0x93, 0x48, 0x04, 0x9c, 0xce, 0xe4, - 0x3a, 0xd2, 0xae, 0x8d, 0xc2, 0x33, 0x25, 0x23, 0x0f, 0xa1, 0x1f, 0x31, 0xea, 0x4d, 0x5e, 0x71, - 0x1a, 0xa6, 0x86, 0x1b, 0x6a, 0x42, 0xa9, 0xf8, 0x86, 0xd3, 0x50, 0xdb, 0x9a, 0xff, 0xa8, 0x41, - 0xdd, 0x62, 0x7f, 0x8a, 0x59, 0x24, 0x48, 0x17, 0xca, 0xae, 0x83, 0xa7, 0x6d, 0x5a, 0x65, 0xd7, - 0x21, 0x23, 0x20, 0x16, 0x0b, 0x3d, 0xb9, 0xb4, 0x1b, 0xf8, 0x07, 0x5e, 0x1c, 0x09, 0xc6, 0xf5, - 0x99, 0xd7, 0x68, 0xc8, 0x1d, 0x68, 0x06, 0x21, 0xe3, 0x28, 0x43, 0x07, 0x34, 0xad, 0x4c, 0x20, - 0x0f, 0x1e, 0x52, 0x71, 0x61, 0x6c, 0xa0, 0x02, 0xdb, 0x52, 0xe6, 0x50, 0x41, 0x8d, 0xaa, 0x92, - 0xc9, 0x36, 0x31, 0xa1, 0x16, 0x31, 0x9b, 0x33, 0x61, 0xd4, 0x86, 0xa5, 0x9d, 0xd6, 0x1e, 0x8c, - 0xc2, 0xe9, 0xe8, 0x0c, 0x25, 0x96, 0xd6, 0x90, 0x3b, 0xb0, 0x21, 0xfd, 0x62, 0xd4, 0xd1, 0xa2, - 0x21, 0x2d, 0xf6, 0x63, 0x71, 0x61, 0xa1, 0x94, 0xec, 0x41, 0x5d, 0xdd, 0x69, 0x64, 0x34, 0x86, - 0x95, 0x9d, 0xd6, 0x9e, 0x21, 0x0d, 0xf4, 0x29, 0x47, 0x0a, 0x06, 0xd1, 0xa1, 0x2f, 0xf8, 0xc2, - 0x4a, 0x0c, 0xc9, 0xbb, 0xd0, 0xb6, 0x3d, 0x97, 0xf9, 0x62, 0x22, 0x82, 0x4b, 0xe6, 0x1b, 0x4d, - 0xdc, 0x51, 0x4b, 0xc9, 0xc6, 0x52, 0x44, 0xf6, 0xe0, 0xad, 0xbc, 0xc9, 0x84, 0xda, 0x36, 0x8b, - 0xa2, 0x80, 0x1b, 0x80, 0xb6, 0xb7, 0x72, 0xb6, 0xfb, 0x5a, 0x25, 0xa7, 0x75, 0xdc, 0x28, 0xf4, - 0xe8, 0x62, 0xe2, 0xd3, 0x39, 0x33, 0x5a, 0x6a, 0x5a, 0x2d, 0xfb, 0x8a, 0xce, 0x19, 0xb9, 0x0b, - 0xad, 0x79, 0x10, 0xfb, 0x62, 0x12, 0x06, 0xae, 0x2f, 0x8c, 0x36, 0x5a, 0x00, 0x8a, 0x4e, 0xa5, - 0x84, 0xbc, 0x03, 0xaa, 0xa7, 0xc0, 0xd8, 0x51, 0x7e, 0x45, 0x09, 0xc2, 0xf1, 0x1e, 0x74, 0x95, - 0x3a, 0xdd, 0x4f, 0x17, 0x4d, 0x3a, 0x28, 0x4d, 0x77, 0xf2, 0x01, 0x34, 0x11, 0x0f, 0xae, 0x7f, - 0x1e, 0x18, 0x3d, 0xf4, 0xdb, 0xad, 0x9c, 0x5b, 0x24, 0x26, 0x8e, 0xfc, 0xf3, 0xc0, 0x6a, 0xbc, - 0xd2, 0x2d, 0xf2, 0x09, 0xbc, 0x5d, 0x38, 0x2f, 0x67, 0x73, 0xea, 0xfa, 0xae, 0x3f, 0x9b, 0xc4, - 0x11, 0x8b, 0x8c, 0x4d, 0x44, 0xb8, 0x91, 0x3b, 0xb5, 0x95, 0x18, 0xbc, 0x8c, 0x58, 0x44, 0xde, - 0x86, 0xa6, 0x0a, 0xd0, 0x89, 0xeb, 0x18, 0x7d, 0xdc, 0x52, 0x43, 0x09, 0x8e, 0x1c, 0xf2, 0x00, - 0x7a, 0x61, 0xe0, 0xb9, 0xf6, 0x62, 0x12, 0x5c, 0x31, 0xce, 0x5d, 0x87, 0x19, 0x64, 0x58, 0xda, - 0x69, 0x58, 0x5d, 0x25, 0xfe, 0x5a, 0x4b, 0xd7, 0x85, 0xc6, 0x2d, 0x34, 0x5c, 0x09, 0x8d, 0x11, - 0x80, 0x1d, 0xf8, 0x3e, 0xb3, 0x11, 0x7e, 0x5b, 0x78, 0xc2, 0xae, 0x3c, 0xe1, 0x41, 0x2a, 0xb5, - 0x72, 0x16, 0x83, 0xcf, 0xa1, 0x9d, 0x87, 0x02, 0xd9, 0x84, 0xca, 0x25, 0x5b, 0x68, 0xf8, 0xcb, - 0x26, 0x19, 0x42, 0xf5, 0x8a, 0x7a, 0x31, 0x43, 0xc8, 0x6b, 0x20, 0xaa, 0x21, 0x96, 0x52, 0xfc, - 0xa2, 0xfc, 0xac, 0x64, 0xfe, 0xbd, 0x0a, 0x1b, 0x12, 0x7c, 0xe4, 0x43, 0xe8, 0x78, 0x8c, 0x46, - 0x6c, 0x12, 0x84, 0x72, 0x81, 0x08, 0xa7, 0x6a, 0xed, 0x6d, 0xca, 0x61, 0xc7, 0x52, 0xf1, 0xb5, - 0x92, 0x5b, 0x6d, 0x2f, 0xd7, 0x93, 0x21, 0xed, 0xfa, 0x82, 0x71, 0x9f, 0x7a, 0x13, 0x0c, 0x06, - 0x15, 0x60, 0xed, 0x44, 0xf8, 0x5c, 0x06, 0xc5, 0x32, 0x8e, 0x2a, 0xab, 0x38, 0x1a, 0x40, 0x03, - 0x7d, 0xe7, 0xb2, 0x48, 0x07, 0x7b, 0xda, 0x27, 0x7b, 0xd0, 0x98, 0x33, 0x41, 0x75, 0xac, 0xc9, - 0x90, 0xd8, 0x4e, 0x62, 0x66, 0x74, 0xa2, 0x15, 0x2a, 0x20, 0x52, 0xbb, 0x95, 0x88, 0xa8, 0xad, - 0x46, 0xc4, 0x00, 0x1a, 0x29, 0xe8, 0xea, 0xea, 0x86, 0x93, 0xbe, 0xa4, 0xd9, 0x90, 0x71, 0x37, - 0x70, 0x8c, 0x06, 0x02, 0x45, 0xf7, 0x24, 0x49, 0xfa, 0xf1, 0x5c, 0x41, 0xa8, 0xa9, 0x48, 0xd2, - 0x8f, 0xe7, 0xab, 0x88, 0x81, 0x25, 0xc4, 0xfc, 0x04, 0xaa, 0xd4, 0x73, 0x69, 0x84, 0x21, 0x24, - 0x6f, 0x56, 0xf3, 0xfd, 0x68, 0x5f, 0x4a, 0x2d, 0xa5, 0x24, 0x4f, 0xa1, 0x33, 0xe3, 0x41, 0x1c, - 0x4e, 0xb0, 0xcb, 0x22, 0xa3, 0x8d, 0xa7, 0x5d, 0xb6, 0x6e, 0xa3, 0xd1, 0xbe, 0xb2, 0x91, 0x11, - 0x38, 0x0d, 0x62, 0xdf, 0x99, 0xd8, 0xae, 0xc3, 0x23, 0xa3, 0x83, 0xce, 0x03, 0x14, 0x1d, 0x48, - 0x89, 0x0c, 0x31, 0x15, 0x02, 0xa9, 0x83, 0xbb, 0x68, 0xd3, 0x41, 0xe9, 0x69, 0xe2, 0xe5, 0x9f, - 0x42, 0x3f, 0x49, 0x4a, 0x99, 0x65, 0x0f, 0x2d, 0x37, 0x13, 0x45, 0x6a, 0xbc, 0x03, 0x9b, 0xec, - 0x5a, 0x52, 0xa8, 0x2b, 0x26, 0x73, 0x7a, 0x3d, 0x11, 0xc2, 0xd3, 0x21, 0xd5, 0x4d, 0xe4, 0x27, - 0xf4, 0x7a, 0x2c, 0x3c, 0x19, 0xff, 0x6a, 0x75, 0x8c, 0xff, 0x3e, 0x26, 0xa3, 0x26, 0x4a, 0x64, - 0xfc, 0x0f, 0x7e, 0x09, 0x9d, 0xc2, 0x15, 0xae, 0x01, 0xf2, 0x56, 0x1e, 0xc8, 0xcd, 0x3c, 0x78, - 0xff, 0xb5, 0x01, 0x80, 0x77, 0xa9, 0x86, 0x2e, 0x67, 0x80, 0xfc, 0x05, 0x97, 0xd7, 0x5c, 0x30, - 0xe5, 0xcc, 0x17, 0x1a, 0x8c, 0xba, 0xf7, 0xbd, 0x38, 0x4c, 0x72, 0x40, 0x35, 0x97, 0x03, 0x1e, - 0xc1, 0x86, 0xc4, 0x9c, 0x51, 0xcb, 0xa8, 0x3a, 0xdb, 0x11, 0xa2, 0x53, 0x21, 0x13, 0xad, 0x56, - 0x02, 0xa1, 0xbe, 0x1a, 0x08, 0x79, 0x84, 0x35, 0x8a, 0x08, 0x7b, 0x0f, 0x3a, 0x36, 0x67, 0x98, - 0x8f, 0x26, 0xb2, 0xb0, 0xd0, 0x08, 0x6c, 0x27, 0xc2, 0xb1, 0x3b, 0x67, 0xd2, 0x7f, 0xf2, 0x32, - 0x00, 0x55, 0xb2, 0xb9, 0xf6, 0xae, 0x5a, 0x6b, 0xef, 0x0a, 0xb3, 0xbb, 0xc7, 0x34, 0x8b, 0x63, - 0x3b, 0x17, 0x09, 0x9d, 0x42, 0x24, 0x14, 0xe0, 0xde, 0x5d, 0x82, 0xfb, 0x12, 0x26, 0x7b, 0x2b, - 0x98, 0x7c, 0x17, 0xda, 0xd2, 0x01, 0x51, 0x48, 0x6d, 0x26, 0x27, 0xd8, 0x54, 0x8e, 0x48, 0x65, - 0x47, 0x0e, 0x46, 0x70, 0x3c, 0x9d, 0x2e, 0x2e, 0x02, 0x8f, 0x65, 0x24, 0xdc, 0x4a, 0x65, 0x47, - 0x8e, 0xdc, 0x2f, 0xa2, 0x8a, 0x20, 0xaa, 0xb0, 0x3d, 0xf8, 0x08, 0x9a, 0xa9, 0xd7, 0x7f, 0x10, - 0x98, 0xfe, 0x5a, 0x82, 0x76, 0x9e, 0xe8, 0xe4, 0xe0, 0xf1, 0xf8, 0x18, 0x07, 0x57, 0x2c, 0xd9, - 0x94, 0x25, 0x02, 0x67, 0x3e, 0x7b, 0x45, 0xa7, 0x9e, 0x9a, 0xa0, 0x61, 0x65, 0x02, 0xa9, 0x75, - 0x7d, 0x9b, 0xb3, 0x79, 0x82, 0xaa, 0x8a, 0x95, 0x09, 0xc8, 0xc7, 0x00, 0x6e, 0x14, 0xc5, 0x4c, - 0xdd, 0xdc, 0x06, 0xd2, 0xc0, 0x60, 0xa4, 0xea, 0xc5, 0x51, 0x52, 0x2f, 0x8e, 0xc6, 0x49, 0xbd, - 0x68, 0x35, 0xd1, 0x1a, 0xaf, 0x74, 0x1b, 0x6a, 0xf2, 0x82, 0xc6, 0xc7, 0x88, 0xbc, 0x8a, 0xa5, - 0x7b, 0xe6, 0x9f, 0xa1, 0xa6, 0x2a, 0x8b, 0xff, 0x29, 0x79, 0xdf, 0x86, 0x86, 0x9a, 0xdb, 0x75, - 0x74, 0xac, 0xd4, 0xb1, 0x7f, 0xe4, 0x98, 0xdf, 0x95, 0xa1, 0x61, 0xb1, 0x28, 0x0c, 0xfc, 0x88, - 0xe5, 0x2a, 0x9f, 0xd2, 0x6b, 0x2b, 0x9f, 0xf2, 0xda, 0xca, 0x27, 0xa9, 0xa7, 0x2a, 0xb9, 0x7a, - 0x6a, 0x00, 0x0d, 0xce, 0x1c, 0x97, 0x33, 0x5b, 0xe8, 0xda, 0x2b, 0xed, 0x4b, 0xdd, 0x2b, 0xca, - 0x65, 0xca, 0x8e, 0x30, 0x2f, 0x34, 0xad, 0xb4, 0x4f, 0x9e, 0xe4, 0x0b, 0x06, 0x55, 0x8a, 0x6d, - 0xa9, 0x82, 0x41, 0x6d, 0x77, 0x4d, 0xc5, 0xf0, 0x34, 0x2b, 0xbc, 0xea, 0x18, 0xcd, 0xb7, 0xf3, - 0x03, 0xd6, 0x57, 0x5e, 0x3f, 0x5a, 0x1e, 0xfe, 0xae, 0x0c, 0x9b, 0xcb, 0x7b, 0x5b, 0x83, 0xc0, - 0x2d, 0xa8, 0xaa, 0x7c, 0xa6, 0xe1, 0x2b, 0x56, 0x32, 0x59, 0x65, 0x89, 0xe8, 0x7e, 0xb5, 0x4c, - 0x1a, 0xaf, 0x87, 0x5e, 0x91, 0x50, 0xde, 0x87, 0x4d, 0xe9, 0xa2, 0x90, 0x39, 0x59, 0x8d, 0xa6, - 0x18, 0xb0, 0xa7, 0xe5, 0x69, 0x95, 0xf6, 0x10, 0xfa, 0x89, 0x69, 0xc6, 0x0d, 0xb5, 0x82, 0xed, - 0x61, 0x42, 0x11, 0xdb, 0x50, 0x3b, 0x0f, 0xf8, 0x9c, 0x0a, 0x4d, 0x82, 0xba, 0x57, 0x20, 0x39, - 0x64, 0xdb, 0x86, 0xc2, 0x64, 0x22, 0x94, 0xef, 0x10, 0x49, 0x3e, 0xe9, 0x1b, 0x01, 0x59, 0xb0, - 0x61, 0x35, 0x92, 0xb7, 0x81, 0xf9, 0x5b, 0xe8, 0x2d, 0x95, 0x85, 0x6b, 0x1c, 0x99, 0x2d, 0x5f, - 0x2e, 0x2c, 0x5f, 0x98, 0xb9, 0xb2, 0x34, 0xf3, 0xef, 0xa0, 0xff, 0x05, 0xf5, 0x1d, 0x8f, 0xe9, - 0xf9, 0xf7, 0xf9, 0x2c, 0x92, 0x09, 0x4e, 0xbf, 0x52, 0x26, 0x3a, 0xfb, 0x74, 0xac, 0xa6, 0x96, - 0x1c, 0x39, 0xe4, 0x1e, 0xd4, 0xb9, 0xb2, 0xd6, 0x00, 0x68, 0xe5, 0xea, 0x56, 0x2b, 0xd1, 0x99, - 0xdf, 0x02, 0x29, 0x4c, 0x2d, 0x1f, 0x28, 0x0b, 0xb2, 0x23, 0xd1, 0xaf, 0x40, 0xa1, 0xa3, 0xaa, - 0x9d, 0xc7, 0xa4, 0x95, 0x6a, 0xc9, 0x10, 0x2a, 0x8c, 0x73, 0xbd, 0x04, 0x16, 0x8e, 0xd9, 0x73, - 0xd0, 0x92, 0x2a, 0xf3, 0x67, 0xd0, 0x3f, 0x0b, 0x99, 0xed, 0x52, 0x0f, 0x9f, 0x72, 0x6a, 0x81, - 0xbb, 0x50, 0x95, 0x4e, 0x4e, 0x08, 0xa3, 0x89, 0x03, 0x51, 0xad, 0xe4, 0xe6, 0xb7, 0x60, 0xa8, - 0x7d, 0x1d, 0x5e, 0xbb, 0x91, 0x60, 0xbe, 0xcd, 0x0e, 0x2e, 0x98, 0x7d, 0xf9, 0x23, 0x9e, 0xfc, - 0x0a, 0x6e, 0xaf, 0x5b, 0x21, 0xd9, 0x5f, 0xcb, 0x96, 0xbd, 0xc9, 0xb9, 0xcc, 0x1d, 0xb8, 0x46, - 0xc3, 0x02, 0x14, 0x7d, 0x2e, 0x25, 0xf2, 0x1e, 0x99, 0x1c, 0x17, 0x69, 0x3e, 0xd6, 0xbd, 0xc4, - 0x1f, 0x95, 0x9b, 0xfd, 0xf1, 0xb7, 0x12, 0x34, 0xcf, 0x98, 0x88, 0x43, 0x3c, 0xcb, 0xdb, 0xd0, - 0x9c, 0xf2, 0xe0, 0x92, 0xf1, 0xec, 0x28, 0x0d, 0x25, 0x38, 0x72, 0xc8, 0x13, 0xa8, 0x1d, 0x04, - 0xfe, 0xb9, 0x3b, 0xc3, 0x87, 0xad, 0x26, 0x86, 0x74, 0xec, 0x48, 0xe9, 0x14, 0x31, 0x68, 0x43, - 0x32, 0x84, 0x96, 0xfe, 0x3c, 0xf0, 0xf2, 0xe5, 0xd1, 0xf3, 0xa4, 0xe2, 0xcd, 0x89, 0x06, 0x1f, - 0x43, 0x2b, 0x37, 0xf0, 0x07, 0xa5, 0xaa, 0xff, 0x07, 0xc0, 0xd5, 0x95, 0x8f, 0x36, 0xd5, 0x51, - 0xf5, 0x48, 0x79, 0xb4, 0xbb, 0xd0, 0x94, 0xc5, 0x95, 0x52, 0x27, 0x49, 0xb2, 0x94, 0x25, 0x49, - 0xf3, 0x1e, 0xf4, 0x8f, 0xfc, 0x2b, 0xea, 0xb9, 0x0e, 0x15, 0xec, 0x4b, 0xb6, 0x40, 0x17, 0xac, - 0xec, 0xc0, 0x3c, 0x83, 0xb6, 0x7e, 0x69, 0xbf, 0xd1, 0x1e, 0xdb, 0x7a, 0x8f, 0xdf, 0x1f, 0x44, - 0xef, 0x43, 0x4f, 0x4f, 0x7a, 0xec, 0xea, 0x10, 0x92, 0x35, 0x06, 0x67, 0xe7, 0xee, 0xb5, 0x9e, - 0x5a, 0xf7, 0xcc, 0x67, 0xb0, 0x99, 0x33, 0x4d, 0x8f, 0x73, 0xc9, 0x16, 0x51, 0xf2, 0x05, 0x42, - 0xb6, 0x13, 0x0f, 0x94, 0x33, 0x0f, 0x98, 0xd0, 0xd5, 0x23, 0x5f, 0x30, 0x71, 0xc3, 0xe9, 0xbe, - 0x4c, 0x37, 0xf2, 0x82, 0xe9, 0xc9, 0xef, 0x43, 0x95, 0xc9, 0x93, 0xe6, 0xf3, 0x67, 0xde, 0x03, - 0x96, 0x52, 0xaf, 0x59, 0xf0, 0x59, 0xba, 0xe0, 0x69, 0xac, 0x16, 0x7c, 0xc3, 0xb9, 0xcc, 0xf7, - 0xd2, 0x6d, 0x9c, 0xc6, 0xe2, 0xa6, 0x1b, 0xbd, 0x07, 0x7d, 0x6d, 0xf4, 0x9c, 0x79, 0x4c, 0xb0, - 0x1b, 0x8e, 0x74, 0x1f, 0x48, 0xc1, 0xec, 0xa6, 0xe9, 0xee, 0x40, 0x63, 0x3c, 0x3e, 0x4e, 0xb5, - 0x45, 0x6e, 0x34, 0x3f, 0x81, 0xfe, 0x59, 0xec, 0x04, 0xa7, 0xdc, 0xbd, 0x72, 0x3d, 0x36, 0x53, - 0x8b, 0x25, 0xc5, 0x6f, 0x29, 0x57, 0xfc, 0xae, 0xcd, 0x46, 0xe6, 0x0e, 0x90, 0xc2, 0xf0, 0xf4, - 0xde, 0xa2, 0xd8, 0x09, 0x74, 0x08, 0x63, 0xdb, 0xdc, 0x81, 0xf6, 0x98, 0xca, 0x62, 0xc3, 0x51, - 0x36, 0x06, 0xd4, 0x85, 0xea, 0x6b, 0xb3, 0xa4, 0x6b, 0xee, 0xc1, 0xd6, 0x01, 0xb5, 0x2f, 0x5c, - 0x7f, 0xf6, 0xdc, 0x8d, 0x64, 0xb5, 0xa5, 0x47, 0x0c, 0xa0, 0xe1, 0x68, 0x81, 0x1e, 0x92, 0xf6, - 0xcd, 0xc7, 0xf0, 0x56, 0xee, 0x33, 0xcf, 0x99, 0xa0, 0x89, 0x3f, 0xb6, 0xa0, 0x1a, 0xc9, 0x1e, - 0x8e, 0xa8, 0x5a, 0xaa, 0x63, 0x7e, 0x05, 0x5b, 0xf9, 0x04, 0x2c, 0x6b, 0x9f, 0xe4, 0xe0, 0x58, - 0x95, 0x94, 0x72, 0x55, 0x89, 0xf6, 0x59, 0x39, 0xcb, 0x27, 0x9b, 0x50, 0xf9, 0xf5, 0x37, 0x63, - 0x0d, 0x76, 0xd9, 0x34, 0xff, 0x28, 0x97, 0x2f, 0xce, 0xa7, 0x96, 0x2f, 0x94, 0x26, 0xa5, 0x37, - 0x2a, 0x4d, 0x56, 0xf1, 0xf6, 0x18, 0xfa, 0x27, 0x5e, 0x60, 0x5f, 0x1e, 0xfa, 0x39, 0x6f, 0x18, - 0x50, 0x67, 0x7e, 0xde, 0x19, 0x49, 0xd7, 0x7c, 0x00, 0xbd, 0xe3, 0xc0, 0xa6, 0xde, 0x49, 0x10, - 0xfb, 0x22, 0xf5, 0x02, 0x7e, 0x77, 0xd3, 0xa6, 0xaa, 0x63, 0x3e, 0x86, 0xae, 0x4e, 0xd1, 0xfe, - 0x79, 0x90, 0x30, 0x63, 0x96, 0xcc, 0x4b, 0xc5, 0x42, 0xdf, 0x3c, 0x86, 0x5e, 0x66, 0xae, 0xe6, - 0x7d, 0x00, 0x35, 0xa5, 0xd6, 0x67, 0xeb, 0xa5, 0xaf, 0x57, 0x65, 0x69, 0x69, 0xf5, 0x9a, 0x43, - 0xcd, 0xa1, 0x7b, 0x8a, 0xdf, 0x3f, 0x0f, 0xfd, 0x2b, 0x35, 0xd9, 0x11, 0x10, 0xf5, 0x45, 0x74, - 0xc2, 0xfc, 0x2b, 0x97, 0x07, 0x3e, 0x16, 0xd7, 0x25, 0x5d, 0xc2, 0x24, 0x13, 0xa7, 0x83, 0x12, - 0x0b, 0xab, 0x1f, 0x2e, 0x8b, 0xd6, 0xfa, 0x10, 0xb2, 0xaf, 0x2b, 0x32, 0xd5, 0x70, 0x36, 0x0f, - 0x04, 0x9b, 0x50, 0xc7, 0x49, 0xa2, 0x05, 0x94, 0x68, 0xdf, 0x71, 0xf8, 0xde, 0x7f, 0xca, 0x50, - 0xff, 0x4c, 0x11, 0x38, 0xf9, 0x14, 0x3a, 0x85, 0x74, 0x4d, 0xde, 0xc2, 0xb2, 0x6e, 0xb9, 0x38, - 0x18, 0x6c, 0xaf, 0x88, 0xd5, 0xb9, 0x3e, 0x80, 0x76, 0x3e, 0x19, 0x13, 0x4c, 0xbc, 0xf8, 0xad, - 0x77, 0x80, 0x33, 0xad, 0x66, 0xea, 0x33, 0xd8, 0x5a, 0x97, 0x26, 0xc9, 0x9d, 0x6c, 0x85, 0xd5, - 0x14, 0x3d, 0x78, 0xe7, 0x26, 0x6d, 0x92, 0x5e, 0xeb, 0x07, 0x1e, 0xa3, 0x7e, 0x1c, 0xe6, 0x77, - 0x90, 0x35, 0xc9, 0x13, 0xe8, 0x14, 0x12, 0x85, 0x3a, 0xe7, 0x4a, 0xee, 0xc8, 0x0f, 0xb9, 0x0f, - 0x55, 0x4c, 0x4e, 0xa4, 0x53, 0xc8, 0x92, 0x83, 0x6e, 0xda, 0x55, 0x6b, 0x0f, 0x61, 0x03, 0xbf, - 0x00, 0xe6, 0x16, 0xc6, 0x11, 0x69, 0xe6, 0xda, 0xfb, 0x77, 0x09, 0xea, 0xc9, 0x57, 0xe1, 0x27, - 0xb0, 0x21, 0x73, 0x00, 0xb9, 0x95, 0xa3, 0xd1, 0x24, 0x7f, 0x0c, 0xb6, 0x96, 0x84, 0x6a, 0x81, - 0x11, 0x54, 0x5e, 0x30, 0x41, 0x48, 0x4e, 0xa9, 0x93, 0xc1, 0xe0, 0x56, 0x51, 0x96, 0xda, 0x9f, - 0xc6, 0x45, 0x7b, 0xcd, 0xe5, 0x05, 0xfb, 0x94, 0xa5, 0x3f, 0x82, 0x9a, 0x62, 0x59, 0xe5, 0x94, - 0x15, 0x7e, 0x56, 0x97, 0xbf, 0xca, 0xc7, 0x7b, 0xff, 0xdc, 0x00, 0x38, 0x5b, 0x44, 0x82, 0xcd, - 0x7f, 0xe3, 0xb2, 0x57, 0xe4, 0x21, 0xf4, 0x9e, 0xb3, 0x73, 0x1a, 0x7b, 0x02, 0x9f, 0x6a, 0x92, - 0x4d, 0x72, 0x3e, 0xc1, 0x82, 0x2f, 0x25, 0xeb, 0xfb, 0xd0, 0x3a, 0xa1, 0xd7, 0xaf, 0xb7, 0xfb, - 0x14, 0x3a, 0x05, 0x0e, 0xd6, 0x5b, 0x5c, 0x66, 0x75, 0xbd, 0xc5, 0x55, 0xb6, 0xbe, 0x0f, 0x75, - 0xcd, 0xcc, 0xf9, 0x35, 0x30, 0x87, 0x15, 0x18, 0xfb, 0xe7, 0xd0, 0x5b, 0xe2, 0xe5, 0xbc, 0x3d, - 0x7e, 0x0e, 0x59, 0xcb, 0xdb, 0xcf, 0xe4, 0x6b, 0xa7, 0xc8, 0xcd, 0xf9, 0x81, 0xfa, 0xe5, 0xb5, - 0x8e, 0xbc, 0x5f, 0x14, 0xdf, 0x49, 0xf8, 0x44, 0x35, 0x96, 0xe9, 0x33, 0x21, 0xef, 0xc1, 0xed, - 0x75, 0x9a, 0x34, 0x04, 0xf3, 0x0c, 0xba, 0x12, 0x82, 0xab, 0xf4, 0xfa, 0x08, 0x20, 0x23, 0xd1, - 0xbc, 0x3d, 0xc2, 0x63, 0x99, 0x5f, 0x3f, 0x04, 0xc8, 0xa8, 0x51, 0xa1, 0xaa, 0xc8, 0xac, 0x6a, - 0xd8, 0x32, 0x7d, 0x3e, 0x84, 0x66, 0x4a, 0x67, 0xf9, 0x35, 0x70, 0x82, 0x22, 0x3b, 0x7e, 0x36, - 0xfa, 0xfd, 0xa3, 0x99, 0x2b, 0x2e, 0xe2, 0xe9, 0xc8, 0x0e, 0xe6, 0xbb, 0x17, 0x34, 0xba, 0x70, - 0xed, 0x80, 0x87, 0xbb, 0x57, 0x12, 0x4c, 0xbb, 0x2b, 0x3f, 0xac, 0xa6, 0x35, 0x7c, 0xec, 0x3d, - 0xfd, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x84, 0x79, 0x37, 0x3d, 0xcc, 0x1a, 0x00, 0x00, + 0xe7, 0xeb, 0xaf, 0x7b, 0x76, 0xe1, 0x6e, 0xe4, 0x5c, 0xee, 0x86, 0x5e, 0x3c, 0x77, 0xfd, 0xdd, + 0x70, 0xb6, 0x3b, 0xa3, 0xf6, 0x25, 0xf3, 0x9d, 0x71, 0xc8, 0x03, 0x11, 0x90, 0x72, 0x38, 0x1b, + 0xdc, 0x9f, 0x07, 0xc1, 0xdc, 0x63, 0xbb, 0x28, 0x99, 0xc5, 0xe7, 0xbb, 0xc2, 0x5d, 0xb0, 0x48, + 0xd0, 0x45, 0xa8, 0x8c, 0x06, 0x03, 0x39, 0x83, 0x17, 0xcc, 0x5d, 0x9b, 0x7a, 0xbb, 0xae, 0xc3, + 0x7c, 0xe1, 0x8a, 0xa5, 0xd6, 0x19, 0x79, 0x9d, 0x5a, 0x45, 0x69, 0xcc, 0x3a, 0x54, 0x0f, 0x17, + 0xa1, 0x58, 0x9a, 0x43, 0xa8, 0x7d, 0xc1, 0xa8, 0xc3, 0x38, 0xb9, 0x0d, 0xb5, 0x0b, 0x6c, 0x19, + 0xa5, 0x61, 0x65, 0xd4, 0xb4, 0x74, 0xcf, 0xfc, 0x03, 0xc0, 0xa9, 0x1c, 0x73, 0xc8, 0x79, 0xc0, + 0xc9, 0x1d, 0x68, 0x30, 0xce, 0xa7, 0x62, 0x19, 0x32, 0xa3, 0x34, 0x2c, 0x8d, 0x3a, 0x56, 0x9d, + 0x71, 0x3e, 0x59, 0x86, 0x8c, 0xfc, 0x1f, 0xc8, 0xe6, 0x74, 0x11, 0xcd, 0x8d, 0xf2, 0xb0, 0x24, + 0x67, 0x60, 0x9c, 0x9f, 0x44, 0xf3, 0x64, 0x8c, 0x1d, 0x38, 0xcc, 0xa8, 0x0c, 0x4b, 0xa3, 0x0a, + 0x8e, 0x39, 0x08, 0x1c, 0x66, 0xfe, 0xa5, 0x04, 0xd5, 0x53, 0x2a, 0x2e, 0x22, 0x42, 0x60, 0x8b, + 0x07, 0x81, 0xd0, 0x8b, 0x63, 0x9b, 0x8c, 0xa0, 0x17, 0xfb, 0x34, 0x16, 0x17, 0xf2, 0x54, 0x36, + 0x15, 0xcc, 0x31, 0xca, 0xa8, 0x5e, 0x15, 0x93, 0xb7, 0xa1, 0xe3, 0x05, 0x36, 0xf5, 0xa6, 0x91, + 0x08, 0x38, 0x9d, 0xcb, 0x75, 0xa4, 0x5d, 0x1b, 0x85, 0x67, 0x4a, 0x46, 0x1e, 0x41, 0x3f, 0x62, + 0xd4, 0x9b, 0xbe, 0xe4, 0x34, 0x4c, 0x0d, 0xb7, 0xd4, 0x84, 0x52, 0xf1, 0x0d, 0xa7, 0xa1, 0xb6, + 0x35, 0xff, 0x51, 0x83, 0xba, 0xc5, 0xfe, 0x14, 0xb3, 0x48, 0x90, 0x2e, 0x94, 0x5d, 0x07, 0x4f, + 0xdb, 0xb4, 0xca, 0xae, 0x43, 0xc6, 0x40, 0x2c, 0x16, 0x7a, 0x72, 0x69, 0x37, 0xf0, 0x0f, 0xbc, + 0x38, 0x12, 0x8c, 0xeb, 0x33, 0x6f, 0xd0, 0x90, 0x7b, 0xd0, 0x0c, 0x42, 0xc6, 0x51, 0x86, 0x0e, + 0x68, 0x5a, 0x99, 0x40, 0x1e, 0x3c, 0xa4, 0xe2, 0xc2, 0xd8, 0x42, 0x05, 0xb6, 0xa5, 0xcc, 0xa1, + 0x82, 0x1a, 0x55, 0x25, 0x93, 0x6d, 0x62, 0x42, 0x2d, 0x62, 0x36, 0x67, 0xc2, 0xa8, 0x0d, 0x4b, + 0xa3, 0xd6, 0x1e, 0x8c, 0xc3, 0xd9, 0xf8, 0x0c, 0x25, 0x96, 0xd6, 0x90, 0x7b, 0xb0, 0x25, 0xfd, + 0x62, 0xd4, 0xd1, 0xa2, 0x21, 0x2d, 0xf6, 0x63, 0x71, 0x61, 0xa1, 0x94, 0xec, 0x41, 0x5d, 0xdd, + 0x69, 0x64, 0x34, 0x86, 0x95, 0x51, 0x6b, 0xcf, 0x90, 0x06, 0xfa, 0x94, 0x63, 0x05, 0x83, 0xe8, + 0xd0, 0x17, 0x7c, 0x69, 0x25, 0x86, 0xe4, 0x2d, 0x68, 0xdb, 0x9e, 0xcb, 0x7c, 0x31, 0x15, 0xc1, + 0x25, 0xf3, 0x8d, 0x26, 0xee, 0xa8, 0xa5, 0x64, 0x13, 0x29, 0x22, 0x7b, 0xf0, 0x46, 0xde, 0x64, + 0x4a, 0x6d, 0x9b, 0x45, 0x51, 0xc0, 0x0d, 0x40, 0xdb, 0x5b, 0x39, 0xdb, 0x7d, 0xad, 0x92, 0xd3, + 0x3a, 0x6e, 0x14, 0x7a, 0x74, 0x39, 0xf5, 0xe9, 0x82, 0x19, 0x2d, 0x35, 0xad, 0x96, 0x7d, 0x45, + 0x17, 0x8c, 0xdc, 0x87, 0xd6, 0x22, 0x88, 0x7d, 0x31, 0x0d, 0x03, 0xd7, 0x17, 0x46, 0x1b, 0x2d, + 0x00, 0x45, 0xa7, 0x52, 0x42, 0xde, 0x04, 0xd5, 0x53, 0x60, 0xec, 0x28, 0xbf, 0xa2, 0x04, 0xe1, + 0xf8, 0x00, 0xba, 0x4a, 0x9d, 0xee, 0xa7, 0x8b, 0x26, 0x1d, 0x94, 0xa6, 0x3b, 0xf9, 0x00, 0x9a, + 0x88, 0x07, 0xd7, 0x3f, 0x0f, 0x8c, 0x1e, 0xfa, 0xed, 0x56, 0xce, 0x2d, 0x12, 0x13, 0x47, 0xfe, + 0x79, 0x60, 0x35, 0x5e, 0xea, 0x16, 0xf9, 0x04, 0xee, 0x16, 0xce, 0xcb, 0xd9, 0x82, 0xba, 0xbe, + 0xeb, 0xcf, 0xa7, 0x71, 0xc4, 0x22, 0x63, 0x1b, 0x11, 0x6e, 0xe4, 0x4e, 0x6d, 0x25, 0x06, 0x2f, + 0x22, 0x16, 0x91, 0xbb, 0xd0, 0x54, 0x41, 0x3a, 0x75, 0x1d, 0xa3, 0x8f, 0x5b, 0x6a, 0x28, 0xc1, + 0x91, 0x43, 0xde, 0x81, 0x5e, 0x18, 0x78, 0xae, 0xbd, 0x9c, 0x06, 0x57, 0x8c, 0x73, 0xd7, 0x61, + 0x06, 0x19, 0x96, 0x46, 0x0d, 0xab, 0xab, 0xc4, 0x5f, 0x6b, 0xe9, 0xa6, 0xd0, 0xb8, 0x85, 0x86, + 0x6b, 0xa1, 0x31, 0x06, 0xb0, 0x03, 0xdf, 0x67, 0x36, 0xc2, 0x6f, 0x07, 0x4f, 0xd8, 0x95, 0x27, + 0x3c, 0x48, 0xa5, 0x56, 0xce, 0x62, 0xf0, 0x39, 0xb4, 0xf3, 0x50, 0x20, 0xdb, 0x50, 0xb9, 0x64, + 0x4b, 0x0d, 0x7f, 0xd9, 0x24, 0x43, 0xa8, 0x5e, 0x51, 0x2f, 0x66, 0x08, 0x79, 0x0d, 0x44, 0x35, + 0xc4, 0x52, 0x8a, 0x5f, 0x94, 0x9f, 0x96, 0xcc, 0xbf, 0x57, 0x61, 0x4b, 0x82, 0x8f, 0x7c, 0x08, + 0x1d, 0x8f, 0xd1, 0x88, 0x4d, 0x83, 0x50, 0x2e, 0x10, 0xe1, 0x54, 0xad, 0xbd, 0x6d, 0x39, 0xec, + 0x58, 0x2a, 0xbe, 0x56, 0x72, 0xab, 0xed, 0xe5, 0x7a, 0x32, 0xa4, 0x5d, 0x5f, 0x30, 0xee, 0x53, + 0x6f, 0x8a, 0xc1, 0xa0, 0x02, 0xac, 0x9d, 0x08, 0x9f, 0xc9, 0xa0, 0x58, 0xc5, 0x51, 0x65, 0x1d, + 0x47, 0x03, 0x68, 0xa0, 0xef, 0x5c, 0x16, 0xe9, 0x60, 0x4f, 0xfb, 0x64, 0x0f, 0x1a, 0x0b, 0x26, + 0xa8, 0x8e, 0x35, 0x19, 0x12, 0xb7, 0x93, 0x98, 0x19, 0x9f, 0x68, 0x85, 0x0a, 0x88, 0xd4, 0x6e, + 0x2d, 0x22, 0x6a, 0xeb, 0x11, 0x31, 0x80, 0x46, 0x0a, 0xba, 0xba, 0xba, 0xe1, 0xa4, 0x2f, 0x69, + 0x36, 0x64, 0xdc, 0x0d, 0x1c, 0xa3, 0x81, 0x40, 0xd1, 0x3d, 0x49, 0x92, 0x7e, 0xbc, 0x50, 0x10, + 0x6a, 0x2a, 0x92, 0xf4, 0xe3, 0xc5, 0x3a, 0x62, 0x60, 0x05, 0x31, 0x3f, 0x81, 0x2a, 0xf5, 0x5c, + 0x1a, 0x61, 0x08, 0xc9, 0x9b, 0xd5, 0x7c, 0x3f, 0xde, 0x97, 0x52, 0x4b, 0x29, 0xc9, 0x13, 0xe8, + 0xcc, 0x79, 0x10, 0x87, 0x53, 0xec, 0xb2, 0xc8, 0x68, 0xe3, 0x69, 0x57, 0xad, 0xdb, 0x68, 0xb4, + 0xaf, 0x6c, 0x64, 0x04, 0xce, 0x82, 0xd8, 0x77, 0xa6, 0xb6, 0xeb, 0xf0, 0xc8, 0xe8, 0xa0, 0xf3, + 0x00, 0x45, 0x07, 0x52, 0x22, 0x43, 0x4c, 0x85, 0x40, 0xea, 0xe0, 0x2e, 0xda, 0x74, 0x50, 0x7a, + 0x9a, 0x78, 0xf9, 0xa7, 0xd0, 0x4f, 0x12, 0x53, 0x66, 0xd9, 0x43, 0xcb, 0xed, 0x44, 0x91, 0x1a, + 0x8f, 0x60, 0x9b, 0x5d, 0x4b, 0x0a, 0x75, 0xc5, 0x74, 0x41, 0xaf, 0xa7, 0x42, 0x78, 0x3a, 0xa4, + 0xba, 0x89, 0xfc, 0x84, 0x5e, 0x4f, 0x84, 0x27, 0xe3, 0x5f, 0xad, 0x8e, 0xf1, 0xdf, 0xc7, 0x64, + 0xd4, 0x44, 0x89, 0x8c, 0xff, 0xc1, 0x2f, 0xa1, 0x53, 0xb8, 0xc2, 0x0d, 0x40, 0xde, 0xc9, 0x03, + 0xb9, 0x99, 0x07, 0xef, 0xbf, 0xb6, 0x00, 0xf0, 0x2e, 0xd5, 0xd0, 0xd5, 0x0c, 0x90, 0xbf, 0xe0, + 0xf2, 0x86, 0x0b, 0xa6, 0x9c, 0xf9, 0x42, 0x83, 0x51, 0xf7, 0xbe, 0x17, 0x87, 0x49, 0x0e, 0xa8, + 0xe6, 0x72, 0xc0, 0x7b, 0xb0, 0x25, 0x31, 0x67, 0xd4, 0x32, 0xaa, 0xce, 0x76, 0x84, 0xe8, 0x54, + 0xc8, 0x44, 0xab, 0xb5, 0x40, 0xa8, 0xaf, 0x07, 0x42, 0x1e, 0x61, 0x8d, 0x22, 0xc2, 0xde, 0x86, + 0x8e, 0xcd, 0x19, 0xe6, 0xa3, 0xa9, 0x2c, 0x30, 0x34, 0x02, 0xdb, 0x89, 0x70, 0xe2, 0x2e, 0x98, + 0xf4, 0x9f, 0xbc, 0x0c, 0x40, 0x95, 0x6c, 0x6e, 0xbc, 0xab, 0xd6, 0xc6, 0xbb, 0xc2, 0xec, 0xee, + 0x31, 0xcd, 0xe2, 0xd8, 0xce, 0x45, 0x42, 0xa7, 0x10, 0x09, 0x05, 0xb8, 0x77, 0x57, 0xe0, 0xbe, + 0x82, 0xc9, 0xde, 0x1a, 0x26, 0xdf, 0x82, 0xb6, 0x74, 0x40, 0x14, 0x52, 0x9b, 0xc9, 0x09, 0xb6, + 0x95, 0x23, 0x52, 0xd9, 0x91, 0x83, 0x11, 0x1c, 0xcf, 0x66, 0xcb, 0x8b, 0xc0, 0x63, 0x19, 0x09, + 0xb7, 0x52, 0xd9, 0x91, 0x23, 0xf7, 0x8b, 0xa8, 0x22, 0x88, 0x2a, 0x6c, 0x0f, 0x3e, 0x82, 0x66, + 0xea, 0xf5, 0x1f, 0x04, 0xa6, 0xbf, 0x96, 0xa0, 0x9d, 0x27, 0x3a, 0x39, 0x78, 0x32, 0x39, 0xc6, + 0xc1, 0x15, 0x4b, 0x36, 0x65, 0x89, 0xc0, 0x99, 0xcf, 0x5e, 0xd2, 0x99, 0xa7, 0x26, 0x68, 0x58, + 0x99, 0x40, 0x6a, 0x5d, 0xdf, 0xe6, 0x6c, 0x91, 0xa0, 0xaa, 0x62, 0x65, 0x02, 0xf2, 0x31, 0x80, + 0x1b, 0x45, 0x31, 0x53, 0x37, 0xb7, 0x85, 0x34, 0x30, 0x18, 0xab, 0xba, 0x71, 0x9c, 0xd4, 0x8d, + 0xe3, 0x49, 0x52, 0x37, 0x5a, 0x4d, 0xb4, 0xc6, 0x2b, 0xbd, 0x0d, 0x35, 0x79, 0x41, 0x93, 0x63, + 0x44, 0x5e, 0xc5, 0xd2, 0x3d, 0xf3, 0xcf, 0x50, 0x53, 0x95, 0xc5, 0xff, 0x94, 0xbc, 0xef, 0x40, + 0x43, 0xcd, 0xed, 0x3a, 0x3a, 0x56, 0xea, 0xd8, 0x3f, 0x72, 0xcc, 0xef, 0xca, 0xd0, 0xb0, 0x58, + 0x14, 0x06, 0x7e, 0xc4, 0x72, 0x95, 0x4f, 0xe9, 0x95, 0x95, 0x4f, 0x79, 0x63, 0xe5, 0x93, 0xd4, + 0x53, 0x95, 0x5c, 0x3d, 0x35, 0x80, 0x06, 0x67, 0x8e, 0xcb, 0x99, 0x2d, 0x74, 0xed, 0x95, 0xf6, + 0xa5, 0xee, 0x25, 0xe5, 0x32, 0x65, 0x47, 0x98, 0x17, 0x9a, 0x56, 0xda, 0x27, 0x8f, 0xf3, 0x05, + 0x83, 0x2a, 0xc5, 0x76, 0x54, 0xc1, 0xa0, 0xb6, 0xbb, 0xa1, 0x62, 0x78, 0x92, 0x15, 0x5e, 0x75, + 0x8c, 0xe6, 0x3b, 0xf9, 0x01, 0x9b, 0x2b, 0xaf, 0x1f, 0x2d, 0x0f, 0x7f, 0x57, 0x86, 0xed, 0xd5, + 0xbd, 0x6d, 0x40, 0xe0, 0x0e, 0x54, 0x55, 0x3e, 0xd3, 0xf0, 0x15, 0x6b, 0x99, 0xac, 0xb2, 0x42, + 0x74, 0xbf, 0x5a, 0x25, 0x8d, 0x57, 0x43, 0xaf, 0x48, 0x28, 0xef, 0xc2, 0xb6, 0x74, 0x51, 0xc8, + 0x9c, 0xac, 0x46, 0x53, 0x0c, 0xd8, 0xd3, 0xf2, 0xb4, 0x4a, 0x7b, 0x04, 0xfd, 0xc4, 0x34, 0xe3, + 0x86, 0x5a, 0xc1, 0xf6, 0x30, 0xa1, 0x88, 0xdb, 0x50, 0x3b, 0x0f, 0xf8, 0x82, 0x0a, 0x4d, 0x82, + 0xba, 0x57, 0x20, 0x39, 0x64, 0xdb, 0x86, 0xc2, 0x64, 0x22, 0x94, 0xef, 0x10, 0x49, 0x3e, 0xe9, + 0x1b, 0x01, 0x59, 0xb0, 0x61, 0x35, 0x92, 0xb7, 0x81, 0xf9, 0x5b, 0xe8, 0xad, 0x94, 0x85, 0x1b, + 0x1c, 0x99, 0x2d, 0x5f, 0x2e, 0x2c, 0x5f, 0x98, 0xb9, 0xb2, 0x32, 0xf3, 0xef, 0xa0, 0xff, 0x05, + 0xf5, 0x1d, 0x8f, 0xe9, 0xf9, 0xf7, 0xf9, 0x3c, 0x92, 0x09, 0x4e, 0xbf, 0x52, 0xa6, 0x3a, 0xfb, + 0x74, 0xac, 0xa6, 0x96, 0x1c, 0x39, 0xe4, 0x01, 0xd4, 0xb9, 0xb2, 0xd6, 0x00, 0x68, 0xe5, 0xea, + 0x56, 0x2b, 0xd1, 0x99, 0xdf, 0x02, 0x29, 0x4c, 0x2d, 0x1f, 0x28, 0x4b, 0x32, 0x92, 0xe8, 0x57, + 0xa0, 0xd0, 0x51, 0xd5, 0xce, 0x63, 0xd2, 0x4a, 0xb5, 0x64, 0x08, 0x15, 0xc6, 0xb9, 0x5e, 0x02, + 0x0b, 0xc7, 0xec, 0x39, 0x68, 0x49, 0x95, 0xf9, 0x33, 0xe8, 0x9f, 0x85, 0xcc, 0x76, 0xa9, 0x87, + 0x4f, 0x39, 0xb5, 0xc0, 0x7d, 0xa8, 0x4a, 0x27, 0x27, 0x84, 0xd1, 0xc4, 0x81, 0xa8, 0x56, 0x72, + 0xf3, 0x5b, 0x30, 0xd4, 0xbe, 0x0e, 0xaf, 0xdd, 0x48, 0x30, 0xdf, 0x66, 0x07, 0x17, 0xcc, 0xbe, + 0xfc, 0x11, 0x4f, 0x7e, 0x05, 0x77, 0x36, 0xad, 0x90, 0xec, 0xaf, 0x65, 0xcb, 0xde, 0xf4, 0x5c, + 0xe6, 0x0e, 0x5c, 0xa3, 0x61, 0x01, 0x8a, 0x3e, 0x97, 0x12, 0x79, 0x8f, 0x4c, 0x8e, 0x8b, 0x34, + 0x1f, 0xeb, 0x5e, 0xe2, 0x8f, 0xca, 0xcd, 0xfe, 0xf8, 0x5b, 0x09, 0x9a, 0x67, 0x4c, 0xc4, 0x21, + 0x9e, 0xe5, 0x2e, 0x34, 0x67, 0x3c, 0xb8, 0x64, 0x3c, 0x3b, 0x4a, 0x43, 0x09, 0x8e, 0x1c, 0xf2, + 0x18, 0x6a, 0x07, 0x81, 0x7f, 0xee, 0xce, 0xf1, 0x61, 0xab, 0x89, 0x21, 0x1d, 0x3b, 0x56, 0x3a, + 0x45, 0x0c, 0xda, 0x90, 0x0c, 0xa1, 0xa5, 0x3f, 0x13, 0xbc, 0x78, 0x71, 0xf4, 0x2c, 0xa9, 0x78, + 0x73, 0xa2, 0xc1, 0xc7, 0xd0, 0xca, 0x0d, 0xfc, 0x41, 0xa9, 0xea, 0xff, 0x01, 0x70, 0x75, 0xe5, + 0xa3, 0x6d, 0x75, 0x54, 0x3d, 0x52, 0x1e, 0xed, 0x3e, 0x34, 0x65, 0x71, 0xa5, 0xd4, 0x49, 0x92, + 0x2c, 0x65, 0x49, 0xd2, 0x7c, 0x00, 0xfd, 0x23, 0xff, 0x8a, 0x7a, 0xae, 0x43, 0x05, 0xfb, 0x92, + 0x2d, 0xd1, 0x05, 0x6b, 0x3b, 0x30, 0xcf, 0xa0, 0xad, 0x5f, 0xda, 0xaf, 0xb5, 0xc7, 0xb6, 0xde, + 0xe3, 0xf7, 0x07, 0xd1, 0xbb, 0xd0, 0xd3, 0x93, 0x1e, 0xbb, 0x3a, 0x84, 0x64, 0x8d, 0xc1, 0xd9, + 0xb9, 0x7b, 0xad, 0xa7, 0xd6, 0x3d, 0xf3, 0x29, 0x6c, 0xe7, 0x4c, 0xd3, 0xe3, 0x5c, 0xb2, 0x65, + 0x94, 0x7c, 0x81, 0x90, 0xed, 0xc4, 0x03, 0xe5, 0xcc, 0x03, 0x26, 0x74, 0xf5, 0xc8, 0xe7, 0x4c, + 0xdc, 0x70, 0xba, 0x2f, 0xd3, 0x8d, 0x3c, 0x67, 0x7a, 0xf2, 0x87, 0x50, 0x65, 0xf2, 0xa4, 0xf9, + 0xfc, 0x99, 0xf7, 0x80, 0xa5, 0xd4, 0x1b, 0x16, 0x7c, 0x9a, 0x2e, 0x78, 0x1a, 0xab, 0x05, 0x5f, + 0x73, 0x2e, 0xf3, 0xed, 0x74, 0x1b, 0xa7, 0xb1, 0xb8, 0xe9, 0x46, 0x1f, 0x40, 0x5f, 0x1b, 0x3d, + 0x63, 0x1e, 0x13, 0xec, 0x86, 0x23, 0x3d, 0x04, 0x52, 0x30, 0xbb, 0x69, 0xba, 0x7b, 0xd0, 0x98, + 0x4c, 0x8e, 0x53, 0x6d, 0x91, 0x1b, 0xcd, 0x4f, 0xa0, 0x7f, 0x16, 0x3b, 0xc1, 0x29, 0x77, 0xaf, + 0x5c, 0x8f, 0xcd, 0xd5, 0x62, 0x49, 0xf1, 0x5b, 0xca, 0x15, 0xbf, 0x1b, 0xb3, 0x91, 0x39, 0x02, + 0x52, 0x18, 0x9e, 0xde, 0x5b, 0x14, 0x3b, 0x81, 0x0e, 0x61, 0x6c, 0x9b, 0x23, 0x68, 0x4f, 0xa8, + 0x2c, 0x36, 0x1c, 0x65, 0x63, 0x40, 0x5d, 0xa8, 0xbe, 0x36, 0x4b, 0xba, 0xe6, 0x1e, 0xec, 0x1c, + 0x50, 0xfb, 0xc2, 0xf5, 0xe7, 0xcf, 0xdc, 0x48, 0x56, 0x5b, 0x7a, 0xc4, 0x00, 0x1a, 0x8e, 0x16, + 0xe8, 0x21, 0x69, 0xdf, 0x7c, 0x1f, 0xde, 0xc8, 0x7d, 0xe6, 0x39, 0x13, 0x34, 0xf1, 0xc7, 0x0e, + 0x54, 0x23, 0xd9, 0xc3, 0x11, 0x55, 0x4b, 0x75, 0xcc, 0xaf, 0x60, 0x27, 0x9f, 0x80, 0x65, 0xed, + 0x93, 0x1c, 0x1c, 0xab, 0x92, 0x52, 0xae, 0x2a, 0xd1, 0x3e, 0x2b, 0x67, 0xf9, 0x64, 0x1b, 0x2a, + 0xbf, 0xfe, 0x66, 0xa2, 0xc1, 0x2e, 0x9b, 0xe6, 0x1f, 0xe5, 0xf2, 0xc5, 0xf9, 0xd4, 0xf2, 0x85, + 0xd2, 0xa4, 0xf4, 0x5a, 0xa5, 0xc9, 0x3a, 0xde, 0xde, 0x87, 0xfe, 0x89, 0x17, 0xd8, 0x97, 0x87, + 0x7e, 0xce, 0x1b, 0x06, 0xd4, 0x99, 0x9f, 0x77, 0x46, 0xd2, 0x35, 0xdf, 0x81, 0xde, 0x71, 0x60, + 0x53, 0xef, 0x24, 0x88, 0x7d, 0x91, 0x7a, 0x01, 0xbf, 0xbb, 0x69, 0x53, 0xd5, 0x31, 0xdf, 0x87, + 0xae, 0x4e, 0xd1, 0xfe, 0x79, 0x90, 0x30, 0x63, 0x96, 0xcc, 0x4b, 0xc5, 0x42, 0xdf, 0x3c, 0x86, + 0x5e, 0x66, 0xae, 0xe6, 0x7d, 0x07, 0x6a, 0x4a, 0xad, 0xcf, 0xd6, 0x4b, 0x5f, 0xaf, 0xca, 0xd2, + 0xd2, 0xea, 0x0d, 0x87, 0x5a, 0x40, 0xf7, 0x14, 0xbf, 0x7f, 0x1e, 0xfa, 0x57, 0x6a, 0xb2, 0x23, + 0x20, 0xea, 0x8b, 0xe8, 0x94, 0xf9, 0x57, 0x2e, 0x0f, 0x7c, 0x2c, 0xae, 0x4b, 0xba, 0x84, 0x49, + 0x26, 0x4e, 0x07, 0x25, 0x16, 0x56, 0x3f, 0x5c, 0x15, 0x6d, 0xf4, 0x21, 0x64, 0x5f, 0x57, 0x64, + 0xaa, 0xe1, 0x6c, 0x11, 0x08, 0x36, 0xa5, 0x8e, 0x93, 0x44, 0x0b, 0x28, 0xd1, 0xbe, 0xe3, 0xf0, + 0xbd, 0xff, 0x94, 0xa1, 0xfe, 0x99, 0x22, 0x70, 0xf2, 0x29, 0x74, 0x0a, 0xe9, 0x9a, 0xbc, 0x81, + 0x65, 0xdd, 0x6a, 0x71, 0x30, 0xb8, 0xbd, 0x26, 0x56, 0xe7, 0xfa, 0x00, 0xda, 0xf9, 0x64, 0x4c, + 0x30, 0xf1, 0xe2, 0xb7, 0xde, 0x01, 0xce, 0xb4, 0x9e, 0xa9, 0xcf, 0x60, 0x67, 0x53, 0x9a, 0x24, + 0xf7, 0xb2, 0x15, 0xd6, 0x53, 0xf4, 0xe0, 0xcd, 0x9b, 0xb4, 0x49, 0x7a, 0xad, 0x1f, 0x78, 0x8c, + 0xfa, 0x71, 0x98, 0xdf, 0x41, 0xd6, 0x24, 0x8f, 0xa1, 0x53, 0x48, 0x14, 0xea, 0x9c, 0x6b, 0xb9, + 0x23, 0x3f, 0xe4, 0x21, 0x54, 0x31, 0x39, 0x91, 0x4e, 0x21, 0x4b, 0x0e, 0xba, 0x69, 0x57, 0xad, + 0x3d, 0x84, 0x2d, 0xfc, 0x02, 0x98, 0x5b, 0x18, 0x47, 0xa4, 0x99, 0x6b, 0xef, 0xdf, 0x25, 0xa8, + 0x27, 0x5f, 0x85, 0x1f, 0xc3, 0x96, 0xcc, 0x01, 0xe4, 0x56, 0x8e, 0x46, 0x93, 0xfc, 0x31, 0xd8, + 0x59, 0x11, 0xaa, 0x05, 0xc6, 0x50, 0x79, 0xce, 0x04, 0x21, 0x39, 0xa5, 0x4e, 0x06, 0x83, 0x5b, + 0x45, 0x59, 0x6a, 0x7f, 0x1a, 0x17, 0xed, 0x35, 0x97, 0x17, 0xec, 0x53, 0x96, 0xfe, 0x08, 0x6a, + 0x8a, 0x65, 0x95, 0x53, 0xd6, 0xf8, 0x59, 0x5d, 0xfe, 0x3a, 0x1f, 0xef, 0xfd, 0x73, 0x0b, 0xe0, + 0x6c, 0x19, 0x09, 0xb6, 0xf8, 0x8d, 0xcb, 0x5e, 0x92, 0x47, 0xd0, 0x7b, 0xc6, 0xce, 0x69, 0xec, + 0x09, 0x7c, 0xaa, 0x49, 0x36, 0xc9, 0xf9, 0x04, 0x0b, 0xbe, 0x94, 0xac, 0x1f, 0x42, 0xeb, 0x84, + 0x5e, 0xbf, 0xda, 0xee, 0x53, 0xe8, 0x14, 0x38, 0x58, 0x6f, 0x71, 0x95, 0xd5, 0xf5, 0x16, 0xd7, + 0xd9, 0xfa, 0x21, 0xd4, 0x35, 0x33, 0xe7, 0xd7, 0xc0, 0x1c, 0x56, 0x60, 0xec, 0x9f, 0x43, 0x6f, + 0x85, 0x97, 0xf3, 0xf6, 0xf8, 0x39, 0x64, 0x23, 0x6f, 0x3f, 0x95, 0xaf, 0x9d, 0x22, 0x37, 0xe7, + 0x07, 0xea, 0x97, 0xd7, 0x26, 0xf2, 0x7e, 0x5e, 0x7c, 0x27, 0xe1, 0x13, 0xd5, 0x58, 0xa5, 0xcf, + 0x84, 0xbc, 0x07, 0x77, 0x36, 0x69, 0xd2, 0x10, 0xcc, 0x33, 0xe8, 0x5a, 0x08, 0xae, 0xd3, 0xeb, + 0x7b, 0x00, 0x19, 0x89, 0xe6, 0xed, 0x11, 0x1e, 0xab, 0xfc, 0xfa, 0x21, 0x40, 0x46, 0x8d, 0x0a, + 0x55, 0x45, 0x66, 0x55, 0xc3, 0x56, 0xe9, 0xf3, 0x11, 0x34, 0x53, 0x3a, 0xcb, 0xaf, 0x81, 0x13, + 0x14, 0xd9, 0xf1, 0xb3, 0x47, 0xbf, 0x1f, 0xcd, 0x5d, 0x71, 0x11, 0xcf, 0xc6, 0x76, 0xb0, 0xd8, + 0xbd, 0xa0, 0xd1, 0x85, 0x6b, 0x07, 0x3c, 0xdc, 0xbd, 0x92, 0x60, 0xda, 0x2d, 0xfc, 0xb4, 0x9a, + 0xd5, 0xf0, 0xa1, 0xf7, 0xe4, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5b, 0x0c, 0x01, 0xf3, 0xcc, + 0x1a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3189,7 +3190,7 @@ var _Backend_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "logical/plugin/pb/backend.proto", + Metadata: "sdk/plugin/pb/backend.proto", } // StorageClient is the client API for Storage service. @@ -3352,7 +3353,7 @@ var _Storage_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "logical/plugin/pb/backend.proto", + Metadata: "sdk/plugin/pb/backend.proto", } // SystemViewClient is the client API for SystemView service. @@ -3796,5 +3797,5 @@ var _SystemView_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "logical/plugin/pb/backend.proto", + Metadata: "sdk/plugin/pb/backend.proto", } diff --git a/logical/plugin/pb/backend.proto b/sdk/plugin/pb/backend.proto similarity index 99% rename from logical/plugin/pb/backend.proto rename to sdk/plugin/pb/backend.proto index 97b6276ca2..65f4ef80dc 100644 --- a/logical/plugin/pb/backend.proto +++ b/sdk/plugin/pb/backend.proto @@ -1,11 +1,11 @@ syntax = "proto3"; package pb; -option go_package = "github.com/hashicorp/vault/logical/plugin/pb"; +option go_package = "github.com/hashicorp/vault/sdk/plugin/pb"; import "google/protobuf/timestamp.proto"; -import "logical/identity.proto"; -import "logical/plugin.proto"; +import "sdk/logical/identity.proto"; +import "sdk/logical/plugin.proto"; message Empty {} diff --git a/logical/plugin/pb/translation.go b/sdk/plugin/pb/translation.go similarity index 98% rename from logical/plugin/pb/translation.go rename to sdk/plugin/pb/translation.go index 09aada1436..3ef85a0821 100644 --- a/logical/plugin/pb/translation.go +++ b/sdk/plugin/pb/translation.go @@ -6,10 +6,10 @@ import ( "time" "github.com/golang/protobuf/ptypes" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/helper/wrapping" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/wrapping" + "github.com/hashicorp/vault/sdk/logical" ) const ( diff --git a/logical/plugin/pb/translation_test.go b/sdk/plugin/pb/translation_test.go similarity index 97% rename from logical/plugin/pb/translation_test.go rename to sdk/plugin/pb/translation_test.go index 65bf400fcf..dcdf553191 100644 --- a/logical/plugin/pb/translation_test.go +++ b/sdk/plugin/pb/translation_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/hashicorp/vault/helper/errutil" - "github.com/hashicorp/vault/helper/wrapping" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/errutil" + "github.com/hashicorp/vault/sdk/helper/wrapping" + "github.com/hashicorp/vault/sdk/logical" ) func TestTranslation_Errors(t *testing.T) { diff --git a/logical/plugin/plugin.go b/sdk/plugin/plugin.go similarity index 96% rename from logical/plugin/plugin.go rename to sdk/plugin/plugin.go index 536fbf20eb..f12a36928c 100644 --- a/logical/plugin/plugin.go +++ b/sdk/plugin/plugin.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/logical" ) // BackendPluginClient is a wrapper around backendPluginClient diff --git a/logical/plugin/serve.go b/sdk/plugin/serve.go similarity index 96% rename from logical/plugin/serve.go rename to sdk/plugin/serve.go index d3771f08d4..b8cd3e58f0 100644 --- a/logical/plugin/serve.go +++ b/sdk/plugin/serve.go @@ -9,8 +9,8 @@ import ( log "github.com/hashicorp/go-hclog" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/logical" ) // BackendPluginName is the name of the plugin that can be diff --git a/logical/plugin/storage_test.go b/sdk/plugin/storage_test.go similarity index 86% rename from logical/plugin/storage_test.go rename to sdk/plugin/storage_test.go index 9920460248..fa61dece35 100644 --- a/logical/plugin/storage_test.go +++ b/sdk/plugin/storage_test.go @@ -6,8 +6,8 @@ import ( "google.golang.org/grpc" plugin "github.com/hashicorp/go-plugin" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/plugin/pb" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/plugin/pb" ) func TestStorage_impl(t *testing.T) { diff --git a/version/cgo.go b/sdk/version/cgo.go similarity index 100% rename from version/cgo.go rename to sdk/version/cgo.go diff --git a/version/version.go b/sdk/version/version.go similarity index 84% rename from version/version.go rename to sdk/version/version.go index 0f81933357..e0db36e8f0 100644 --- a/version/version.go +++ b/sdk/version/version.go @@ -5,19 +5,6 @@ import ( "fmt" ) -var ( - // The git commit that was compiled. This will be filled in by the compiler. - GitCommit string - GitDescribe string - - // Whether cgo is enabled or not; set at build time - CgoEnabled bool - - Version = "unknown" - VersionPrerelease = "unknown" - VersionMetadata = "" -) - // VersionInfo type VersionInfo struct { Revision string diff --git a/sdk/version/version_base.go b/sdk/version/version_base.go new file mode 100644 index 0000000000..8b9681f677 --- /dev/null +++ b/sdk/version/version_base.go @@ -0,0 +1,14 @@ +package version + +var ( + // The git commit that was compiled. This will be filled in by the compiler. + GitCommit string + GitDescribe string + + // Whether cgo is enabled or not; set at build time + CgoEnabled bool + + Version = "1.1.1" + VersionPrerelease = "" + VersionMetadata = "" +) diff --git a/vault/acl.go b/vault/acl.go index 9367f2d1ba..4105b3583f 100644 --- a/vault/acl.go +++ b/vault/acl.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" "github.com/mitchellh/copystructure" ) diff --git a/vault/acl_test.go b/vault/acl_test.go index e1f94819ce..5a2de1b7fc 100644 --- a/vault/acl_test.go +++ b/vault/acl_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestACL_NewACL(t *testing.T) { diff --git a/vault/acl_util.go b/vault/acl_util.go index ade4c724c8..b3ea126bc0 100644 --- a/vault/acl_util.go +++ b/vault/acl_util.go @@ -6,7 +6,7 @@ import ( "context" "github.com/hashicorp/vault/helper/identity" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func (c *Core) performEntPolicyChecks(ctx context.Context, acl *ACL, te *logical.TokenEntry, req *logical.Request, inEntity *identity.Entity, opts *PolicyCheckOpts, ret *AuthResults) { diff --git a/vault/audit.go b/vault/audit.go index 639d0a0daf..48b9af8b28 100644 --- a/vault/audit.go +++ b/vault/audit.go @@ -9,10 +9,10 @@ import ( uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/audit" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" ) const ( diff --git a/vault/audit_test.go b/vault/audit_test.go index 1ac632f7c9..319fc30eec 100644 --- a/vault/audit_test.go +++ b/vault/audit_test.go @@ -15,11 +15,11 @@ import ( log "github.com/hashicorp/go-hclog" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/audit" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" "github.com/mitchellh/copystructure" ) diff --git a/vault/audited_headers.go b/vault/audited_headers.go index ca8383ea87..7abe78cd69 100644 --- a/vault/audited_headers.go +++ b/vault/audited_headers.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) // N.B.: While we could use textproto to get the canonical mime header, HTTP/2 diff --git a/vault/audited_headers_test.go b/vault/audited_headers_test.go index 473b0bb7c8..11abb34574 100644 --- a/vault/audited_headers_test.go +++ b/vault/audited_headers_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/hashicorp/vault/helper/salt" + "github.com/hashicorp/vault/sdk/helper/salt" ) func mockAuditedHeadersConfig(t *testing.T) *AuditedHeadersConfig { diff --git a/vault/auth.go b/vault/auth.go index 5aafc1dcaa..43f39bca1f 100644 --- a/vault/auth.go +++ b/vault/auth.go @@ -8,11 +8,11 @@ import ( uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/builtin/plugin" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" ) const ( diff --git a/vault/auth_test.go b/vault/auth_test.go index db3409256e..15b77034a5 100644 --- a/vault/auth_test.go +++ b/vault/auth_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestAuth_ReadOnlyViewDuringMount(t *testing.T) { diff --git a/vault/barrier.go b/vault/barrier.go index 8de69e4448..15a1ceba2f 100644 --- a/vault/barrier.go +++ b/vault/barrier.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) var ( diff --git a/vault/barrier_aes_gcm.go b/vault/barrier_aes_gcm.go index 2ad4b77050..d186879ab2 100644 --- a/vault/barrier_aes_gcm.go +++ b/vault/barrier_aes_gcm.go @@ -15,10 +15,10 @@ import ( metrics "github.com/armon/go-metrics" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/physical" ) const ( diff --git a/vault/barrier_aes_gcm_test.go b/vault/barrier_aes_gcm_test.go index 3d99523ef7..38960355b4 100644 --- a/vault/barrier_aes_gcm_test.go +++ b/vault/barrier_aes_gcm_test.go @@ -7,10 +7,10 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/physical" - "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/physical" + "github.com/hashicorp/vault/sdk/physical/inmem" ) var ( diff --git a/vault/barrier_test.go b/vault/barrier_test.go index 1b77c20d3a..3d3c67d8c1 100644 --- a/vault/barrier_test.go +++ b/vault/barrier_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func testBarrier(t *testing.T, b SecurityBarrier) { diff --git a/vault/barrier_view.go b/vault/barrier_view.go index e89fd3aa3f..7fa0e7fcf2 100644 --- a/vault/barrier_view.go +++ b/vault/barrier_view.go @@ -5,7 +5,7 @@ import ( "errors" "sync" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) // BarrierView wraps a SecurityBarrier and ensures all access is automatically diff --git a/vault/barrier_view_test.go b/vault/barrier_view_test.go index 4b55b4b70f..c13c836bf2 100644 --- a/vault/barrier_view_test.go +++ b/vault/barrier_view_test.go @@ -6,7 +6,7 @@ import ( "sort" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestBarrierView_impl(t *testing.T) { diff --git a/vault/capabilities.go b/vault/capabilities.go index 36e17bde25..51b79f51e7 100644 --- a/vault/capabilities.go +++ b/vault/capabilities.go @@ -5,7 +5,7 @@ import ( "sort" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) // Capabilities is used to fetch the capabilities of the given token on the diff --git a/vault/capabilities_test.go b/vault/capabilities_test.go index 85d8b9a629..e3498dc52e 100644 --- a/vault/capabilities_test.go +++ b/vault/capabilities_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestCapabilities_DerivedPolicies(t *testing.T) { diff --git a/vault/cluster.go b/vault/cluster.go index 1f801aad90..78f2daf3fa 100644 --- a/vault/cluster.go +++ b/vault/cluster.go @@ -23,8 +23,8 @@ import ( "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/logical" "golang.org/x/net/http2" ) diff --git a/vault/cluster_test.go b/vault/cluster_test.go index 5e6c93d60b..d56c6d30f8 100644 --- a/vault/cluster_test.go +++ b/vault/cluster_test.go @@ -11,11 +11,11 @@ import ( "time" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/physical" - "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/physical" + "github.com/hashicorp/vault/sdk/physical/inmem" ) var ( diff --git a/vault/core.go b/vault/core.go index f39b5819d2..f1d05715e8 100644 --- a/vault/core.go +++ b/vault/core.go @@ -27,16 +27,16 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/audit" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/helper/mlock" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/helper/mlock" "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/helper/reload" "github.com/hashicorp/vault/helper/tlsutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/physical" "github.com/hashicorp/vault/shamir" "github.com/hashicorp/vault/vault/seal" ) diff --git a/vault/core_test.go b/vault/core_test.go index 4bf7e8c0ce..fb293800a2 100644 --- a/vault/core_test.go +++ b/vault/core_test.go @@ -11,12 +11,12 @@ import ( log "github.com/hashicorp/go-hclog" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/audit" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/physical" - "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/physical" + "github.com/hashicorp/vault/sdk/physical/inmem" ) var ( diff --git a/vault/core_util.go b/vault/core_util.go index 6797bbf1c1..e41762b640 100644 --- a/vault/core_util.go +++ b/vault/core_util.go @@ -6,10 +6,10 @@ import ( "context" "time" - "github.com/hashicorp/vault/helper/license" + "github.com/hashicorp/vault/sdk/helper/license" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/physical" "github.com/hashicorp/vault/vault/replication" cache "github.com/patrickmn/go-cache" ) diff --git a/vault/cors.go b/vault/cors.go index c172a33049..8a9533b0c8 100644 --- a/vault/cors.go +++ b/vault/cors.go @@ -7,9 +7,9 @@ import ( "sync/atomic" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" ) const ( diff --git a/vault/counters.go b/vault/counters.go index fc014a69d8..324d0c0d98 100644 --- a/vault/counters.go +++ b/vault/counters.go @@ -7,7 +7,7 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) const ( diff --git a/vault/dynamic_system_view.go b/vault/dynamic_system_view.go index eef5e19c45..e1db881bd9 100644 --- a/vault/dynamic_system_view.go +++ b/vault/dynamic_system_view.go @@ -7,13 +7,13 @@ import ( "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/license" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/license" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/helper/wrapping" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/version" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/wrapping" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/version" ) type dynamicSystemView struct { diff --git a/vault/expiration.go b/vault/expiration.go index f8346f6cd4..110b2ef781 100644 --- a/vault/expiration.go +++ b/vault/expiration.go @@ -17,12 +17,12 @@ import ( log "github.com/hashicorp/go-hclog" multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/vault/helper/base62" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/locksutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/locksutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/vault/expiration_integ_test.go b/vault/expiration_integ_test.go index 8763a1471b..a8271e4f51 100644 --- a/vault/expiration_integ_test.go +++ b/vault/expiration_integ_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/credential/approle" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/vault/expiration_test.go b/vault/expiration_test.go index daa2fffce9..9e47517f48 100644 --- a/vault/expiration_test.go +++ b/vault/expiration_test.go @@ -15,12 +15,12 @@ import ( log "github.com/hashicorp/go-hclog" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" - "github.com/hashicorp/vault/physical" - "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" + "github.com/hashicorp/vault/sdk/physical" + "github.com/hashicorp/vault/sdk/physical/inmem" ) var ( diff --git a/vault/expiration_util.go b/vault/expiration_util.go index ab1454a25e..c1bdaae187 100644 --- a/vault/expiration_util.go +++ b/vault/expiration_util.go @@ -5,7 +5,7 @@ package vault import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func (m *ExpirationManager) leaseView(*namespace.Namespace) *BarrierView { diff --git a/vault/external_tests/api/api_integration_test.go b/vault/external_tests/api/api_integration_test.go index 944cad597f..56e10e7983 100644 --- a/vault/external_tests/api/api_integration_test.go +++ b/vault/external_tests/api/api_integration_test.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/vault/builtin/logical/pki" "github.com/hashicorp/vault/builtin/logical/transit" "github.com/hashicorp/vault/helper/builtinplugins" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" log "github.com/hashicorp/go-hclog" diff --git a/vault/external_tests/identity/aliases_test.go b/vault/external_tests/identity/aliases_test.go index 8c6a77b278..be00122b90 100644 --- a/vault/external_tests/identity/aliases_test.go +++ b/vault/external_tests/identity/aliases_test.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/vault/api" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" "github.com/hashicorp/vault/builtin/credential/github" diff --git a/vault/external_tests/identity/entities_test.go b/vault/external_tests/identity/entities_test.go index 87b5bd3a5f..989a61e59a 100644 --- a/vault/external_tests/identity/entities_test.go +++ b/vault/external_tests/identity/entities_test.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/credential/approle" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/vault/external_tests/identity/group_aliases_test.go b/vault/external_tests/identity/group_aliases_test.go index e95fb6ef4b..b75533b566 100644 --- a/vault/external_tests/identity/group_aliases_test.go +++ b/vault/external_tests/identity/group_aliases_test.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/vault/api" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" credLdap "github.com/hashicorp/vault/builtin/credential/ldap" diff --git a/vault/external_tests/identity/groups_test.go b/vault/external_tests/identity/groups_test.go index b71dc0635a..90996ee419 100644 --- a/vault/external_tests/identity/groups_test.go +++ b/vault/external_tests/identity/groups_test.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/vault/api" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" "github.com/hashicorp/vault/builtin/credential/github" diff --git a/vault/external_tests/identity/identity_test.go b/vault/external_tests/identity/identity_test.go index 3483788b0f..490ff6450d 100644 --- a/vault/external_tests/identity/identity_test.go +++ b/vault/external_tests/identity/identity_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/credential/ldap" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/vault/external_tests/policy/acl_templating_test.go b/vault/external_tests/policy/acl_templating_test.go index ed17e1af79..7872f6ad9d 100644 --- a/vault/external_tests/policy/acl_templating_test.go +++ b/vault/external_tests/policy/acl_templating_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/vault/api" credUserpass "github.com/hashicorp/vault/builtin/credential/userpass" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/vault/external_tests/response/allowed_response_headers_test.go b/vault/external_tests/response/allowed_response_headers_test.go index 85c594ad40..66ee4dc98d 100644 --- a/vault/external_tests/response/allowed_response_headers_test.go +++ b/vault/external_tests/response/allowed_response_headers_test.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/vault/api" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/hashicorp/vault/vault" "github.com/kr/pretty" ) diff --git a/vault/external_tests/router/router_ext_test.go b/vault/external_tests/router/router_ext_test.go index f129f3afeb..cf55c4709e 100644 --- a/vault/external_tests/router/router_ext_test.go +++ b/vault/external_tests/router/router_ext_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/credential/userpass" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/vault/external_tests/token/batch_token_test.go b/vault/external_tests/token/batch_token_test.go index dc412cdbed..5056d16a08 100644 --- a/vault/external_tests/token/batch_token_test.go +++ b/vault/external_tests/token/batch_token_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/credential/approle" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/vault/external_tests/token/token_test.go b/vault/external_tests/token/token_test.go index f6e0f3e2ee..93041510a7 100644 --- a/vault/external_tests/token/token_test.go +++ b/vault/external_tests/token/token_test.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/vault/api" credLdap "github.com/hashicorp/vault/builtin/credential/ldap" credUserpass "github.com/hashicorp/vault/builtin/credential/userpass" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" "github.com/hashicorp/vault/vault" ) diff --git a/vault/generate_root.go b/vault/generate_root.go index a93cc61403..2f5435e0af 100644 --- a/vault/generate_root.go +++ b/vault/generate_root.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/errwrap" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/pgpkeys" "github.com/hashicorp/vault/helper/xor" "github.com/hashicorp/vault/shamir" diff --git a/vault/ha.go b/vault/ha.go index 6884b9ef5c..3d3dd956a5 100644 --- a/vault/ha.go +++ b/vault/ha.go @@ -14,12 +14,12 @@ import ( multierror "github.com/hashicorp/go-multierror" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/audit" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/physical" "github.com/oklog/run" ) diff --git a/vault/identity_lookup.go b/vault/identity_lookup.go index 4a4b0eb017..e2e5c09cfd 100644 --- a/vault/identity_lookup.go +++ b/vault/identity_lookup.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/hashicorp/vault/helper/identity" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func lookupPaths(i *IdentityStore) []*framework.Path { diff --git a/vault/identity_lookup_test.go b/vault/identity_lookup_test.go index a132f960c9..c1cbc19dd4 100644 --- a/vault/identity_lookup_test.go +++ b/vault/identity_lookup_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestIdentityStore_Lookup_Entity(t *testing.T) { diff --git a/vault/identity_store.go b/vault/identity_store.go index b298975718..0a17b74aeb 100644 --- a/vault/identity_store.go +++ b/vault/identity_store.go @@ -9,13 +9,13 @@ import ( "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/helper/storagepacker" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/vault/identity_store_aliases.go b/vault/identity_store_aliases.go index 88259240f5..4ef1964e01 100644 --- a/vault/identity_store_aliases.go +++ b/vault/identity_store_aliases.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/helper/storagepacker" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // aliasPaths returns the API endpoints to operate on aliases. diff --git a/vault/identity_store_aliases_test.go b/vault/identity_store_aliases_test.go index 2e1f9cf860..2db6b8e147 100644 --- a/vault/identity_store_aliases_test.go +++ b/vault/identity_store_aliases_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) // Issue 5729 diff --git a/vault/identity_store_entities.go b/vault/identity_store_entities.go index e57a1e7972..86393ffc5d 100644 --- a/vault/identity_store_entities.go +++ b/vault/identity_store_entities.go @@ -9,13 +9,13 @@ import ( "github.com/golang/protobuf/ptypes" "github.com/hashicorp/errwrap" memdb "github.com/hashicorp/go-memdb" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/helper/storagepacker" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func entityPathFields() map[string]*framework.FieldSchema { diff --git a/vault/identity_store_entities_test.go b/vault/identity_store_entities_test.go index f23ad7ead7..7780ca3d8e 100644 --- a/vault/identity_store_entities_test.go +++ b/vault/identity_store_entities_test.go @@ -12,7 +12,7 @@ import ( credGithub "github.com/hashicorp/vault/builtin/credential/github" "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestIdentityStore_EntityDeleteGroupMembershipUpdate(t *testing.T) { diff --git a/vault/identity_store_group_aliases.go b/vault/identity_store_group_aliases.go index 4a57b0aadd..5f9cea86af 100644 --- a/vault/identity_store_group_aliases.go +++ b/vault/identity_store_group_aliases.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func groupAliasPaths(i *IdentityStore) []*framework.Path { diff --git a/vault/identity_store_group_aliases_test.go b/vault/identity_store_group_aliases_test.go index ca1ca3c465..6a034292ea 100644 --- a/vault/identity_store_group_aliases_test.go +++ b/vault/identity_store_group_aliases_test.go @@ -8,7 +8,7 @@ import ( credUserpass "github.com/hashicorp/vault/builtin/credential/userpass" "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestIdentityStore_CaseInsensitiveGroupAliasName(t *testing.T) { diff --git a/vault/identity_store_groups.go b/vault/identity_store_groups.go index d8c3280bcd..71d60cbeb7 100644 --- a/vault/identity_store_groups.go +++ b/vault/identity_store_groups.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/vault/identity_store_groups_test.go b/vault/identity_store_groups_test.go index 4a6dc82dfa..b1926ab3a2 100644 --- a/vault/identity_store_groups_test.go +++ b/vault/identity_store_groups_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-test/deep" "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestIdentityStore_FixOverwrittenMemberGroupIDs(t *testing.T) { diff --git a/vault/identity_store_structs.go b/vault/identity_store_structs.go index c8e8026c59..399fcd41ce 100644 --- a/vault/identity_store_structs.go +++ b/vault/identity_store_structs.go @@ -8,8 +8,8 @@ import ( memdb "github.com/hashicorp/go-memdb" "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/helper/storagepacker" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/vault/identity_store_test.go b/vault/identity_store_test.go index 347c67b5b4..0837dca35e 100644 --- a/vault/identity_store_test.go +++ b/vault/identity_store_test.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/helper/storagepacker" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestIdentityStore_UnsealingWhenConflictingAliasNames(t *testing.T) { diff --git a/vault/identity_store_upgrade.go b/vault/identity_store_upgrade.go index ebf3e5582f..734da206ee 100644 --- a/vault/identity_store_upgrade.go +++ b/vault/identity_store_upgrade.go @@ -3,8 +3,8 @@ package vault import ( "strings" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func upgradePaths(i *IdentityStore) []*framework.Path { diff --git a/vault/identity_store_util.go b/vault/identity_store_util.go index 264b557554..ec776659e4 100644 --- a/vault/identity_store_util.go +++ b/vault/identity_store_util.go @@ -11,13 +11,13 @@ import ( "github.com/hashicorp/errwrap" memdb "github.com/hashicorp/go-memdb" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/helper/identity/mfa" "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/helper/storagepacker" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" ) var ( diff --git a/vault/init_test.go b/vault/init_test.go index b865f7c988..91673993be 100644 --- a/vault/init_test.go +++ b/vault/init_test.go @@ -7,9 +7,9 @@ import ( log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/physical/inmem" ) func TestCore_Init(t *testing.T) { diff --git a/vault/keyring.go b/vault/keyring.go index fd6564790c..9c488715ca 100644 --- a/vault/keyring.go +++ b/vault/keyring.go @@ -7,7 +7,7 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" ) // Keyring is used to manage multiple encryption keys used by diff --git a/vault/logical_cubbyhole.go b/vault/logical_cubbyhole.go index 5f45d9e555..c0853ae830 100644 --- a/vault/logical_cubbyhole.go +++ b/vault/logical_cubbyhole.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // CubbyholeBackendFactory constructs a new cubbyhole backend diff --git a/vault/logical_cubbyhole_test.go b/vault/logical_cubbyhole_test.go index 358f2c9ead..d6df986a2d 100644 --- a/vault/logical_cubbyhole_test.go +++ b/vault/logical_cubbyhole_test.go @@ -8,7 +8,7 @@ import ( "time" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestCubbyholeBackend_Write(t *testing.T) { diff --git a/vault/logical_passthrough.go b/vault/logical_passthrough.go index 6c10cc7baf..4d9fbe3cfb 100644 --- a/vault/logical_passthrough.go +++ b/vault/logical_passthrough.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/helper/wrapping" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/wrapping" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // PassthroughBackendFactory returns a PassthroughBackend diff --git a/vault/logical_passthrough_test.go b/vault/logical_passthrough_test.go index 04bfddcaf7..59fd78a777 100644 --- a/vault/logical_passthrough_test.go +++ b/vault/logical_passthrough_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/logical" ) func TestPassthroughBackend_RootPaths(t *testing.T) { diff --git a/vault/logical_system.go b/vault/logical_system.go index b84cd6aeef..ea8313d417 100644 --- a/vault/logical_system.go +++ b/vault/logical_system.go @@ -22,17 +22,17 @@ import ( log "github.com/hashicorp/go-hclog" memdb "github.com/hashicorp/go-memdb" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/compressutil" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/compressutil" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/identity" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/helper/metricsutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/helper/wrapping" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/wrapping" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/mitchellh/mapstructure" ) diff --git a/vault/logical_system_helpers.go b/vault/logical_system_helpers.go index 6cc281a733..d7c7491aaa 100644 --- a/vault/logical_system_helpers.go +++ b/vault/logical_system_helpers.go @@ -9,8 +9,8 @@ import ( memdb "github.com/hashicorp/go-memdb" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) var ( diff --git a/vault/logical_system_integ_test.go b/vault/logical_system_integ_test.go index 8c8c146cac..8feb016f85 100644 --- a/vault/logical_system_integ_test.go +++ b/vault/logical_system_integ_test.go @@ -11,13 +11,13 @@ import ( "github.com/go-test/deep" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/builtin/plugin" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" vaulthttp "github.com/hashicorp/vault/http" - "github.com/hashicorp/vault/logical" - lplugin "github.com/hashicorp/vault/logical/plugin" - "github.com/hashicorp/vault/logical/plugin/mock" + "github.com/hashicorp/vault/sdk/logical" + lplugin "github.com/hashicorp/vault/sdk/plugin" + "github.com/hashicorp/vault/sdk/plugin/mock" "github.com/hashicorp/vault/vault" ) @@ -581,11 +581,11 @@ func TestBackend_PluginMainLogical(t *testing.T) { } args = append(args, fmt.Sprintf("--ca-cert=%s", caPEM)) - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(args) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) factoryFunc := mock.FactoryType(logical.TypeLogical) @@ -610,11 +610,11 @@ func TestBackend_PluginMainCredentials(t *testing.T) { } args = append(args, fmt.Sprintf("--ca-cert=%s", caPEM)) - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(args) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) factoryFunc := mock.FactoryType(logical.TypeCredential) @@ -646,11 +646,11 @@ func TestBackend_PluginMainEnv(t *testing.T) { } args = append(args, fmt.Sprintf("--ca-cert=%s", caPEM)) - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(args) tlsConfig := apiClientMeta.GetTLSConfig() - tlsProviderFunc := pluginutil.VaultPluginTLSProvider(tlsConfig) + tlsProviderFunc := api.VaultPluginTLSProvider(tlsConfig) factoryFunc := mock.FactoryType(logical.TypeLogical) diff --git a/vault/logical_system_paths.go b/vault/logical_system_paths.go index 1934f04a44..6d0849d3c8 100644 --- a/vault/logical_system_paths.go +++ b/vault/logical_system_paths.go @@ -3,8 +3,8 @@ package vault import ( "strings" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *SystemBackend) configPaths() []*framework.Path { diff --git a/vault/logical_system_test.go b/vault/logical_system_test.go index aea8ff8cea..11b0555373 100644 --- a/vault/logical_system_test.go +++ b/vault/logical_system_test.go @@ -19,14 +19,14 @@ import ( hclog "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/audit" "github.com/hashicorp/vault/helper/builtinplugins" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/identity" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" - "github.com/hashicorp/vault/version" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" + "github.com/hashicorp/vault/sdk/version" "github.com/mitchellh/mapstructure" ) diff --git a/vault/mount.go b/vault/mount.go index 7e0e8b2dec..bfe0d64292 100644 --- a/vault/mount.go +++ b/vault/mount.go @@ -12,11 +12,11 @@ import ( uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/builtin/plugin" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" "github.com/mitchellh/copystructure" ) diff --git a/vault/mount_test.go b/vault/mount_test.go index 33155d1500..ba714c967b 100644 --- a/vault/mount_test.go +++ b/vault/mount_test.go @@ -10,10 +10,10 @@ import ( "github.com/go-test/deep" "github.com/hashicorp/vault/audit" - "github.com/hashicorp/vault/helper/compressutil" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/compressutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestMount_ReadOnlyViewDuringMount(t *testing.T) { diff --git a/vault/mount_util.go b/vault/mount_util.go index 66ffb98e47..a17434bc9c 100644 --- a/vault/mount_util.go +++ b/vault/mount_util.go @@ -7,7 +7,7 @@ import ( "path" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func addPathCheckers(*Core, *MountEntry, logical.Backend, string) {} diff --git a/vault/plugin_catalog.go b/vault/plugin_catalog.go index 488587b3b8..ef9723fc36 100644 --- a/vault/plugin_catalog.go +++ b/vault/plugin_catalog.go @@ -15,11 +15,11 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/builtin/logical/database/dbplugin" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical" - backendplugin "github.com/hashicorp/vault/logical/plugin" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/logical" + backendplugin "github.com/hashicorp/vault/sdk/plugin" ) var ( diff --git a/vault/plugin_catalog_test.go b/vault/plugin_catalog_test.go index c9818d3647..2a56cfe2e4 100644 --- a/vault/plugin_catalog_test.go +++ b/vault/plugin_catalog_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/hashicorp/vault/helper/builtinplugins" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/pluginutil" ) func TestPluginCatalog_CRUD(t *testing.T) { diff --git a/vault/plugin_reload.go b/vault/plugin_reload.go index 3e939e4cf0..2170e43cd2 100644 --- a/vault/plugin_reload.go +++ b/vault/plugin_reload.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/errwrap" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" ) // reloadPluginMounts reloads provided mounts, regardless of diff --git a/vault/policy.go b/vault/policy.go index f135ac9fd4..e83c4e95eb 100644 --- a/vault/policy.go +++ b/vault/policy.go @@ -10,10 +10,10 @@ import ( multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/hcl" "github.com/hashicorp/hcl/hcl/ast" - "github.com/hashicorp/vault/helper/hclutil" + "github.com/hashicorp/vault/sdk/helper/hclutil" "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" "github.com/mitchellh/copystructure" ) diff --git a/vault/policy_store.go b/vault/policy_store.go index 1c103cba8f..715c33b2ea 100644 --- a/vault/policy_store.go +++ b/vault/policy_store.go @@ -12,11 +12,11 @@ import ( "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" lru "github.com/hashicorp/golang-lru" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/identity" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" ) const ( diff --git a/vault/policy_store_test.go b/vault/policy_store_test.go index df8ac8e815..b0b3788269 100644 --- a/vault/policy_store_test.go +++ b/vault/policy_store_test.go @@ -6,9 +6,9 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func mockPolicyStore(t *testing.T) *PolicyStore { diff --git a/vault/policy_store_util.go b/vault/policy_store_util.go index c2c7a35a53..6b8291326b 100644 --- a/vault/policy_store_util.go +++ b/vault/policy_store_util.go @@ -6,7 +6,7 @@ import ( "context" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) type entPolicyStore struct{} diff --git a/vault/rekey.go b/vault/rekey.go index 8ef6252cea..35212497a1 100644 --- a/vault/rekey.go +++ b/vault/rekey.go @@ -11,11 +11,11 @@ import ( "github.com/hashicorp/errwrap" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/helper/pgpkeys" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/physical" "github.com/hashicorp/vault/shamir" ) diff --git a/vault/rekey_test.go b/vault/rekey_test.go index 9a09e748e6..643b587e38 100644 --- a/vault/rekey_test.go +++ b/vault/rekey_test.go @@ -8,9 +8,9 @@ import ( log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical" - "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical" + "github.com/hashicorp/vault/sdk/physical/inmem" ) func TestCore_Rekey_Lifecycle(t *testing.T) { diff --git a/vault/replication/cluster.go b/vault/replication/cluster.go index 20d4455109..4030cd0686 100644 --- a/vault/replication/cluster.go +++ b/vault/replication/cluster.go @@ -2,7 +2,7 @@ package replication -import "github.com/hashicorp/vault/helper/consts" +import "github.com/hashicorp/vault/sdk/helper/consts" type Cluster struct { State consts.ReplicationState diff --git a/vault/request_forwarding_rpc.go b/vault/request_forwarding_rpc.go index 9a27adde90..3b34afd60d 100644 --- a/vault/request_forwarding_rpc.go +++ b/vault/request_forwarding_rpc.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "time" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/forwarding" "github.com/hashicorp/vault/vault/replication" cache "github.com/patrickmn/go-cache" diff --git a/vault/request_handling.go b/vault/request_handling.go index 0c0998fbd5..67134da547 100644 --- a/vault/request_handling.go +++ b/vault/request_handling.go @@ -13,16 +13,16 @@ import ( multierror "github.com/hashicorp/go-multierror" sockaddr "github.com/hashicorp/go-sockaddr" "github.com/hashicorp/vault/audit" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/errutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/errutil" "github.com/hashicorp/vault/helper/identity" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/helper/wrapping" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/wrapping" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/vault/request_handling_test.go b/vault/request_handling_test.go index b4d4e24a68..901525a6f5 100644 --- a/vault/request_handling_test.go +++ b/vault/request_handling_test.go @@ -7,7 +7,7 @@ import ( uuid "github.com/hashicorp/go-uuid" credUserpass "github.com/hashicorp/vault/builtin/credential/userpass" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestRequestHandling_Wrapping(t *testing.T) { diff --git a/vault/request_handling_util.go b/vault/request_handling_util.go index 1a12e2a361..29825b08bd 100644 --- a/vault/request_handling_util.go +++ b/vault/request_handling_util.go @@ -6,7 +6,7 @@ import ( "context" "github.com/hashicorp/vault/helper/identity" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func waitForReplicationState(context.Context, *Core, *logical.Request) error { return nil } diff --git a/vault/rollback.go b/vault/rollback.go index 9dad02acdf..d94ce9ff6b 100644 --- a/vault/rollback.go +++ b/vault/rollback.go @@ -11,7 +11,7 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) const ( diff --git a/vault/rollback_test.go b/vault/rollback_test.go index 4c74f25e84..1001eb36d1 100644 --- a/vault/rollback_test.go +++ b/vault/rollback_test.go @@ -9,7 +9,7 @@ import ( log "github.com/hashicorp/go-hclog" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/helper/namespace" ) diff --git a/vault/router.go b/vault/router.go index 790a7f91be..df49dd1213 100644 --- a/vault/router.go +++ b/vault/router.go @@ -10,11 +10,11 @@ import ( metrics "github.com/armon/go-metrics" radix "github.com/armon/go-radix" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" ) var ( diff --git a/vault/router_test.go b/vault/router_test.go index 41fe4a722f..29f9ae0a7f 100644 --- a/vault/router_test.go +++ b/vault/router_test.go @@ -12,7 +12,7 @@ import ( log "github.com/hashicorp/go-hclog" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) type HandlerFunc func(context.Context, *logical.Request) (*logical.Response, error) diff --git a/vault/seal.go b/vault/seal.go index 15474e7835..66eaa2e803 100644 --- a/vault/seal.go +++ b/vault/seal.go @@ -10,8 +10,8 @@ import ( "sync/atomic" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/physical" "github.com/hashicorp/vault/vault/seal" "github.com/keybase/go-crypto/openpgp" diff --git a/vault/seal/alicloudkms/alicloudkms.go b/vault/seal/alicloudkms/alicloudkms.go index 80ef79a39d..670d0d1092 100644 --- a/vault/seal/alicloudkms/alicloudkms.go +++ b/vault/seal/alicloudkms/alicloudkms.go @@ -16,7 +16,7 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/services/kms" "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" "github.com/hashicorp/vault/vault/seal" ) diff --git a/vault/seal/alicloudkms/alicloudkms_acc_test.go b/vault/seal/alicloudkms/alicloudkms_acc_test.go index 656167845e..fe24ee8f72 100644 --- a/vault/seal/alicloudkms/alicloudkms_acc_test.go +++ b/vault/seal/alicloudkms/alicloudkms_acc_test.go @@ -7,7 +7,7 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" ) // This test executes real calls. The calls themselves should be free, diff --git a/vault/seal/alicloudkms/alicloudkms_test.go b/vault/seal/alicloudkms/alicloudkms_test.go index 0449497edf..8c9f3541df 100644 --- a/vault/seal/alicloudkms/alicloudkms_test.go +++ b/vault/seal/alicloudkms/alicloudkms_test.go @@ -10,7 +10,7 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/services/kms" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" ) const aliCloudTestKeyID = "foo" diff --git a/vault/seal/awskms/awskms.go b/vault/seal/awskms/awskms.go index af4a6a3444..7bfae3f4c6 100644 --- a/vault/seal/awskms/awskms.go +++ b/vault/seal/awskms/awskms.go @@ -19,7 +19,7 @@ import ( cleanhttp "github.com/hashicorp/go-cleanhttp" log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/helper/awsutil" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" "github.com/hashicorp/vault/vault/seal" ) diff --git a/vault/seal/awskms/awskms_test.go b/vault/seal/awskms/awskms_test.go index 1b2a45c6b9..1747cc6969 100644 --- a/vault/seal/awskms/awskms_test.go +++ b/vault/seal/awskms/awskms_test.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/aws" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" ) func TestAWSKMSSeal(t *testing.T) { diff --git a/vault/seal/awskms/testing.go b/vault/seal/awskms/testing.go index 96198d3774..252e11e836 100644 --- a/vault/seal/awskms/testing.go +++ b/vault/seal/awskms/testing.go @@ -8,7 +8,7 @@ import ( "github.com/aws/aws-sdk-go/service/kms" "github.com/aws/aws-sdk-go/service/kms/kmsiface" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" ) const awsTestKeyID = "foo" diff --git a/vault/seal/azurekeyvault/azurekeyvault.go b/vault/seal/azurekeyvault/azurekeyvault.go index 010c68d5fe..a3614158c0 100644 --- a/vault/seal/azurekeyvault/azurekeyvault.go +++ b/vault/seal/azurekeyvault/azurekeyvault.go @@ -19,7 +19,7 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" "github.com/hashicorp/vault/vault/seal" ) diff --git a/vault/seal/azurekeyvault/azurekeyvault_acc_test.go b/vault/seal/azurekeyvault/azurekeyvault_acc_test.go index 7e51ce23aa..ef5a7a8b54 100644 --- a/vault/seal/azurekeyvault/azurekeyvault_acc_test.go +++ b/vault/seal/azurekeyvault/azurekeyvault_acc_test.go @@ -7,7 +7,7 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" ) func TestAzureKeyVault_SetConfig(t *testing.T) { diff --git a/vault/seal/gcpckms/gcpckms.go b/vault/seal/gcpckms/gcpckms.go index c95182c475..6ce8c7d47c 100644 --- a/vault/seal/gcpckms/gcpckms.go +++ b/vault/seal/gcpckms/gcpckms.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/errwrap" log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/helper/useragent" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" "github.com/hashicorp/vault/vault/seal" context "golang.org/x/net/context" "google.golang.org/api/option" diff --git a/vault/seal/gcpckms/gcpckms_acc_test.go b/vault/seal/gcpckms/gcpckms_acc_test.go index 2ea2a6a450..1781a69388 100644 --- a/vault/seal/gcpckms/gcpckms_acc_test.go +++ b/vault/seal/gcpckms/gcpckms_acc_test.go @@ -6,7 +6,7 @@ import ( "testing" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" context "golang.org/x/net/context" ) diff --git a/vault/seal/seal.go b/vault/seal/seal.go index 13552f99ca..34079444d3 100644 --- a/vault/seal/seal.go +++ b/vault/seal/seal.go @@ -3,7 +3,7 @@ package seal import ( "context" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" ) const ( diff --git a/vault/seal/seal_testing.go b/vault/seal/seal_testing.go index ff1d046ac5..52bdb51409 100644 --- a/vault/seal/seal_testing.go +++ b/vault/seal/seal_testing.go @@ -4,7 +4,7 @@ import ( "context" "github.com/hashicorp/vault/helper/xor" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" ) type TestSeal struct { diff --git a/vault/seal/transit/transit.go b/vault/seal/transit/transit.go index 2d21e6823f..bcb14ec21b 100644 --- a/vault/seal/transit/transit.go +++ b/vault/seal/transit/transit.go @@ -16,7 +16,7 @@ import ( log "github.com/hashicorp/go-hclog" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" "github.com/hashicorp/vault/vault/seal" ) diff --git a/vault/seal/transit/transit_acc_test.go b/vault/seal/transit/transit_acc_test.go index 58f86adcf2..8ee47da46e 100644 --- a/vault/seal/transit/transit_acc_test.go +++ b/vault/seal/transit/transit_acc_test.go @@ -11,7 +11,7 @@ import ( log "github.com/hashicorp/go-hclog" uuid "github.com/hashicorp/go-uuid" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/logging" "github.com/ory/dockertest" ) diff --git a/vault/seal_autoseal.go b/vault/seal_autoseal.go index 5569aa94d4..e87ac68116 100644 --- a/vault/seal_autoseal.go +++ b/vault/seal_autoseal.go @@ -9,7 +9,7 @@ import ( proto "github.com/golang/protobuf/proto" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/physical" "github.com/hashicorp/vault/vault/seal" ) diff --git a/vault/sealunwrapper.go b/vault/sealunwrapper.go index c249fd77a1..461db11e4f 100644 --- a/vault/sealunwrapper.go +++ b/vault/sealunwrapper.go @@ -9,8 +9,8 @@ import ( proto "github.com/golang/protobuf/proto" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/locksutil" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/locksutil" + "github.com/hashicorp/vault/sdk/physical" ) // NewSealUnwrapper creates a new seal unwrapper diff --git a/vault/sealunwrapper_test.go b/vault/sealunwrapper_test.go index 77c85115c7..d379135293 100644 --- a/vault/sealunwrapper_test.go +++ b/vault/sealunwrapper_test.go @@ -10,8 +10,8 @@ import ( proto "github.com/golang/protobuf/proto" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/physical" - "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/physical" + "github.com/hashicorp/vault/sdk/physical/inmem" ) func TestSealUnwrapper(t *testing.T) { diff --git a/vault/testing.go b/vault/testing.go index f7c702adab..5df858affe 100644 --- a/vault/testing.go +++ b/vault/testing.go @@ -37,19 +37,19 @@ import ( cleanhttp "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/vault/api" "github.com/hashicorp/vault/audit" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/logging" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/logging" "github.com/hashicorp/vault/helper/namespace" "github.com/hashicorp/vault/helper/reload" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" + "github.com/hashicorp/vault/sdk/physical" dbMysql "github.com/hashicorp/vault/plugins/database/mysql" dbPostgres "github.com/hashicorp/vault/plugins/database/postgresql" testing "github.com/mitchellh/go-testing-interface" - physInmem "github.com/hashicorp/vault/physical/inmem" + physInmem "github.com/hashicorp/vault/sdk/physical/inmem" ) // This file contains a number of methods that are useful for unit diff --git a/vault/token_store.go b/vault/token_store.go index d20c19f7ec..f6bb7ecba9 100644 --- a/vault/token_store.go +++ b/vault/token_store.go @@ -22,18 +22,18 @@ import ( metrics "github.com/armon/go-metrics" multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/vault/helper/base62" - "github.com/hashicorp/vault/helper/consts" + "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/identity" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/locksutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/locksutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" - "github.com/hashicorp/vault/logical/plugin/pb" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" + "github.com/hashicorp/vault/sdk/plugin/pb" "github.com/mitchellh/mapstructure" ) diff --git a/vault/token_store_test.go b/vault/token_store_test.go index e3f8e37164..d776d2edb2 100644 --- a/vault/token_store_test.go +++ b/vault/token_store_test.go @@ -19,9 +19,9 @@ import ( "github.com/hashicorp/errwrap" hclog "github.com/hashicorp/go-hclog" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/helper/locksutil" + "github.com/hashicorp/vault/sdk/helper/locksutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func TestTokenStore_CreateOrphanResponse(t *testing.T) { diff --git a/vault/ui.go b/vault/ui.go index 7a637f20a5..55034ec8ad 100644 --- a/vault/ui.go +++ b/vault/ui.go @@ -8,8 +8,8 @@ import ( "strings" "sync" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/physical" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/physical" ) const ( diff --git a/vault/ui_test.go b/vault/ui_test.go index f6f16e686e..702dde445d 100644 --- a/vault/ui_test.go +++ b/vault/ui_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" log "github.com/hashicorp/go-hclog" - "github.com/hashicorp/vault/helper/logging" - "github.com/hashicorp/vault/physical/inmem" + "github.com/hashicorp/vault/sdk/helper/logging" + "github.com/hashicorp/vault/sdk/physical/inmem" ) func TestConfig_Enabled(t *testing.T) { diff --git a/vault/wrapping.go b/vault/wrapping.go index e3e59c68de..b36359b41f 100644 --- a/vault/wrapping.go +++ b/vault/wrapping.go @@ -12,11 +12,11 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "github.com/hashicorp/vault/helper/namespace" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" jose "gopkg.in/square/go-jose.v2" squarejwt "gopkg.in/square/go-jose.v2/jwt" ) diff --git a/vault/wrapping_util.go b/vault/wrapping_util.go index 475fd35e1b..e40c5aac58 100644 --- a/vault/wrapping_util.go +++ b/vault/wrapping_util.go @@ -5,7 +5,7 @@ package vault import ( "context" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) func forwardWrapRequest(context.Context, *Core, *logical.Request, *logical.Response, *logical.Auth) (*logical.Response, error) { diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/Gopkg.lock b/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/Gopkg.lock index 2272998068..d8b819ae5a 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/Gopkg.lock @@ -448,11 +448,11 @@ "github.com/hashicorp/go-uuid", "github.com/hashicorp/vault/api", "github.com/hashicorp/vault/helper/cidrutil", - "github.com/hashicorp/vault/helper/parseutil", - "github.com/hashicorp/vault/helper/pluginutil", - "github.com/hashicorp/vault/logical", - "github.com/hashicorp/vault/logical/framework", - "github.com/hashicorp/vault/logical/plugin", + "github.com/hashicorp/vault/sdk/helper/parseutil", + "github.com/hashicorp/vault/sdk/helper/pluginutil", + "github.com/hashicorp/vault/sdk/logical", + "github.com/hashicorp/vault/sdk/framework", + "github.com/hashicorp/vault/sdk/logical/plugin", ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/backend.go b/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/backend.go index e6811c7dfd..0b87642725 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/backend.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/backend.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/hashicorp/go-cleanhttp" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/path_login.go b/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/path_login.go index d1f31161c3..e8df5940a6 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/path_login.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/path_login.go @@ -14,8 +14,8 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/services/sts" "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/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathLogin(b *backend) *framework.Path { diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/path_role.go b/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/path_role.go index 2de8aa4d90..6afb9662ff 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/path_role.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-alicloud/path_role.go @@ -7,9 +7,9 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathRole(b *backend) *framework.Path { diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-azure/Gopkg.lock b/vendor/github.com/hashicorp/vault-plugin-auth-azure/Gopkg.lock index ff1319c427..ba7a931f9f 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-azure/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-auth-azure/Gopkg.lock @@ -478,11 +478,11 @@ "github.com/hashicorp/errwrap", "github.com/hashicorp/go-cleanhttp", "github.com/hashicorp/go-hclog", - "github.com/hashicorp/vault/helper/pluginutil", + "github.com/hashicorp/vault/sdk/helper/pluginutil", "github.com/hashicorp/vault/helper/policyutil", - "github.com/hashicorp/vault/logical", - "github.com/hashicorp/vault/logical/framework", - "github.com/hashicorp/vault/logical/plugin", + "github.com/hashicorp/vault/sdk/logical", + "github.com/hashicorp/vault/sdk/framework", + "github.com/hashicorp/vault/sdk/logical/plugin", "golang.org/x/oauth2", ] solver-name = "gps-cdcl" diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-azure/backend.go b/vendor/github.com/hashicorp/vault-plugin-auth-azure/backend.go index 02fdda1e79..bc80005af1 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-azure/backend.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-azure/backend.go @@ -4,8 +4,8 @@ import ( "context" "sync" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // Factory is used by framework diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_config.go b/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_config.go index 4e5fad3890..bbf13f8b57 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_config.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_config.go @@ -3,8 +3,8 @@ package azureauth import ( "context" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfig(b *azureAuthBackend) *framework.Path { diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_login.go b/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_login.go index 8d9fdd206c..2baa129d92 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_login.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_login.go @@ -9,8 +9,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2017-12-01/compute" "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathLogin(b *azureAuthBackend) *framework.Path { diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_role.go b/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_role.go index 996e434350..174ff3eb72 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_role.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-azure/path_role.go @@ -9,8 +9,8 @@ import ( "time" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // pathsRole returns the path configurations for the CRUD operations on roles diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-azure/util.go b/vendor/github.com/hashicorp/vault-plugin-auth-azure/util.go index 6dffdea3eb..724da3944a 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-azure/util.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-azure/util.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" ) // Using the same time parsing logic from https://github.com/coreos/go-oidc diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-centrify/Gopkg.lock b/vendor/github.com/hashicorp/vault-plugin-auth-centrify/Gopkg.lock index 33d206d331..6af4d6c0d8 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-centrify/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-auth-centrify/Gopkg.lock @@ -395,11 +395,11 @@ "github.com/hashicorp/go-hclog", "github.com/hashicorp/vault/api", "github.com/hashicorp/vault/helper/password", - "github.com/hashicorp/vault/helper/pluginutil", + "github.com/hashicorp/vault/sdk/helper/pluginutil", "github.com/hashicorp/vault/helper/policyutil", - "github.com/hashicorp/vault/logical", - "github.com/hashicorp/vault/logical/framework", - "github.com/hashicorp/vault/logical/plugin", + "github.com/hashicorp/vault/sdk/logical", + "github.com/hashicorp/vault/sdk/framework", + "github.com/hashicorp/vault/sdk/logical/plugin", ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-centrify/backend.go b/vendor/github.com/hashicorp/vault-plugin-auth-centrify/backend.go index eeb95e6d8a..7b53f54ce9 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-centrify/backend.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-centrify/backend.go @@ -3,8 +3,8 @@ package centrify import ( "context" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-centrify/path_config.go b/vendor/github.com/hashicorp/vault-plugin-auth-centrify/path_config.go index 4094ceedf8..4856bf7193 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-centrify/path_config.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-centrify/path_config.go @@ -6,8 +6,8 @@ import ( "net/url" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfig(b *backend) *framework.Path { diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-centrify/path_login.go b/vendor/github.com/hashicorp/vault-plugin-auth-centrify/path_login.go index 2d00ec6dae..ff942e5036 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-centrify/path_login.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-centrify/path_login.go @@ -11,8 +11,8 @@ import ( "github.com/centrify/cloud-golang-sdk/oauth" "github.com/centrify/cloud-golang-sdk/restapi" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const sourceHeader string = "vault-plugin-auth-centrify" diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/authorizer_client_gcp.go b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/authorizer_client_gcp.go index 8f10bed789..d4ea0acf01 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/authorizer_client_gcp.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/authorizer_client_gcp.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" "google.golang.org/api/compute/v1" "google.golang.org/api/iam/v1" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/authorizer_gce.go b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/authorizer_gce.go index c0ce98de55..6e32f6b931 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/authorizer_gce.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/authorizer_gce.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" ) type client interface { diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/backend.go b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/backend.go index cdfbadd119..a151847ece 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/backend.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/backend.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/vault-plugin-auth-gcp/plugin/cache" "github.com/hashicorp/vault/helper/useragent" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "golang.org/x/oauth2" "golang.org/x/oauth2/google" "google.golang.org/api/cloudresourcemanager/v1" diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/cli.go b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/cli.go index 4f590f1a41..a2e3d43c04 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/cli.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/cli.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/go-gcp-common/gcputil" "github.com/hashicorp/vault/api" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" "golang.org/x/oauth2" "google.golang.org/api/iam/v1" "strings" diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/helpers.go b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/helpers.go index 69b3e8d9cc..920adef36f 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/helpers.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/helpers.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // validateFields verifies that no bad arguments were given to the request. diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_config.go b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_config.go index 0f2e0ccda4..f7cdd16bc3 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_config.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_config.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/go-gcp-common/gcputil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfig(b *GcpAuthBackend) *framework.Path { diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_login.go b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_login.go index df4ec89f51..8aea7013f0 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_login.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_login.go @@ -11,9 +11,9 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/go-gcp-common/gcputil" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "google.golang.org/api/cloudresourcemanager/v1" "google.golang.org/api/compute/v1" "google.golang.org/api/iam/v1" diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_role.go b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_role.go index 597e7f42c5..824a3f08f7 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_role.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-gcp/plugin/path_role.go @@ -8,11 +8,11 @@ import ( "time" "github.com/hashicorp/go-gcp-common/gcputil" - vaultconsts "github.com/hashicorp/vault/helper/consts" + vaultconsts "github.com/hashicorp/vault/sdk/helper/consts" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/Gopkg.lock b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/Gopkg.lock index e39f8bdf66..c26076c8e9 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/Gopkg.lock @@ -463,16 +463,16 @@ "github.com/hashicorp/go-sockaddr", "github.com/hashicorp/go-uuid", "github.com/hashicorp/vault/api", - "github.com/hashicorp/vault/helper/certutil", + "github.com/hashicorp/vault/sdk/helper/certutil", "github.com/hashicorp/vault/helper/cidrutil", - "github.com/hashicorp/vault/helper/logging", - "github.com/hashicorp/vault/helper/parseutil", - "github.com/hashicorp/vault/helper/pluginutil", + "github.com/hashicorp/vault/sdk/helper/logging", + "github.com/hashicorp/vault/sdk/helper/parseutil", + "github.com/hashicorp/vault/sdk/helper/pluginutil", "github.com/hashicorp/vault/helper/policyutil", - "github.com/hashicorp/vault/helper/strutil", - "github.com/hashicorp/vault/logical", - "github.com/hashicorp/vault/logical/framework", - "github.com/hashicorp/vault/logical/plugin", + "github.com/hashicorp/vault/sdk/helper/strutil", + "github.com/hashicorp/vault/sdk/logical", + "github.com/hashicorp/vault/sdk/framework", + "github.com/hashicorp/vault/sdk/logical/plugin", "github.com/mitchellh/pointerstructure", "github.com/patrickmn/go-cache", "golang.org/x/oauth2", diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/backend.go b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/backend.go index d20f3ff404..4baa3f0bbe 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/backend.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/backend.go @@ -6,8 +6,8 @@ import ( "time" oidc "github.com/coreos/go-oidc" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" cache "github.com/patrickmn/go-cache" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/claims.go b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/claims.go index 50438f2add..a17a4d0371 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/claims.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/claims.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" log "github.com/hashicorp/go-hclog" "github.com/mitchellh/pointerstructure" diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_config.go b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_config.go index c3d626406a..ee4afe6bd3 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_config.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_config.go @@ -12,9 +12,9 @@ import ( oidc "github.com/coreos/go-oidc" "github.com/hashicorp/errwrap" cleanhttp "github.com/hashicorp/go-cleanhttp" - "github.com/hashicorp/vault/helper/certutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/certutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "golang.org/x/oauth2" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_login.go b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_login.go index f7823b04e4..5708c462cc 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_login.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_login.go @@ -9,8 +9,8 @@ import ( "github.com/coreos/go-oidc" "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/logical" + "github.com/hashicorp/vault/sdk/framework" "gopkg.in/square/go-jose.v2/jwt" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_oidc.go b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_oidc.go index 69c6cb5a95..3c34dcbf07 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_oidc.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_oidc.go @@ -8,13 +8,13 @@ import ( "time" "github.com/hashicorp/vault/helper/cidrutil" - "github.com/hashicorp/vault/helper/strutil" + "github.com/hashicorp/vault/sdk/helper/strutil" "github.com/coreos/go-oidc" "github.com/hashicorp/errwrap" "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "golang.org/x/oauth2" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_role.go b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_role.go index 3b76955ed0..4e15c212ca 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_role.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_role.go @@ -8,11 +8,11 @@ import ( "time" sockaddr "github.com/hashicorp/go-sockaddr" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) var reservedMetadata = []string{"role"} diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_ui.go b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_ui.go index 8cbe42b468..c58c9ffc02 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_ui.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-jwt/path_ui.go @@ -5,8 +5,8 @@ import ( "context" "io/ioutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathUI(b *jwtAuthBackend) *framework.Path { diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/Gopkg.lock b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/Gopkg.lock index b410810190..dd78d07192 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/Gopkg.lock @@ -472,14 +472,14 @@ "github.com/hashicorp/go-multierror", "github.com/hashicorp/go-sockaddr", "github.com/hashicorp/vault/helper/cidrutil", - "github.com/hashicorp/vault/helper/logging", - "github.com/hashicorp/vault/helper/parseutil", - "github.com/hashicorp/vault/helper/pluginutil", + "github.com/hashicorp/vault/sdk/helper/logging", + "github.com/hashicorp/vault/sdk/helper/parseutil", + "github.com/hashicorp/vault/sdk/helper/pluginutil", "github.com/hashicorp/vault/helper/policyutil", - "github.com/hashicorp/vault/helper/strutil", - "github.com/hashicorp/vault/logical", - "github.com/hashicorp/vault/logical/framework", - "github.com/hashicorp/vault/logical/plugin", + "github.com/hashicorp/vault/sdk/helper/strutil", + "github.com/hashicorp/vault/sdk/logical", + "github.com/hashicorp/vault/sdk/framework", + "github.com/hashicorp/vault/sdk/logical/plugin", "github.com/mitchellh/mapstructure", "k8s.io/api/authentication/v1", "k8s.io/apimachinery/pkg/api/errors", diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/backend.go b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/backend.go index 8d9ed2fc34..293bde86c0 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/backend.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/backend.go @@ -7,8 +7,8 @@ import ( "strings" "sync" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_config.go b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_config.go index 01f6de36c8..22ff62a073 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_config.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_config.go @@ -9,8 +9,8 @@ import ( "errors" "github.com/briankassouf/jose/jws" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // pathConfig returns the path configuration for CRUD operations on the backend diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_login.go b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_login.go index 75a60e6a14..3b3d934025 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_login.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_login.go @@ -13,9 +13,9 @@ import ( "github.com/hashicorp/errwrap" multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/vault/helper/cidrutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/mitchellh/mapstructure" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_role.go b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_role.go index 19f7a9fafe..f784eb33b1 100644 --- a/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_role.go +++ b/vendor/github.com/hashicorp/vault-plugin-auth-kubernetes/path_role.go @@ -7,11 +7,11 @@ import ( "time" "github.com/hashicorp/go-sockaddr" - "github.com/hashicorp/vault/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" "github.com/hashicorp/vault/helper/policyutil" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // pathsRole returns the path configurations for the CRUD operations on roles diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/backend.go b/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/backend.go index 7145658abd..0d01c0c06d 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/backend.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/backend.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/vault-plugin-secrets-ad/plugin/client" "github.com/hashicorp/vault-plugin-secrets-ad/plugin/util" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/patrickmn/go-cache" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_config.go b/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_config.go index 3f8e7f8f38..d30bf6ab18 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_config.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_config.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/vault-plugin-secrets-ad/plugin/client" "github.com/hashicorp/vault-plugin-secrets-ad/plugin/util" "github.com/hashicorp/vault/helper/ldaputil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_creds.go b/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_creds.go index 8e869c3470..c909191059 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_creds.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_creds.go @@ -8,8 +8,8 @@ import ( "github.com/go-errors/errors" "github.com/hashicorp/vault-plugin-secrets-ad/plugin/util" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_roles.go b/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_roles.go index 52a481ba77..21bfd0b0a2 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_roles.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_roles.go @@ -7,8 +7,8 @@ import ( "time" "github.com/go-errors/errors" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_rotate_root_creds.go b/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_rotate_root_creds.go index c26b5c5c06..b0b8d9432f 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_rotate_root_creds.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-ad/plugin/path_rotate_root_creds.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" "github.com/hashicorp/vault-plugin-secrets-ad/plugin/util" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "math" "sync/atomic" "time" diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/Gopkg.lock b/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/Gopkg.lock index bf90b35672..739449dee4 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/Gopkg.lock @@ -443,11 +443,11 @@ "github.com/hashicorp/go-hclog", "github.com/hashicorp/go-multierror", "github.com/hashicorp/go-uuid", - "github.com/hashicorp/vault/helper/jsonutil", - "github.com/hashicorp/vault/helper/pluginutil", - "github.com/hashicorp/vault/logical", - "github.com/hashicorp/vault/logical/framework", - "github.com/hashicorp/vault/logical/plugin", + "github.com/hashicorp/vault/sdk/helper/jsonutil", + "github.com/hashicorp/vault/sdk/helper/pluginutil", + "github.com/hashicorp/vault/sdk/logical", + "github.com/hashicorp/vault/sdk/framework", + "github.com/hashicorp/vault/sdk/logical/plugin", ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/backend.go b/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/backend.go index 690f10e403..0857ecb950 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/backend.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/backend.go @@ -5,8 +5,8 @@ import ( "strings" "github.com/aliyun/alibaba-cloud-sdk-go/sdk" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func Factory(ctx context.Context, conf *logical.BackendConfig) (logical.Backend, error) { diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_config.go b/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_config.go index aaee670476..06d99e89d8 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_config.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_config.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) pathConfig() *framework.Path { diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_creds.go b/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_creds.go index a2d7330948..ffc1de144e 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_creds.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_creds.go @@ -4,13 +4,13 @@ import ( "context" "errors" "fmt" - "github.com/hashicorp/vault/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/jsonutil" "math/rand" "time" "github.com/hashicorp/vault-plugin-secrets-alicloud/clients" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) pathCreds() *framework.Path { diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_roles.go b/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_roles.go index 1752720f14..2170dbc96b 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_roles.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_roles.go @@ -9,8 +9,8 @@ import ( "time" "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) pathListRoles() *framework.Path { diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_secrets.go b/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_secrets.go index ec43a72023..3159d8f4b8 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_secrets.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/path_secrets.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/go-multierror" "github.com/hashicorp/vault-plugin-secrets-alicloud/clients" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const secretType = "alicloud" diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/test_env.go b/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/test_env.go index ce0951a5f4..615f6bc400 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/test_env.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-alicloud/test_env.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) /* diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-azure/Gopkg.lock b/vendor/github.com/hashicorp/vault-plugin-secrets-azure/Gopkg.lock index 8e2565b449..948efe4783 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-azure/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-azure/Gopkg.lock @@ -446,14 +446,14 @@ "github.com/hashicorp/go-hclog", "github.com/hashicorp/go-multierror", "github.com/hashicorp/go-uuid", - "github.com/hashicorp/vault/helper/jsonutil", - "github.com/hashicorp/vault/helper/locksutil", - "github.com/hashicorp/vault/helper/logging", - "github.com/hashicorp/vault/helper/pluginutil", + "github.com/hashicorp/vault/sdk/helper/jsonutil", + "github.com/hashicorp/vault/sdk/helper/locksutil", + "github.com/hashicorp/vault/sdk/helper/logging", + "github.com/hashicorp/vault/sdk/helper/pluginutil", "github.com/hashicorp/vault/helper/useragent", - "github.com/hashicorp/vault/logical", - "github.com/hashicorp/vault/logical/framework", - "github.com/hashicorp/vault/logical/plugin", + "github.com/hashicorp/vault/sdk/logical", + "github.com/hashicorp/vault/sdk/framework", + "github.com/hashicorp/vault/sdk/logical/plugin", ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-azure/backend.go b/vendor/github.com/hashicorp/vault-plugin-secrets-azure/backend.go index 8afadb3c12..8322c4a8f4 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-azure/backend.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-azure/backend.go @@ -5,9 +5,9 @@ import ( "strings" "sync" - "github.com/hashicorp/vault/helper/locksutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/locksutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) type azureSecretBackend struct { diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-azure/client.go b/vendor/github.com/hashicorp/vault-plugin-secrets-azure/client.go index 2ef161c71c..eb4100430f 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-azure/client.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-azure/client.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/errwrap" multierror "github.com/hashicorp/go-multierror" uuid "github.com/hashicorp/go-uuid" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) const ( diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-azure/path_config.go b/vendor/github.com/hashicorp/vault-plugin-secrets-azure/path_config.go index 1454ff11eb..473e2ffb14 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-azure/path_config.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-azure/path_config.go @@ -6,8 +6,8 @@ import ( "github.com/Azure/go-autorest/autorest/azure" multierror "github.com/hashicorp/go-multierror" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-azure/path_roles.go b/vendor/github.com/hashicorp/vault-plugin-secrets-azure/path_roles.go index d18ca141e1..9dab55ce6a 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-azure/path_roles.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-azure/path_roles.go @@ -10,9 +10,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/preview/authorization/mgmt/2018-01-01-preview/authorization" "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-azure/path_service_principal.go b/vendor/github.com/hashicorp/vault-plugin-secrets-azure/path_service_principal.go index 82974a720b..43d2fde102 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-azure/path_service_principal.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-azure/path_service_principal.go @@ -8,9 +8,9 @@ import ( "github.com/Azure/go-autorest/autorest/to" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/locksutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/locksutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/backend.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/backend.go index b428418196..ea5c456d71 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/backend.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/backend.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/vault-plugin-auth-gcp/plugin/cache" "github.com/hashicorp/vault-plugin-secrets-gcp/plugin/iamutil" "github.com/hashicorp/vault/helper/useragent" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "golang.org/x/oauth2" "golang.org/x/oauth2/google" "google.golang.org/api/iam/v1" diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/path_config.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/path_config.go index 8a5913c4d6..e2dee5c565 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/path_config.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/path_config.go @@ -6,8 +6,8 @@ import ( "time" "github.com/hashicorp/go-gcp-common/gcputil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func pathConfig(b *backend) *framework.Path { diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/path_role_set.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/path_role_set.go index 89b536d9c2..c25e908397 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/path_role_set.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/path_role_set.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/vault-plugin-secrets-gcp/plugin/iamutil" "github.com/hashicorp/vault-plugin-secrets-gcp/plugin/util" "github.com/hashicorp/vault/helper/useragent" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "google.golang.org/api/iam/v1" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/role_set.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/role_set.go index fad0dcd74c..8353638b6d 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/role_set.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/role_set.go @@ -16,8 +16,8 @@ import ( "github.com/hashicorp/vault-plugin-secrets-gcp/plugin/iamutil" "github.com/hashicorp/vault-plugin-secrets-gcp/plugin/util" "github.com/hashicorp/vault/helper/useragent" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "google.golang.org/api/iam/v1" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/rollback.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/rollback.go index 856f183add..474078a119 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/rollback.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/rollback.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/vault-plugin-secrets-gcp/plugin/iamutil" "github.com/hashicorp/vault-plugin-secrets-gcp/plugin/util" "github.com/hashicorp/vault/helper/useragent" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/mitchellh/mapstructure" "google.golang.org/api/googleapi" "google.golang.org/api/iam/v1" diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/secrets_access_token.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/secrets_access_token.go index 9e6ac23038..e8c0285759 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/secrets_access_token.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/secrets_access_token.go @@ -8,8 +8,8 @@ import ( "time" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "golang.org/x/oauth2" "golang.org/x/oauth2/google" "google.golang.org/api/iam/v1" diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/secrets_service_account_key.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/secrets_service_account_key.go index aa5292ed18..88ddc0d793 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/secrets_service_account_key.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcp/plugin/secrets_service_account_key.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "google.golang.org/api/iam/v1" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/Gopkg.lock b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/Gopkg.lock index 7bc2fa176e..8e4c7ac894 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/Gopkg.lock @@ -516,12 +516,12 @@ "github.com/hashicorp/errwrap", "github.com/hashicorp/go-hclog", "github.com/hashicorp/go-multierror", - "github.com/hashicorp/vault/helper/pluginutil", - "github.com/hashicorp/vault/helper/strutil", + "github.com/hashicorp/vault/sdk/helper/pluginutil", + "github.com/hashicorp/vault/sdk/helper/strutil", "github.com/hashicorp/vault/helper/useragent", - "github.com/hashicorp/vault/logical", - "github.com/hashicorp/vault/logical/framework", - "github.com/hashicorp/vault/logical/plugin", + "github.com/hashicorp/vault/sdk/logical", + "github.com/hashicorp/vault/sdk/framework", + "github.com/hashicorp/vault/sdk/logical/plugin", "github.com/jeffchao/backoff", "github.com/satori/go.uuid", "golang.org/x/oauth2/google", diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/backend.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/backend.go index c10ee9cc49..a311621df8 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/backend.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/backend.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/errwrap" "github.com/hashicorp/vault/helper/useragent" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "golang.org/x/oauth2/google" "google.golang.org/api/option" diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/config.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/config.go index 0c4b1bc863..da9d9efd0f 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/config.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/config.go @@ -3,8 +3,8 @@ package gcpkms import ( "strings" - "github.com/hashicorp/vault/helper/strutil" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/strutil" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/helpers.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/helpers.go index ee5700786e..cc6cb0433c 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/helpers.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/helpers.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/jeffchao/backoff" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/key.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/key.go index ab40e56a53..c4d41ee1fa 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/key.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/key.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" + "github.com/hashicorp/vault/sdk/logical" ) var ( diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_config.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_config.go index 1950a1bd85..d87954cfd3 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_config.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_config.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // pathConfig defines the gcpkms/config base path on the backend. diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_decrypt.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_decrypt.go index 8729952170..bb44c0ccaa 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_decrypt.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_decrypt.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_encrypt.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_encrypt.go index 40fda9f9dc..474164edfd 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_encrypt.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_encrypt.go @@ -7,8 +7,8 @@ import ( "path" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys.go index 5cc5c0579b..5ece3a2362 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys.go @@ -13,8 +13,8 @@ import ( "github.com/golang/protobuf/ptypes/duration" "github.com/golang/protobuf/ptypes/timestamp" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "google.golang.org/api/iterator" "google.golang.org/genproto/protobuf/field_mask" diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_config.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_config.go index 52f5798e74..f6c12b4395 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_config.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_config.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) pathKeysConfigCRUD() *framework.Path { diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_deregister.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_deregister.go index 7b8cb2064b..7c42f6c5fe 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_deregister.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_deregister.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *backend) pathKeysDeregister() *framework.Path { diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_register.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_register.go index 074d344ff3..016636566b 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_register.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_register.go @@ -4,8 +4,8 @@ import ( "context" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_rotate.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_rotate.go index 7defa2ce3d..bc78a20162 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_rotate.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_rotate.go @@ -5,8 +5,8 @@ import ( "path" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_trim.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_trim.go index c85006ec0c..275daa3b60 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_trim.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_trim.go @@ -9,8 +9,8 @@ import ( "github.com/gammazero/workerpool" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "google.golang.org/api/iterator" multierror "github.com/hashicorp/go-multierror" diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_verify.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_verify.go index a7403a880b..7709dd47dc 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_verify.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_keys_verify.go @@ -13,8 +13,8 @@ import ( "math/big" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_pubkey.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_pubkey.go index 37a5bee956..aa11ce4bc8 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_pubkey.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_pubkey.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_reencrypt.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_reencrypt.go index df47217b32..9bbb429684 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_reencrypt.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_reencrypt.go @@ -7,8 +7,8 @@ import ( "path" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_sign.go b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_sign.go index ee6d059052..893576e69d 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_sign.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-gcpkms/path_sign.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/Gopkg.lock b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/Gopkg.lock index 1c17840f96..5726642697 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/Gopkg.lock +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/Gopkg.lock @@ -385,18 +385,18 @@ "github.com/golang/protobuf/ptypes", "github.com/golang/protobuf/ptypes/timestamp", "github.com/hashicorp/go-hclog", - "github.com/hashicorp/vault/helper/consts", - "github.com/hashicorp/vault/helper/jsonutil", - "github.com/hashicorp/vault/helper/keysutil", - "github.com/hashicorp/vault/helper/locksutil", - "github.com/hashicorp/vault/helper/logging", - "github.com/hashicorp/vault/helper/parseutil", - "github.com/hashicorp/vault/helper/pluginutil", - "github.com/hashicorp/vault/helper/salt", - "github.com/hashicorp/vault/helper/wrapping", - "github.com/hashicorp/vault/logical", - "github.com/hashicorp/vault/logical/framework", - "github.com/hashicorp/vault/logical/plugin", + "github.com/hashicorp/vault/sdk/helper/consts", + "github.com/hashicorp/vault/sdk/helper/jsonutil", + "github.com/hashicorp/vault/sdk/helper/keysutil", + "github.com/hashicorp/vault/sdk/helper/locksutil", + "github.com/hashicorp/vault/sdk/helper/logging", + "github.com/hashicorp/vault/sdk/helper/parseutil", + "github.com/hashicorp/vault/sdk/helper/pluginutil", + "github.com/hashicorp/vault/sdk/helper/salt", + "github.com/hashicorp/vault/sdk/helper/wrapping", + "github.com/hashicorp/vault/sdk/logical", + "github.com/hashicorp/vault/sdk/framework", + "github.com/hashicorp/vault/sdk/logical/plugin", "github.com/mitchellh/mapstructure", ] solver-name = "gps-cdcl" diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/backend.go b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/backend.go index c9d6c5c540..9252711cb6 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/backend.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/backend.go @@ -11,11 +11,11 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" "github.com/golang/protobuf/ptypes/timestamp" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/helper/locksutil" - "github.com/hashicorp/vault/helper/salt" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/helper/locksutil" + "github.com/hashicorp/vault/sdk/helper/salt" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) const ( diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/passthrough.go b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/passthrough.go index 1be5fcb608..5164132a97 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/passthrough.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/passthrough.go @@ -6,11 +6,11 @@ import ( "fmt" "strings" - "github.com/hashicorp/vault/helper/jsonutil" - "github.com/hashicorp/vault/helper/parseutil" - "github.com/hashicorp/vault/helper/wrapping" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/jsonutil" + "github.com/hashicorp/vault/sdk/helper/parseutil" + "github.com/hashicorp/vault/sdk/helper/wrapping" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) type Passthrough interface { diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_config.go b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_config.go index 24440a8289..366344bab3 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_config.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_config.go @@ -5,8 +5,8 @@ import ( "path" "github.com/golang/protobuf/proto" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // pathConfig returns the path configuration for CRUD operations on the backend diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_data.go b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_data.go index b03e3b42ca..6b24a830b4 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_data.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_data.go @@ -11,9 +11,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" "github.com/golang/protobuf/ptypes/timestamp" - "github.com/hashicorp/vault/helper/locksutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/locksutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" "github.com/mitchellh/mapstructure" ) diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_delete.go b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_delete.go index 4ec1f014c2..2862e07712 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_delete.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_delete.go @@ -5,9 +5,9 @@ import ( "time" "github.com/golang/protobuf/ptypes" - "github.com/hashicorp/vault/helper/locksutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/locksutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // pathsDelete returns the path configuration for the delete and undelete paths diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_destroy.go b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_destroy.go index 4a6add5a09..7217fb497a 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_destroy.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_destroy.go @@ -3,9 +3,9 @@ package kv import ( "context" - "github.com/hashicorp/vault/helper/locksutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/locksutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // pathDestroy returns the path configuration for the destroy endpoint diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_metadata.go b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_metadata.go index c98b077837..5f84229184 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_metadata.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/path_metadata.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/golang/protobuf/ptypes" - "github.com/hashicorp/vault/helper/locksutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/locksutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) // pathMetadata returns the path configuration for CRUD operations on the diff --git a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/upgrade.go b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/upgrade.go index 2d2d5bfc19..2ac00c0f01 100644 --- a/vendor/github.com/hashicorp/vault-plugin-secrets-kv/upgrade.go +++ b/vendor/github.com/hashicorp/vault-plugin-secrets-kv/upgrade.go @@ -12,12 +12,12 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" "github.com/hashicorp/errwrap" - "github.com/hashicorp/vault/helper/consts" - "github.com/hashicorp/vault/helper/keysutil" - "github.com/hashicorp/vault/helper/locksutil" - "github.com/hashicorp/vault/helper/pluginutil" - "github.com/hashicorp/vault/logical" - "github.com/hashicorp/vault/logical/framework" + "github.com/hashicorp/vault/sdk/helper/consts" + "github.com/hashicorp/vault/sdk/helper/keysutil" + "github.com/hashicorp/vault/sdk/helper/locksutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" + "github.com/hashicorp/vault/sdk/logical" + "github.com/hashicorp/vault/sdk/framework" ) func (b *versionedKVBackend) perfSecondaryCheck() bool { diff --git a/version/version_base.go b/version/version_base.go deleted file mode 100644 index 4e0ccfe146..0000000000 --- a/version/version_base.go +++ /dev/null @@ -1,11 +0,0 @@ -package version - -func init() { - // The main version number that is being run at the moment. - Version = "1.1.1" - - // A pre-release marker for the version. If this is "" (empty string) - // then it means that it is a final release. Otherwise, this is a pre-release - // such as "dev" (in development), "beta", "rc1", etc. - VersionPrerelease = "" -} diff --git a/website/source/docs/internals/plugins.html.md b/website/source/docs/internals/plugins.html.md index 49b577814e..e6484a3c50 100644 --- a/website/source/docs/internals/plugins.html.md +++ b/website/source/docs/internals/plugins.html.md @@ -128,12 +128,12 @@ package main import ( "os" - "github.com/hashicorp/vault/helper/pluginutil" + "github.com/hashicorp/vault/sdk/helper/pluginutil" "github.com/hashicorp/vault/plugins" ) func main() { - apiClientMeta := &pluginutil.APIClientMeta{} + apiClientMeta := &api.APIClientMeta{} flags := apiClientMeta.FlagSet() flags.Parse(os.Args) diff --git a/website/source/guides/operations/plugin-backends.html.md b/website/source/guides/operations/plugin-backends.html.md index 46a45f28fc..8a284d8779 100644 --- a/website/source/guides/operations/plugin-backends.html.md +++ b/website/source/guides/operations/plugin-backends.html.md @@ -46,7 +46,7 @@ Download the source (you would probably use your own plugin): ```sh $ go get -f -u -d github.com/hashicorp/vault # ... -$ cd $GOPATH/src/github.com/hashicorp/vault/logical/plugin/mock/mock-plugin +$ cd $GOPATH/src/github.com/hashicorp/vault/sdk/plugin/mock/mock-plugin ``` Compile the plugin: diff --git a/website/source/guides/operations/seal-wrap.html.md b/website/source/guides/operations/seal-wrap.html.md index 572bc46a83..e811730e31 100644 --- a/website/source/guides/operations/seal-wrap.html.md +++ b/website/source/guides/operations/seal-wrap.html.md @@ -595,10 +595,10 @@ SSH into the machine where the Vault server is running, and check the stored values in the `/tmp/vault` directory. ```plaintext -$ cd /tmp/vault/logical +$ cd /tmp/vault/sdk/logical ``` -Under the `/tmp/vault/logical` directory, there are two sub-directories. One +Under the `/tmp/vault/sdk/logical` directory, there are two sub-directories. One maps to `secret/` and another maps to `secret2/` although you cannot tell by the folder names.