From 199976d55bdc871a0ac0ede39fed6ee42db4395a Mon Sep 17 00:00:00 2001 From: Gregory Hill Date: Mon, 24 Feb 2020 10:27:07 +0000 Subject: [PATCH] v8 release notes Signed-off-by: Gregory Hill --- .github/workflows/release.yaml | 2 +- Makefile | 2 +- api/api.pb.go | 10 +- cmd/hoarctl/encryption.go | 6 +- cmd/hoarctl/grants.go | 6 +- cmd/hoarctl/main.go | 12 +- cmd/hoarctl/store.go | 4 +- cmd/hoard/config.go | 4 +- cmd/hoard/main.go | 6 +- cmd/hoard/stores.go | 8 +- cmd/version.go | 2 +- config/filesystem.go | 2 +- config/logging.go | 4 +- config/logging_test.go | 2 +- config/secrets_test.go | 2 +- config/storage.go | 2 +- go.mod | 4 +- go.sum | 14 + grant/grant.go | 4 +- grant/grant.pb.go | 6 +- grant/grant_test.go | 6 +- grant/openpgp.go | 4 +- grant/openpgp_test.go | 2 +- grant/plaintext.go | 2 +- grant/symmetric.go | 4 +- grant/symmetric_test.go | 4 +- hoard-js/proto/api_pb.js | 343 ++++++++++-------------- hoard-js/proto/grant_pb.js | 186 ++++++------- hoard-js/proto/reference_pb.js | 14 +- hoard-js/proto/stores_pb.js | 14 +- hoard.go | 10 +- hoard_test.go | 6 +- logging/convention.go | 2 +- logging/loggers/vector_valued_logger.go | 2 +- logging/metadata.go | 2 +- project/cmd/changelog/main.go | 2 +- project/cmd/notes/main.go | 2 +- project/cmd/version/main.go | 2 +- project/history.go | 18 ++ protobuf/api.proto | 2 +- protobuf/grant.proto | 2 +- protobuf/reference.proto | 2 +- protobuf/stores.proto | 2 +- reference/reference.pb.go | 4 +- server/server.go | 12 +- service.go | 8 +- service_test.go | 12 +- stores/cloud/cloud.go | 6 +- stores/cloud/cloud_test.go | 2 +- stores/ipfs/ipfs.go | 2 +- stores/logging_store.go | 2 +- stores/stores.pb.go | 4 +- stores/sync_store.go | 2 +- streaming.go | 6 +- test/helpers/server.go | 2 +- 55 files changed, 362 insertions(+), 435 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cad20d4e..8c1a3acb 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: Publish + - name: publish uses: docker://goreleaser/goreleaser env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Makefile b/Makefile index 27e5974a..8b027c79 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,7 @@ commit_hash: .PHONY: protobuf protobuf: ${PROTO_GO_FILES} ${PROTO_TS_FILES} - rsync -r .gopath/github.com/monax/hoard/v7/ ./ + rsync -r .gopath/github.com/monax/hoard/v8/ ./ rm -rf .gopath .PHONY: clean_protobuf diff --git a/api/api.pb.go b/api/api.pb.go index 27257a99..3d4b2ec6 100644 --- a/api/api.pb.go +++ b/api/api.pb.go @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" proto "github.com/gogo/protobuf/proto" - grant "github.com/monax/hoard/v7/grant" - reference "github.com/monax/hoard/v7/reference" - stores "github.com/monax/hoard/v7/stores" + grant "github.com/monax/hoard/v8/grant" + reference "github.com/monax/hoard/v8/reference" + stores "github.com/monax/hoard/v8/stores" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -415,7 +415,7 @@ var fileDescriptor_00212fb1f9d3bf1c = []byte{ // 586 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x5f, 0x8b, 0xd3, 0x4e, 0x14, 0x25, 0xdb, 0xfc, 0x5a, 0x72, 0xdb, 0x9f, 0xab, 0x03, 0x2e, 0x25, 0x22, 0xbb, 0xc4, 0x45, - 0x2a, 0x2e, 0x69, 0x89, 0x88, 0xb0, 0x4f, 0xee, 0x6e, 0x65, 0xf5, 0x45, 0xca, 0x54, 0x41, 0x7c, + 0x2a, 0x2e, 0x69, 0x89, 0x08, 0xb2, 0x4f, 0xee, 0x6e, 0x65, 0xf5, 0x45, 0xca, 0x54, 0x41, 0x7c, 0x9b, 0x36, 0xb7, 0x6d, 0x20, 0x4d, 0xc2, 0x64, 0xaa, 0xdb, 0x77, 0xbf, 0x8b, 0x4f, 0x7e, 0x47, 0x99, 0xc9, 0x34, 0x7f, 0xa6, 0x45, 0xe8, 0x53, 0x66, 0xce, 0x3d, 0x73, 0xee, 0xb9, 0x77, 0xee, 0x04, 0x1c, 0x96, 0x45, 0x7e, 0xc6, 0x53, 0x91, 0x92, 0x16, 0xcb, 0x22, 0xb7, 0xbb, 0xe4, 0x2c, @@ -449,7 +449,7 @@ var fileDescriptor_00212fb1f9d3bf1c = []byte{ 0x16, 0x29, 0xb9, 0x84, 0x76, 0x79, 0x37, 0x75, 0x66, 0x63, 0x77, 0x7b, 0xfe, 0xfd, 0xf9, 0x32, 0x12, 0xab, 0xcd, 0xcc, 0x9f, 0xa7, 0xeb, 0xe1, 0x3a, 0x4d, 0xd8, 0xc3, 0x70, 0x95, 0x32, 0x1e, 0x0e, 0x7f, 0xbc, 0x1b, 0xb2, 0x2c, 0x9a, 0xb5, 0xd5, 0x1f, 0xfa, 0xcd, 0xdf, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x74, 0xe2, 0x2b, 0x04, 0xdf, 0x05, 0x00, 0x00, + 0xff, 0xff, 0x41, 0x37, 0x5b, 0x23, 0xdf, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/cmd/hoarctl/encryption.go b/cmd/hoarctl/encryption.go index 6de63403..5f454754 100644 --- a/cmd/hoarctl/encryption.go +++ b/cmd/hoarctl/encryption.go @@ -6,9 +6,9 @@ import ( "os" cli "github.com/jawher/mow.cli" - "github.com/monax/hoard/v7" - "github.com/monax/hoard/v7/api" - "github.com/monax/hoard/v7/reference" + "github.com/monax/hoard/v8" + "github.com/monax/hoard/v8/api" + "github.com/monax/hoard/v8/reference" ) // Decrypt does what it says on the tin diff --git a/cmd/hoarctl/grants.go b/cmd/hoarctl/grants.go index 629716c5..719a85e8 100644 --- a/cmd/hoarctl/grants.go +++ b/cmd/hoarctl/grants.go @@ -6,9 +6,9 @@ import ( "os" cli "github.com/jawher/mow.cli" - "github.com/monax/hoard/v7" - "github.com/monax/hoard/v7/api" - "github.com/monax/hoard/v7/grant" + "github.com/monax/hoard/v8" + "github.com/monax/hoard/v8/api" + "github.com/monax/hoard/v8/grant" ) // PutSeal encrypts and stores data then prints a grant diff --git a/cmd/hoarctl/main.go b/cmd/hoarctl/main.go index c2b9b54d..31dbd057 100644 --- a/cmd/hoarctl/main.go +++ b/cmd/hoarctl/main.go @@ -10,14 +10,14 @@ import ( "net" "os" - "github.com/monax/hoard/v7/api" + "github.com/monax/hoard/v8/api" cli "github.com/jawher/mow.cli" - "github.com/monax/hoard/v7/cmd" - "github.com/monax/hoard/v7/config" - "github.com/monax/hoard/v7/grant" - "github.com/monax/hoard/v7/reference" - "github.com/monax/hoard/v7/server" + "github.com/monax/hoard/v8/cmd" + "github.com/monax/hoard/v8/config" + "github.com/monax/hoard/v8/grant" + "github.com/monax/hoard/v8/reference" + "github.com/monax/hoard/v8/server" "google.golang.org/grpc" ) diff --git a/cmd/hoarctl/store.go b/cmd/hoarctl/store.go index e8571f31..47f97e91 100644 --- a/cmd/hoarctl/store.go +++ b/cmd/hoarctl/store.go @@ -6,8 +6,8 @@ import ( "os" cli "github.com/jawher/mow.cli" - hoard "github.com/monax/hoard/v7" - "github.com/monax/hoard/v7/api" + hoard "github.com/monax/hoard/v8" + "github.com/monax/hoard/v8/api" ) // Cat retrieves encrypted data from store diff --git a/cmd/hoard/config.go b/cmd/hoard/config.go index 5459f052..7159b91d 100644 --- a/cmd/hoard/config.go +++ b/cmd/hoard/config.go @@ -6,8 +6,8 @@ import ( "github.com/cep21/xdgbasedir" cli "github.com/jawher/mow.cli" - "github.com/monax/hoard/v7/config" - "github.com/monax/hoard/v7/encryption" + "github.com/monax/hoard/v8/config" + "github.com/monax/hoard/v8/encryption" ) func Config(cmd *cli.Cmd) { diff --git a/cmd/hoard/main.go b/cmd/hoard/main.go index 967077fc..a3bcbb19 100644 --- a/cmd/hoard/main.go +++ b/cmd/hoard/main.go @@ -9,9 +9,9 @@ import ( "github.com/go-kit/kit/log" cli "github.com/jawher/mow.cli" - "github.com/monax/hoard/v7/cmd" - "github.com/monax/hoard/v7/config" - "github.com/monax/hoard/v7/server" + "github.com/monax/hoard/v8/cmd" + "github.com/monax/hoard/v8/config" + "github.com/monax/hoard/v8/server" ) func main() { diff --git a/cmd/hoard/stores.go b/cmd/hoard/stores.go index d92ed290..5a0408d6 100644 --- a/cmd/hoard/stores.go +++ b/cmd/hoard/stores.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/go-kit/kit/log" - "github.com/monax/hoard/v7/config" - "github.com/monax/hoard/v7/stores" - "github.com/monax/hoard/v7/stores/cloud" - "github.com/monax/hoard/v7/stores/ipfs" + "github.com/monax/hoard/v8/config" + "github.com/monax/hoard/v8/stores" + "github.com/monax/hoard/v8/stores/cloud" + "github.com/monax/hoard/v8/stores/ipfs" ) func StoreFromStorageConfig(storageConfig *config.Storage, logger log.Logger) (stores.NamedStore, error) { diff --git a/cmd/version.go b/cmd/version.go index 138156bd..fc0d894c 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -4,7 +4,7 @@ import ( "fmt" cli "github.com/jawher/mow.cli" - "github.com/monax/hoard/v7/project" + "github.com/monax/hoard/v8/project" ) func AddVersionCommand(cmd *cli.Cli) { diff --git a/config/filesystem.go b/config/filesystem.go index 31b63d6c..8759d094 100644 --- a/config/filesystem.go +++ b/config/filesystem.go @@ -4,7 +4,7 @@ import ( "fmt" "path" - "github.com/monax/hoard/v7/stores" + "github.com/monax/hoard/v8/stores" "github.com/cep21/xdgbasedir" ) diff --git a/config/logging.go b/config/logging.go index 306b259b..6e4ca40f 100644 --- a/config/logging.go +++ b/config/logging.go @@ -7,8 +7,8 @@ import ( "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/term" - "github.com/monax/hoard/v7/logging/loggers" - "github.com/monax/hoard/v7/logging/structure" + "github.com/monax/hoard/v8/logging/loggers" + "github.com/monax/hoard/v8/logging/structure" ) type LoggingType string diff --git a/config/logging_test.go b/config/logging_test.go index 0f1882c5..db58e539 100644 --- a/config/logging_test.go +++ b/config/logging_test.go @@ -5,7 +5,7 @@ import ( "bytes" - "github.com/monax/hoard/v7/logging/structure" + "github.com/monax/hoard/v8/logging/structure" "github.com/stretchr/testify/assert" ) diff --git a/config/secrets_test.go b/config/secrets_test.go index bc71af12..d4180ccc 100644 --- a/config/secrets_test.go +++ b/config/secrets_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/BurntSushi/toml" - "github.com/monax/hoard/v7/encryption" + "github.com/monax/hoard/v8/encryption" "github.com/stretchr/testify/assert" yaml "gopkg.in/yaml.v2" ) diff --git a/config/storage.go b/config/storage.go index 09cfb2b5..3546599c 100644 --- a/config/storage.go +++ b/config/storage.go @@ -3,7 +3,7 @@ package config import ( "fmt" - "github.com/monax/hoard/v7/stores" + "github.com/monax/hoard/v8/stores" "bytes" diff --git a/go.mod b/go.mod index 58b2f824..1408aea5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/monax/hoard/v7 +module github.com/monax/hoard/v8 go 1.13 @@ -10,13 +10,13 @@ require ( github.com/aws/aws-sdk-go v1.25.43 github.com/cep21/xdgbasedir v0.0.0-20170329171747-21470bfc93b9 github.com/eapache/channels v1.1.0 - github.com/eapache/queue v1.1.0 // indirect github.com/go-kit/kit v0.9.0 github.com/go-logfmt/logfmt v0.5.0 // indirect github.com/go-stack/stack v1.8.0 github.com/gogo/protobuf v1.3.1 github.com/golang/protobuf v1.3.2 github.com/jawher/mow.cli v1.1.0 + github.com/monax/hoard/v7 v7.2.0 // indirect github.com/monax/relic v2.0.0+incompatible github.com/pkg/errors v0.9.1 // indirect github.com/stretchr/testify v1.4.0 diff --git a/go.sum b/go.sum index 8bdc77ed..f50f9273 100644 --- a/go.sum +++ b/go.sum @@ -47,6 +47,7 @@ github.com/eapache/channels v1.1.0 h1:F1taHcn7/F0i8DYqKXJnyhJcVpp2kgFcNePxXtnyu4 github.com/eapache/channels v1.1.0/go.mod h1:jMm2qB5Ubtg9zLd+inMZd2/NUvXgzmWXsDaLyQIGfH0= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -57,6 +58,7 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -96,6 +98,7 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+ github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.2 h1:S+ef0492XaIknb8LMjcwgW2i3cNTzDYMmDrOThOJNWc= github.com/grpc-ecosystem/grpc-gateway v1.9.2/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/h2non/filetype v1.0.10/go.mod h1:isekKqOuhMj+s/7r3rIeTErIRy4Rub5uBWHfvMusLMU= 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= @@ -108,6 +111,7 @@ github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqx github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -121,8 +125,14 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/monax/hoard v3.0.1+incompatible h1:Mfxm/5Kvu3pp2J0WyEm70pP+TwXJC6fTd3vMbFqd33Y= +github.com/monax/hoard/v7 v7.2.0 h1:HaMELdvjEw+HRSAfDoAPzEMWT402DIrAzlqCxJ4PjkI= +github.com/monax/hoard/v7 v7.2.0/go.mod h1:0RAwlPmI5Dr1djP3l0oaYwc5C33KAhX0WAlFinvQDso= github.com/monax/relic v2.0.0+incompatible h1:5q+fw8Y7UJJuOBzGV5bZNlBk9k9ii6fzmdpwXsZKMdg= github.com/monax/relic v2.0.0+incompatible/go.mod h1:ZJcXg8m9tYkd2h6VeEZruhRUQPklFKbzFaTxyXrXxVk= +github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= +github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= +github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -149,6 +159,7 @@ gocloud.dev v0.18.0 h1:HX6uFZYZs9tUP87jzoWgB8dl4ihsRpiAsBDKTthiApY= gocloud.dev v0.18.0/go.mod h1:lhLOb91+9tKB8RnNlsx+weJGEd0AHM94huK1bmrhPwM= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -238,14 +249,17 @@ google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiq google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/grant/grant.go b/grant/grant.go index d7e05355..59ef7d9d 100644 --- a/grant/grant.go +++ b/grant/grant.go @@ -3,8 +3,8 @@ package grant import ( "fmt" - "github.com/monax/hoard/v7/config" - "github.com/monax/hoard/v7/reference" + "github.com/monax/hoard/v8/config" + "github.com/monax/hoard/v8/reference" ) const defaultGrantVersion = 2 diff --git a/grant/grant.pb.go b/grant/grant.pb.go index 2ba428e7..012e0653 100644 --- a/grant/grant.pb.go +++ b/grant/grant.pb.go @@ -251,7 +251,7 @@ var fileDescriptor_d8d80872b3060482 = []byte{ // 277 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0xcf, 0x4b, 0xc3, 0x30, 0x14, 0xa6, 0x6a, 0x9d, 0x7d, 0x75, 0x08, 0xd1, 0x43, 0x11, 0x61, 0xb5, 0xa7, 0xc2, 0xa4, 0x95, - 0x7a, 0xf0, 0x2e, 0xca, 0x10, 0x0f, 0x96, 0x0c, 0x3c, 0x78, 0x6b, 0xb3, 0xe7, 0x16, 0x58, 0x93, + 0x7a, 0xf1, 0x2c, 0xca, 0x10, 0x0f, 0x96, 0x0c, 0x3c, 0x78, 0x6b, 0xb3, 0xe7, 0x16, 0x58, 0x93, 0x92, 0x65, 0xb2, 0xfe, 0x2f, 0xfe, 0xb1, 0xd2, 0x34, 0x6b, 0x1d, 0x78, 0xcb, 0xf7, 0xeb, 0x7d, 0x1f, 0x04, 0xfc, 0xa5, 0x2a, 0x84, 0x4e, 0x6a, 0x25, 0xb5, 0x24, 0xae, 0x01, 0x91, 0x06, 0x77, 0xd6, 0x3e, 0xc8, 0x04, 0x4e, 0xe6, 0x35, 0xb2, 0xc0, 0x09, 0x9d, 0xd8, 0xcf, 0xfc, 0xa4, 0xf3, @@ -265,6 +265,6 @@ var fileDescriptor_d8d80872b3060482 = []byte{ 0x6d, 0xb9, 0xe6, 0xec, 0xf5, 0xd9, 0xcc, 0xf6, 0x68, 0x8f, 0xa3, 0x29, 0xf8, 0x7f, 0xae, 0x92, 0x1b, 0xf0, 0x3a, 0xe9, 0x0d, 0x1b, 0xeb, 0x1d, 0x88, 0xa7, 0xdb, 0xcf, 0xc9, 0x92, 0xeb, 0xd5, 0xb6, 0x4c, 0x98, 0xac, 0xd2, 0x4a, 0x8a, 0x62, 0x97, 0xae, 0x64, 0xa1, 0x16, 0xe9, 0xf7, 0x63, - 0x6a, 0x26, 0x96, 0xa7, 0xe6, 0xc3, 0x1e, 0x7e, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x06, 0x42, - 0xa6, 0xbf, 0x01, 0x00, 0x00, + 0x6a, 0x26, 0x96, 0xa7, 0xe6, 0xc3, 0x1e, 0x7e, 0x03, 0x00, 0x00, 0xff, 0xff, 0x6a, 0xc5, 0xca, + 0xf2, 0xbf, 0x01, 0x00, 0x00, } diff --git a/grant/grant_test.go b/grant/grant_test.go index a69463ec..6ca096a2 100644 --- a/grant/grant_test.go +++ b/grant/grant_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/monax/hoard/v7/config" - "github.com/monax/hoard/v7/encryption" - "github.com/monax/hoard/v7/reference" + "github.com/monax/hoard/v8/config" + "github.com/monax/hoard/v8/encryption" + "github.com/monax/hoard/v8/reference" "github.com/stretchr/testify/assert" "github.com/test-go/testify/require" ) diff --git a/grant/openpgp.go b/grant/openpgp.go index 3728ca4f..7b4d3063 100644 --- a/grant/openpgp.go +++ b/grant/openpgp.go @@ -5,13 +5,13 @@ import ( "fmt" "strconv" - "github.com/monax/hoard/v7/config" + "github.com/monax/hoard/v8/config" "bytes" "io" "io/ioutil" - "github.com/monax/hoard/v7/reference" + "github.com/monax/hoard/v8/reference" "golang.org/x/crypto/openpgp" "golang.org/x/crypto/openpgp/armor" ) diff --git a/grant/openpgp_test.go b/grant/openpgp_test.go index f9283b35..f6df119b 100644 --- a/grant/openpgp_test.go +++ b/grant/openpgp_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "testing" - "github.com/monax/hoard/v7/config" + "github.com/monax/hoard/v8/config" "github.com/stretchr/testify/assert" ) diff --git a/grant/plaintext.go b/grant/plaintext.go index 6ef1f5b1..2c43d72a 100644 --- a/grant/plaintext.go +++ b/grant/plaintext.go @@ -1,7 +1,7 @@ package grant import ( - "github.com/monax/hoard/v7/reference" + "github.com/monax/hoard/v8/reference" ) // PlaintextGrant returns an encoded reference diff --git a/grant/symmetric.go b/grant/symmetric.go index a1606927..8a0a53a1 100644 --- a/grant/symmetric.go +++ b/grant/symmetric.go @@ -3,8 +3,8 @@ package grant import ( "fmt" - "github.com/monax/hoard/v7/encryption" - "github.com/monax/hoard/v7/reference" + "github.com/monax/hoard/v8/encryption" + "github.com/monax/hoard/v8/reference" ) // SymmetricGrant encrypts the given reference based on a secret read from the provider store diff --git a/grant/symmetric_test.go b/grant/symmetric_test.go index 4a6b2f8b..164f3e72 100644 --- a/grant/symmetric_test.go +++ b/grant/symmetric_test.go @@ -4,8 +4,8 @@ import ( "encoding/base64" "testing" - "github.com/monax/hoard/v7/encryption" - "github.com/monax/hoard/v7/reference" + "github.com/monax/hoard/v8/encryption" + "github.com/monax/hoard/v8/reference" "github.com/stretchr/testify/assert" "github.com/test-go/testify/require" ) diff --git a/hoard-js/proto/api_pb.js b/hoard-js/proto/api_pb.js index 49486892..ef824bc4 100644 --- a/hoard-js/proto/api_pb.js +++ b/hoard-js/proto/api_pb.js @@ -12,11 +12,8 @@ var goog = jspb; var global = Function('return this')(); var grant_pb = require('./grant_pb.js'); -goog.object.extend(proto, grant_pb); var reference_pb = require('./reference_pb.js'); -goog.object.extend(proto, reference_pb); var stores_pb = require('./stores_pb.js'); -goog.object.extend(proto, stores_pb); goog.exportSymbol('proto.api.Address', null, global); goog.exportSymbol('proto.api.Ciphertext', null, global); goog.exportSymbol('proto.api.GrantAndGrantSpec', null, global); @@ -25,6 +22,7 @@ goog.exportSymbol('proto.api.Plaintext', null, global); goog.exportSymbol('proto.api.PlaintextAndGrantSpec', null, global); goog.exportSymbol('proto.api.ReferenceAndCiphertext', null, global); goog.exportSymbol('proto.api.ReferenceAndGrantSpec', null, global); + /** * Generated by JsPbCodeGenerator. * @param {Array=} opt_data Optional initial data array, typically from a @@ -40,160 +38,8 @@ proto.api.GrantAndGrantSpec = function(opt_data) { }; goog.inherits(proto.api.GrantAndGrantSpec, jspb.Message); if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ proto.api.GrantAndGrantSpec.displayName = 'proto.api.GrantAndGrantSpec'; } -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.api.PlaintextAndGrantSpec = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.api.PlaintextAndGrantSpec, jspb.Message); -if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ - proto.api.PlaintextAndGrantSpec.displayName = 'proto.api.PlaintextAndGrantSpec'; -} -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.api.ReferenceAndGrantSpec = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.api.ReferenceAndGrantSpec, jspb.Message); -if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ - proto.api.ReferenceAndGrantSpec.displayName = 'proto.api.ReferenceAndGrantSpec'; -} -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.api.Header = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, proto.api.Header.repeatedFields_, null); -}; -goog.inherits(proto.api.Header, jspb.Message); -if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ - proto.api.Header.displayName = 'proto.api.Header'; -} -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.api.Plaintext = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.api.Plaintext, jspb.Message); -if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ - proto.api.Plaintext.displayName = 'proto.api.Plaintext'; -} -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.api.Ciphertext = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.api.Ciphertext, jspb.Message); -if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ - proto.api.Ciphertext.displayName = 'proto.api.Ciphertext'; -} -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.api.ReferenceAndCiphertext = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.api.ReferenceAndCiphertext, jspb.Message); -if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ - proto.api.ReferenceAndCiphertext.displayName = 'proto.api.ReferenceAndCiphertext'; -} -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.api.Address = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.api.Address, jspb.Message); -if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ - proto.api.Address.displayName = 'proto.api.Address'; -} - if (jspb.Message.GENERATE_TO_OBJECT) { @@ -335,9 +181,6 @@ proto.api.GrantAndGrantSpec.prototype.setGrant = function(value) { }; -/** - * Clears the message field making it undefined. - */ proto.api.GrantAndGrantSpec.prototype.clearGrant = function() { this.setGrant(undefined); }; @@ -345,7 +188,7 @@ proto.api.GrantAndGrantSpec.prototype.clearGrant = function() { /** * Returns whether this field is set. - * @return {boolean} + * @return {!boolean} */ proto.api.GrantAndGrantSpec.prototype.hasGrant = function() { return jspb.Message.getField(this, 1) != null; @@ -368,9 +211,6 @@ proto.api.GrantAndGrantSpec.prototype.setGrantspec = function(value) { }; -/** - * Clears the message field making it undefined. - */ proto.api.GrantAndGrantSpec.prototype.clearGrantspec = function() { this.setGrantspec(undefined); }; @@ -378,7 +218,7 @@ proto.api.GrantAndGrantSpec.prototype.clearGrantspec = function() { /** * Returns whether this field is set. - * @return {boolean} + * @return {!boolean} */ proto.api.GrantAndGrantSpec.prototype.hasGrantspec = function() { return jspb.Message.getField(this, 2) != null; @@ -386,6 +226,23 @@ proto.api.GrantAndGrantSpec.prototype.hasGrantspec = function() { +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.api.PlaintextAndGrantSpec = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.api.PlaintextAndGrantSpec, jspb.Message); +if (goog.DEBUG && !COMPILED) { + proto.api.PlaintextAndGrantSpec.displayName = 'proto.api.PlaintextAndGrantSpec'; +} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -527,9 +384,6 @@ proto.api.PlaintextAndGrantSpec.prototype.setPlaintext = function(value) { }; -/** - * Clears the message field making it undefined. - */ proto.api.PlaintextAndGrantSpec.prototype.clearPlaintext = function() { this.setPlaintext(undefined); }; @@ -537,7 +391,7 @@ proto.api.PlaintextAndGrantSpec.prototype.clearPlaintext = function() { /** * Returns whether this field is set. - * @return {boolean} + * @return {!boolean} */ proto.api.PlaintextAndGrantSpec.prototype.hasPlaintext = function() { return jspb.Message.getField(this, 1) != null; @@ -560,9 +414,6 @@ proto.api.PlaintextAndGrantSpec.prototype.setGrantspec = function(value) { }; -/** - * Clears the message field making it undefined. - */ proto.api.PlaintextAndGrantSpec.prototype.clearGrantspec = function() { this.setGrantspec(undefined); }; @@ -570,7 +421,7 @@ proto.api.PlaintextAndGrantSpec.prototype.clearGrantspec = function() { /** * Returns whether this field is set. - * @return {boolean} + * @return {!boolean} */ proto.api.PlaintextAndGrantSpec.prototype.hasGrantspec = function() { return jspb.Message.getField(this, 2) != null; @@ -578,6 +429,23 @@ proto.api.PlaintextAndGrantSpec.prototype.hasGrantspec = function() { +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.api.ReferenceAndGrantSpec = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.api.ReferenceAndGrantSpec, jspb.Message); +if (goog.DEBUG && !COMPILED) { + proto.api.ReferenceAndGrantSpec.displayName = 'proto.api.ReferenceAndGrantSpec'; +} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -719,9 +587,6 @@ proto.api.ReferenceAndGrantSpec.prototype.setReference = function(value) { }; -/** - * Clears the message field making it undefined. - */ proto.api.ReferenceAndGrantSpec.prototype.clearReference = function() { this.setReference(undefined); }; @@ -729,7 +594,7 @@ proto.api.ReferenceAndGrantSpec.prototype.clearReference = function() { /** * Returns whether this field is set. - * @return {boolean} + * @return {!boolean} */ proto.api.ReferenceAndGrantSpec.prototype.hasReference = function() { return jspb.Message.getField(this, 1) != null; @@ -752,9 +617,6 @@ proto.api.ReferenceAndGrantSpec.prototype.setGrantspec = function(value) { }; -/** - * Clears the message field making it undefined. - */ proto.api.ReferenceAndGrantSpec.prototype.clearGrantspec = function() { this.setGrantspec(undefined); }; @@ -762,7 +624,7 @@ proto.api.ReferenceAndGrantSpec.prototype.clearGrantspec = function() { /** * Returns whether this field is set. - * @return {boolean} + * @return {!boolean} */ proto.api.ReferenceAndGrantSpec.prototype.hasGrantspec = function() { return jspb.Message.getField(this, 2) != null; @@ -770,6 +632,23 @@ proto.api.ReferenceAndGrantSpec.prototype.hasGrantspec = function() { +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.api.Header = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, proto.api.Header.repeatedFields_, null); +}; +goog.inherits(proto.api.Header, jspb.Message); +if (goog.DEBUG && !COMPILED) { + proto.api.Header.displayName = 'proto.api.Header'; +} /** * List of repeated fields within this message type. * @private {!Array} @@ -957,7 +836,7 @@ proto.api.Header.prototype.getSalt_asU8 = function() { /** @param {!(string|Uint8Array)} value */ proto.api.Header.prototype.setSalt = function(value) { - jspb.Message.setProto3BytesField(this, 1, value); + jspb.Message.setField(this, 1, value); }; @@ -972,7 +851,7 @@ proto.api.Header.prototype.getName = function() { /** @param {string} value */ proto.api.Header.prototype.setName = function(value) { - jspb.Message.setProto3StringField(this, 2, value); + jspb.Message.setField(this, 2, value); }; @@ -987,27 +866,27 @@ proto.api.Header.prototype.getType = function() { /** @param {string} value */ proto.api.Header.prototype.setType = function(value) { - jspb.Message.setProto3StringField(this, 3, value); + jspb.Message.setField(this, 3, value); }; /** * repeated string Tags = 4; - * @return {!Array} + * @return {!Array.} */ proto.api.Header.prototype.getTagsList = function() { - return /** @type {!Array} */ (jspb.Message.getRepeatedField(this, 4)); + return /** @type {!Array.} */ (jspb.Message.getRepeatedField(this, 4)); }; -/** @param {!Array} value */ +/** @param {!Array.} value */ proto.api.Header.prototype.setTagsList = function(value) { jspb.Message.setField(this, 4, value || []); }; /** - * @param {string} value + * @param {!string} value * @param {number=} opt_index */ proto.api.Header.prototype.addTags = function(value, opt_index) { @@ -1015,15 +894,29 @@ proto.api.Header.prototype.addTags = function(value, opt_index) { }; -/** - * Clears the list making it empty but non-null. - */ proto.api.Header.prototype.clearTagsList = function() { this.setTagsList([]); }; +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.api.Plaintext = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.api.Plaintext, jspb.Message); +if (goog.DEBUG && !COMPILED) { + proto.api.Plaintext.displayName = 'proto.api.Plaintext'; +} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -1182,7 +1075,7 @@ proto.api.Plaintext.prototype.getBody_asU8 = function() { /** @param {!(string|Uint8Array)} value */ proto.api.Plaintext.prototype.setBody = function(value) { - jspb.Message.setProto3BytesField(this, 1, value); + jspb.Message.setField(this, 1, value); }; @@ -1202,9 +1095,6 @@ proto.api.Plaintext.prototype.setHead = function(value) { }; -/** - * Clears the message field making it undefined. - */ proto.api.Plaintext.prototype.clearHead = function() { this.setHead(undefined); }; @@ -1212,7 +1102,7 @@ proto.api.Plaintext.prototype.clearHead = function() { /** * Returns whether this field is set. - * @return {boolean} + * @return {!boolean} */ proto.api.Plaintext.prototype.hasHead = function() { return jspb.Message.getField(this, 3) != null; @@ -1220,6 +1110,23 @@ proto.api.Plaintext.prototype.hasHead = function() { +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.api.Ciphertext = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.api.Ciphertext, jspb.Message); +if (goog.DEBUG && !COMPILED) { + proto.api.Ciphertext.displayName = 'proto.api.Ciphertext'; +} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -1364,11 +1271,28 @@ proto.api.Ciphertext.prototype.getEncrypteddata_asU8 = function() { /** @param {!(string|Uint8Array)} value */ proto.api.Ciphertext.prototype.setEncrypteddata = function(value) { - jspb.Message.setProto3BytesField(this, 1, value); + jspb.Message.setField(this, 1, value); }; +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.api.ReferenceAndCiphertext = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.api.ReferenceAndCiphertext, jspb.Message); +if (goog.DEBUG && !COMPILED) { + proto.api.ReferenceAndCiphertext.displayName = 'proto.api.ReferenceAndCiphertext'; +} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -1510,9 +1434,6 @@ proto.api.ReferenceAndCiphertext.prototype.setReference = function(value) { }; -/** - * Clears the message field making it undefined. - */ proto.api.ReferenceAndCiphertext.prototype.clearReference = function() { this.setReference(undefined); }; @@ -1520,7 +1441,7 @@ proto.api.ReferenceAndCiphertext.prototype.clearReference = function() { /** * Returns whether this field is set. - * @return {boolean} + * @return {!boolean} */ proto.api.ReferenceAndCiphertext.prototype.hasReference = function() { return jspb.Message.getField(this, 1) != null; @@ -1543,9 +1464,6 @@ proto.api.ReferenceAndCiphertext.prototype.setCiphertext = function(value) { }; -/** - * Clears the message field making it undefined. - */ proto.api.ReferenceAndCiphertext.prototype.clearCiphertext = function() { this.setCiphertext(undefined); }; @@ -1553,7 +1471,7 @@ proto.api.ReferenceAndCiphertext.prototype.clearCiphertext = function() { /** * Returns whether this field is set. - * @return {boolean} + * @return {!boolean} */ proto.api.ReferenceAndCiphertext.prototype.hasCiphertext = function() { return jspb.Message.getField(this, 2) != null; @@ -1561,6 +1479,23 @@ proto.api.ReferenceAndCiphertext.prototype.hasCiphertext = function() { +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.api.Address = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.api.Address, jspb.Message); +if (goog.DEBUG && !COMPILED) { + proto.api.Address.displayName = 'proto.api.Address'; +} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -1705,7 +1640,7 @@ proto.api.Address.prototype.getAddress_asU8 = function() { /** @param {!(string|Uint8Array)} value */ proto.api.Address.prototype.setAddress = function(value) { - jspb.Message.setProto3BytesField(this, 1, value); + jspb.Message.setField(this, 1, value); }; diff --git a/hoard-js/proto/grant_pb.js b/hoard-js/proto/grant_pb.js index c53e72b9..95a01c75 100644 --- a/hoard-js/proto/grant_pb.js +++ b/hoard-js/proto/grant_pb.js @@ -16,6 +16,7 @@ goog.exportSymbol('proto.grant.OpenPGPSpec', null, global); goog.exportSymbol('proto.grant.PlaintextSpec', null, global); goog.exportSymbol('proto.grant.Spec', null, global); goog.exportSymbol('proto.grant.SymmetricSpec', null, global); + /** * Generated by JsPbCodeGenerator. * @param {Array=} opt_data Optional initial data array, typically from a @@ -31,97 +32,8 @@ proto.grant.Grant = function(opt_data) { }; goog.inherits(proto.grant.Grant, jspb.Message); if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ proto.grant.Grant.displayName = 'proto.grant.Grant'; } -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.grant.Spec = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.grant.Spec, jspb.Message); -if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ - proto.grant.Spec.displayName = 'proto.grant.Spec'; -} -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.grant.PlaintextSpec = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.grant.PlaintextSpec, jspb.Message); -if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ - proto.grant.PlaintextSpec.displayName = 'proto.grant.PlaintextSpec'; -} -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.grant.SymmetricSpec = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.grant.SymmetricSpec, jspb.Message); -if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ - proto.grant.SymmetricSpec.displayName = 'proto.grant.SymmetricSpec'; -} -/** - * Generated by JsPbCodeGenerator. - * @param {Array=} opt_data Optional initial data array, typically from a - * server response, or constructed directly in Javascript. The array is used - * in place and becomes part of the constructed object. It is not cloned. - * If no data is provided, the constructed object will be empty, but still - * valid. - * @extends {jspb.Message} - * @constructor - */ -proto.grant.OpenPGPSpec = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); -}; -goog.inherits(proto.grant.OpenPGPSpec, jspb.Message); -if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ - proto.grant.OpenPGPSpec.displayName = 'proto.grant.OpenPGPSpec'; -} - if (jspb.Message.GENERATE_TO_OBJECT) { @@ -273,9 +185,6 @@ proto.grant.Grant.prototype.setSpec = function(value) { }; -/** - * Clears the message field making it undefined. - */ proto.grant.Grant.prototype.clearSpec = function() { this.setSpec(undefined); }; @@ -283,7 +192,7 @@ proto.grant.Grant.prototype.clearSpec = function() { /** * Returns whether this field is set. - * @return {boolean} + * @return {!boolean} */ proto.grant.Grant.prototype.hasSpec = function() { return jspb.Message.getField(this, 1) != null; @@ -325,7 +234,7 @@ proto.grant.Grant.prototype.getEncryptedreferences_asU8 = function() { /** @param {!(string|Uint8Array)} value */ proto.grant.Grant.prototype.setEncryptedreferences = function(value) { - jspb.Message.setProto3BytesField(this, 2, value); + jspb.Message.setField(this, 2, value); }; @@ -340,11 +249,28 @@ proto.grant.Grant.prototype.getVersion = function() { /** @param {number} value */ proto.grant.Grant.prototype.setVersion = function(value) { - jspb.Message.setProto3IntField(this, 3, value); + jspb.Message.setField(this, 3, value); }; +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.grant.Spec = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.grant.Spec, jspb.Message); +if (goog.DEBUG && !COMPILED) { + proto.grant.Spec.displayName = 'proto.grant.Spec'; +} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -500,9 +426,6 @@ proto.grant.Spec.prototype.setPlaintext = function(value) { }; -/** - * Clears the message field making it undefined. - */ proto.grant.Spec.prototype.clearPlaintext = function() { this.setPlaintext(undefined); }; @@ -510,7 +433,7 @@ proto.grant.Spec.prototype.clearPlaintext = function() { /** * Returns whether this field is set. - * @return {boolean} + * @return {!boolean} */ proto.grant.Spec.prototype.hasPlaintext = function() { return jspb.Message.getField(this, 1) != null; @@ -533,9 +456,6 @@ proto.grant.Spec.prototype.setSymmetric = function(value) { }; -/** - * Clears the message field making it undefined. - */ proto.grant.Spec.prototype.clearSymmetric = function() { this.setSymmetric(undefined); }; @@ -543,7 +463,7 @@ proto.grant.Spec.prototype.clearSymmetric = function() { /** * Returns whether this field is set. - * @return {boolean} + * @return {!boolean} */ proto.grant.Spec.prototype.hasSymmetric = function() { return jspb.Message.getField(this, 2) != null; @@ -566,9 +486,6 @@ proto.grant.Spec.prototype.setOpenpgp = function(value) { }; -/** - * Clears the message field making it undefined. - */ proto.grant.Spec.prototype.clearOpenpgp = function() { this.setOpenpgp(undefined); }; @@ -576,7 +493,7 @@ proto.grant.Spec.prototype.clearOpenpgp = function() { /** * Returns whether this field is set. - * @return {boolean} + * @return {!boolean} */ proto.grant.Spec.prototype.hasOpenpgp = function() { return jspb.Message.getField(this, 3) != null; @@ -584,6 +501,23 @@ proto.grant.Spec.prototype.hasOpenpgp = function() { +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.grant.PlaintextSpec = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.grant.PlaintextSpec, jspb.Message); +if (goog.DEBUG && !COMPILED) { + proto.grant.PlaintextSpec.displayName = 'proto.grant.PlaintextSpec'; +} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -683,6 +617,23 @@ proto.grant.PlaintextSpec.serializeBinaryToWriter = function(message, writer) { +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.grant.SymmetricSpec = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.grant.SymmetricSpec, jspb.Message); +if (goog.DEBUG && !COMPILED) { + proto.grant.SymmetricSpec.displayName = 'proto.grant.SymmetricSpec'; +} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -803,11 +754,28 @@ proto.grant.SymmetricSpec.prototype.getPublicid = function() { /** @param {string} value */ proto.grant.SymmetricSpec.prototype.setPublicid = function(value) { - jspb.Message.setProto3StringField(this, 1, value); + jspb.Message.setField(this, 1, value); }; +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.grant.OpenPGPSpec = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.grant.OpenPGPSpec, jspb.Message); +if (goog.DEBUG && !COMPILED) { + proto.grant.OpenPGPSpec.displayName = 'proto.grant.OpenPGPSpec'; +} if (jspb.Message.GENERATE_TO_OBJECT) { @@ -928,7 +896,7 @@ proto.grant.OpenPGPSpec.prototype.getPublickey = function() { /** @param {string} value */ proto.grant.OpenPGPSpec.prototype.setPublickey = function(value) { - jspb.Message.setProto3StringField(this, 1, value); + jspb.Message.setField(this, 1, value); }; diff --git a/hoard-js/proto/reference_pb.js b/hoard-js/proto/reference_pb.js index 3543c382..8c32d4b8 100644 --- a/hoard-js/proto/reference_pb.js +++ b/hoard-js/proto/reference_pb.js @@ -12,6 +12,7 @@ var goog = jspb; var global = Function('return this')(); goog.exportSymbol('proto.reference.Ref', null, global); + /** * Generated by JsPbCodeGenerator. * @param {Array=} opt_data Optional initial data array, typically from a @@ -27,15 +28,10 @@ proto.reference.Ref = function(opt_data) { }; goog.inherits(proto.reference.Ref, jspb.Message); if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ proto.reference.Ref.displayName = 'proto.reference.Ref'; } - if (jspb.Message.GENERATE_TO_OBJECT) { /** * Creates an object representation of this proto suitable for use in Soy templates. @@ -214,7 +210,7 @@ proto.reference.Ref.prototype.getAddress_asU8 = function() { /** @param {!(string|Uint8Array)} value */ proto.reference.Ref.prototype.setAddress = function(value) { - jspb.Message.setProto3BytesField(this, 1, value); + jspb.Message.setField(this, 1, value); }; @@ -253,7 +249,7 @@ proto.reference.Ref.prototype.getSecretkey_asU8 = function() { /** @param {!(string|Uint8Array)} value */ proto.reference.Ref.prototype.setSecretkey = function(value) { - jspb.Message.setProto3BytesField(this, 2, value); + jspb.Message.setField(this, 2, value); }; @@ -292,7 +288,7 @@ proto.reference.Ref.prototype.getSalt_asU8 = function() { /** @param {!(string|Uint8Array)} value */ proto.reference.Ref.prototype.setSalt = function(value) { - jspb.Message.setProto3BytesField(this, 3, value); + jspb.Message.setField(this, 3, value); }; @@ -307,7 +303,7 @@ proto.reference.Ref.prototype.getVersion = function() { /** @param {number} value */ proto.reference.Ref.prototype.setVersion = function(value) { - jspb.Message.setProto3IntField(this, 4, value); + jspb.Message.setField(this, 4, value); }; diff --git a/hoard-js/proto/stores_pb.js b/hoard-js/proto/stores_pb.js index ab56467f..046205e4 100644 --- a/hoard-js/proto/stores_pb.js +++ b/hoard-js/proto/stores_pb.js @@ -12,6 +12,7 @@ var goog = jspb; var global = Function('return this')(); goog.exportSymbol('proto.stores.StatInfo', null, global); + /** * Generated by JsPbCodeGenerator. * @param {Array=} opt_data Optional initial data array, typically from a @@ -27,15 +28,10 @@ proto.stores.StatInfo = function(opt_data) { }; goog.inherits(proto.stores.StatInfo, jspb.Message); if (goog.DEBUG && !COMPILED) { - /** - * @public - * @override - */ proto.stores.StatInfo.displayName = 'proto.stores.StatInfo'; } - if (jspb.Message.GENERATE_TO_OBJECT) { /** * Creates an object representation of this proto suitable for use in Soy templates. @@ -214,7 +210,7 @@ proto.stores.StatInfo.prototype.getAddress_asU8 = function() { /** @param {!(string|Uint8Array)} value */ proto.stores.StatInfo.prototype.setAddress = function(value) { - jspb.Message.setProto3BytesField(this, 1, value); + jspb.Message.setField(this, 1, value); }; @@ -231,7 +227,7 @@ proto.stores.StatInfo.prototype.getExists = function() { /** @param {boolean} value */ proto.stores.StatInfo.prototype.setExists = function(value) { - jspb.Message.setProto3BooleanField(this, 2, value); + jspb.Message.setField(this, 2, value); }; @@ -246,7 +242,7 @@ proto.stores.StatInfo.prototype.getSize = function() { /** @param {number} value */ proto.stores.StatInfo.prototype.setSize = function(value) { - jspb.Message.setProto3IntField(this, 3, value); + jspb.Message.setField(this, 3, value); }; @@ -261,7 +257,7 @@ proto.stores.StatInfo.prototype.getLocation = function() { /** @param {string} value */ proto.stores.StatInfo.prototype.setLocation = function(value) { - jspb.Message.setProto3StringField(this, 4, value); + jspb.Message.setField(this, 4, value); }; diff --git a/hoard.go b/hoard.go index 455625b2..223a2432 100644 --- a/hoard.go +++ b/hoard.go @@ -4,11 +4,11 @@ import ( "crypto/sha256" "github.com/go-kit/kit/log" - "github.com/monax/hoard/v7/config" - "github.com/monax/hoard/v7/encryption" - "github.com/monax/hoard/v7/grant" - "github.com/monax/hoard/v7/reference" - "github.com/monax/hoard/v7/stores" + "github.com/monax/hoard/v8/config" + "github.com/monax/hoard/v8/encryption" + "github.com/monax/hoard/v8/grant" + "github.com/monax/hoard/v8/reference" + "github.com/monax/hoard/v8/stores" ) type EncryptionService interface { diff --git a/hoard_test.go b/hoard_test.go index 11f49375..5a743637 100644 --- a/hoard_test.go +++ b/hoard_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/go-kit/kit/log" - "github.com/monax/hoard/v7/config" - "github.com/monax/hoard/v7/reference" - "github.com/monax/hoard/v7/stores" + "github.com/monax/hoard/v8/config" + "github.com/monax/hoard/v8/reference" + "github.com/monax/hoard/v8/stores" "github.com/stretchr/testify/assert" ) diff --git a/logging/convention.go b/logging/convention.go index b3fa9820..fb685cb2 100644 --- a/logging/convention.go +++ b/logging/convention.go @@ -18,7 +18,7 @@ import ( "fmt" "github.com/go-kit/kit/log" - "github.com/monax/hoard/v7/logging/structure" + "github.com/monax/hoard/v8/logging/structure" ) func InfoLogger(logger log.Logger) log.Logger { diff --git a/logging/loggers/vector_valued_logger.go b/logging/loggers/vector_valued_logger.go index ed3cb320..4d46436d 100644 --- a/logging/loggers/vector_valued_logger.go +++ b/logging/loggers/vector_valued_logger.go @@ -16,7 +16,7 @@ package loggers import ( "github.com/go-kit/kit/log" - "github.com/monax/hoard/v7/logging/structure" + "github.com/monax/hoard/v8/logging/structure" ) // Treat duplicate key-values as consecutive entries in a vector-valued lookup diff --git a/logging/metadata.go b/logging/metadata.go index 4819f17d..fab0ccce 100644 --- a/logging/metadata.go +++ b/logging/metadata.go @@ -19,7 +19,7 @@ import ( "github.com/go-kit/kit/log" "github.com/go-stack/stack" - "github.com/monax/hoard/v7/logging/structure" + "github.com/monax/hoard/v8/logging/structure" ) const ( diff --git a/project/cmd/changelog/main.go b/project/cmd/changelog/main.go index ad5f0c2f..934f0bb6 100644 --- a/project/cmd/changelog/main.go +++ b/project/cmd/changelog/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/monax/hoard/v7/project" + "github.com/monax/hoard/v8/project" ) func main() { diff --git a/project/cmd/notes/main.go b/project/cmd/notes/main.go index a6103e5d..90a2d2c2 100644 --- a/project/cmd/notes/main.go +++ b/project/cmd/notes/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/monax/hoard/v7/project" + "github.com/monax/hoard/v8/project" ) func main() { diff --git a/project/cmd/version/main.go b/project/cmd/version/main.go index ef6a4aa5..ccce0217 100644 --- a/project/cmd/version/main.go +++ b/project/cmd/version/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/monax/hoard/v7/project" + "github.com/monax/hoard/v8/project" ) func main() { diff --git a/project/history.go b/project/history.go index 774ea016..092fcfc4 100644 --- a/project/history.go +++ b/project/history.go @@ -22,6 +22,16 @@ func FullVersion() string { return version } +// Use below as template for change notes, delete empty sections but keep order +/* +### Security +### Changed +### Fixed +### Added +### Removed +### Deprecated +*/ + // The releases described by version string and changes, newest release first. // The current release is taken to be the first release in the slice, and its // version determines the single authoritative version for the next release. @@ -30,6 +40,14 @@ func FullVersion() string { // release tagging script: ./scripts/tag_release.sh var History relic.ImmutableHistory = relic.NewHistory("Monax Hoard", "https://github.com/monax/hoard"). MustDeclareReleases( + "8.0.0 - 2020-02-24", + `### Changed +- Service now encrypts per chunk of plaintext +- Grants (v2) contain an array of references + +### Removed +- Document service - metadata now in header +`, "7.2.0 - 2019-12-17", `### Fixed - Symmetric grants are now versioned to preserve backwards compatability diff --git a/protobuf/api.proto b/protobuf/api.proto index c07db0d2..f18526c5 100644 --- a/protobuf/api.proto +++ b/protobuf/api.proto @@ -6,7 +6,7 @@ import "stores.proto"; package api; -option go_package = "github.com/monax/hoard/v7/api"; +option go_package = "github.com/monax/hoard/v8/api"; service Grant { // Seal a Reference to create a Grant diff --git a/protobuf/grant.proto b/protobuf/grant.proto index 89695659..bf615ee4 100644 --- a/protobuf/grant.proto +++ b/protobuf/grant.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package grant; -option go_package = "github.com/monax/hoard/v7/grant"; +option go_package = "github.com/monax/hoard/v8/grant"; message Grant { // The grantSpec provides sufficient information to decrypt the reference diff --git a/protobuf/reference.proto b/protobuf/reference.proto index edb497dd..305c14e9 100644 --- a/protobuf/reference.proto +++ b/protobuf/reference.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package reference; -option go_package = "github.com/monax/hoard/v7/reference"; +option go_package = "github.com/monax/hoard/v8/reference"; message Ref { bytes Address = 1; diff --git a/protobuf/stores.proto b/protobuf/stores.proto index c690d387..2db0941c 100644 --- a/protobuf/stores.proto +++ b/protobuf/stores.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package stores; -option go_package = "github.com/monax/hoard/v7/stores"; +option go_package = "github.com/monax/hoard/v8/stores"; message StatInfo { // The address will be the same as the one passed in but is repeated to diff --git a/reference/reference.pb.go b/reference/reference.pb.go index e1e5f539..862d798e 100644 --- a/reference/reference.pb.go +++ b/reference/reference.pb.go @@ -99,6 +99,6 @@ var fileDescriptor_6b165e33ad62994c = []byte{ 0x4b, 0x70, 0x62, 0x4e, 0x89, 0x04, 0x33, 0x58, 0x02, 0xcc, 0x06, 0x99, 0x15, 0x96, 0x5a, 0x54, 0x9c, 0x99, 0x9f, 0x27, 0xc1, 0xa2, 0xc0, 0xa8, 0xc1, 0x1a, 0x04, 0xe3, 0x3a, 0xa9, 0x46, 0x29, 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xe7, 0xe6, 0xe7, 0x25, 0x56, - 0xe8, 0x67, 0xe4, 0x27, 0x16, 0xa5, 0xe8, 0x97, 0x99, 0xeb, 0xc3, 0xdd, 0x94, 0xc4, 0x06, 0x76, - 0xa5, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x9c, 0x6c, 0xee, 0x2b, 0xb8, 0x00, 0x00, 0x00, + 0xe8, 0x67, 0xe4, 0x27, 0x16, 0xa5, 0xe8, 0x97, 0x59, 0xe8, 0xc3, 0xdd, 0x94, 0xc4, 0x06, 0x76, + 0xa5, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x52, 0xfa, 0x71, 0x68, 0xb8, 0x00, 0x00, 0x00, } diff --git a/server/server.go b/server/server.go index 29b3e6f4..3c2c3d27 100644 --- a/server/server.go +++ b/server/server.go @@ -7,12 +7,12 @@ import ( "strings" "github.com/go-kit/kit/log" - "github.com/monax/hoard/v7" - "github.com/monax/hoard/v7/api" - "github.com/monax/hoard/v7/config" - "github.com/monax/hoard/v7/logging" - "github.com/monax/hoard/v7/logging/loggers" - "github.com/monax/hoard/v7/stores" + "github.com/monax/hoard/v8" + "github.com/monax/hoard/v8/api" + "github.com/monax/hoard/v8/config" + "github.com/monax/hoard/v8/logging" + "github.com/monax/hoard/v8/logging/loggers" + "github.com/monax/hoard/v8/stores" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/service.go b/service.go index 9fbf482f..c1713d49 100644 --- a/service.go +++ b/service.go @@ -5,10 +5,10 @@ import ( "io" "github.com/golang/protobuf/proto" - "github.com/monax/hoard/v7/api" - "github.com/monax/hoard/v7/grant" - "github.com/monax/hoard/v7/reference" - "github.com/monax/hoard/v7/stores" + "github.com/monax/hoard/v8/api" + "github.com/monax/hoard/v8/grant" + "github.com/monax/hoard/v8/reference" + "github.com/monax/hoard/v8/stores" ) const defaultRefVersionForHeader = 1 diff --git a/service_test.go b/service_test.go index aeb1227e..2c5c3808 100644 --- a/service_test.go +++ b/service_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/go-kit/kit/log" - "github.com/monax/hoard/v7/api" - "github.com/monax/hoard/v7/config" - "github.com/monax/hoard/v7/encryption" - "github.com/monax/hoard/v7/grant" - "github.com/monax/hoard/v7/stores" - "github.com/monax/hoard/v7/test/helpers" + "github.com/monax/hoard/v8/api" + "github.com/monax/hoard/v8/config" + "github.com/monax/hoard/v8/encryption" + "github.com/monax/hoard/v8/grant" + "github.com/monax/hoard/v8/stores" + "github.com/monax/hoard/v8/test/helpers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc" diff --git a/stores/cloud/cloud.go b/stores/cloud/cloud.go index c7773c19..249fccc1 100644 --- a/stores/cloud/cloud.go +++ b/stores/cloud/cloud.go @@ -8,15 +8,15 @@ import ( "os" "strings" - "github.com/monax/hoard/v7/stores" + "github.com/monax/hoard/v8/stores" "github.com/Azure/azure-storage-blob-go/azblob" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" "github.com/go-kit/kit/log" - "github.com/monax/hoard/v7/logging" - "github.com/monax/hoard/v7/logging/structure" + "github.com/monax/hoard/v8/logging" + "github.com/monax/hoard/v8/logging/structure" "gocloud.dev/blob" "gocloud.dev/blob/azureblob" "gocloud.dev/blob/gcsblob" diff --git a/stores/cloud/cloud_test.go b/stores/cloud/cloud_test.go index c015c3df..7b8a120b 100644 --- a/stores/cloud/cloud_test.go +++ b/stores/cloud/cloud_test.go @@ -10,7 +10,7 @@ import ( "testing" "cloud.google.com/go/storage" - "github.com/monax/hoard/v7/stores" + "github.com/monax/hoard/v8/stores" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/oauth2/google" diff --git a/stores/ipfs/ipfs.go b/stores/ipfs/ipfs.go index 77c77558..2a834f03 100644 --- a/stores/ipfs/ipfs.go +++ b/stores/ipfs/ipfs.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/monax/hoard/v7/stores" + "github.com/monax/hoard/v8/stores" ) var _ stores.Store = (*ipfsStore)(nil) diff --git a/stores/logging_store.go b/stores/logging_store.go index 7ea12056..6af48898 100644 --- a/stores/logging_store.go +++ b/stores/logging_store.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/go-kit/kit/log" - "github.com/monax/hoard/v7/logging" + "github.com/monax/hoard/v8/logging" ) type loggingStore struct { diff --git a/stores/stores.pb.go b/stores/stores.pb.go index e972af09..b2e811cf 100644 --- a/stores/stores.pb.go +++ b/stores/stores.pb.go @@ -106,6 +106,6 @@ var fileDescriptor_78bd58a4c4375fca = []byte{ 0x92, 0xe2, 0xe2, 0xf0, 0xc9, 0x4f, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x93, 0x60, 0x51, 0x60, 0xd4, 0xe0, 0x0c, 0x82, 0xf3, 0x9d, 0x94, 0xa2, 0x14, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x73, 0xf3, 0xf3, 0x12, 0x2b, 0xf4, 0x33, 0xf2, 0x13, 0x8b, 0x52, 0xf4, 0xcb, - 0xcc, 0xf5, 0x21, 0x2e, 0x4a, 0x62, 0x03, 0x3b, 0xd0, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x46, - 0xcb, 0xe9, 0xc4, 0xb0, 0x00, 0x00, 0x00, + 0x2c, 0xf4, 0x21, 0x2e, 0x4a, 0x62, 0x03, 0x3b, 0xd0, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x7c, + 0xac, 0x03, 0x4a, 0xb0, 0x00, 0x00, 0x00, } diff --git a/stores/sync_store.go b/stores/sync_store.go index 147c4e57..08c6cec2 100644 --- a/stores/sync_store.go +++ b/stores/sync_store.go @@ -3,7 +3,7 @@ package stores import ( "fmt" - "github.com/monax/hoard/v7/sync" + "github.com/monax/hoard/v8/sync" ) // The number of mutexes that will be available for all possible addresses. diff --git a/streaming.go b/streaming.go index 4c5777dc..16597be4 100644 --- a/streaming.go +++ b/streaming.go @@ -5,9 +5,9 @@ import ( "io" "github.com/golang/protobuf/proto" - "github.com/monax/hoard/v7/api" - "github.com/monax/hoard/v7/grant" - "github.com/monax/hoard/v7/reference" + "github.com/monax/hoard/v8/api" + "github.com/monax/hoard/v8/grant" + "github.com/monax/hoard/v8/reference" ) type PlaintextSender interface { diff --git a/test/helpers/server.go b/test/helpers/server.go index c71aa2bf..52f9b98b 100644 --- a/test/helpers/server.go +++ b/test/helpers/server.go @@ -4,7 +4,7 @@ import ( "context" "net" - "github.com/monax/hoard/v7/api" + "github.com/monax/hoard/v8/api" "google.golang.org/grpc" "google.golang.org/grpc/test/bufconn" )