From 8d8f4afba039620f79d3f85a0d3dba549d8b7f3c Mon Sep 17 00:00:00 2001 From: Ben Cessa Date: Sun, 12 Jan 2020 10:58:35 -0500 Subject: [PATCH] DID Specification 1.0 Small adjustments to support version 1.0 of the DID specification. --- Makefile | 11 +++++-- README.md | 29 ++++++++++------- client/cli/cmd/agent.go | 2 ++ client/cli/cmd/delete.go | 2 +- client/cli/cmd/{details.go => info.go} | 8 ++--- client/cli/cmd/key_add.go | 6 +++- client/cli/cmd/key_recover.go | 2 +- client/cli/cmd/key_remove.go | 1 + client/cli/cmd/{sign.go => key_sign.go} | 3 ++ client/cli/cmd/list.go | 1 + client/cli/cmd/register.go | 5 ++- client/cli/cmd/root.go | 2 +- client/cli/cmd/service_add.go | 3 ++ client/cli/cmd/service_remove.go | 1 + client/cli/cmd/sync.go | 3 ++ client/cli/cmd/verify.go | 1 + client/cli/cmd/version.go | 1 - go.mod | 6 ++-- go.sum | 42 +++++++++++++++++++++++++ 19 files changed, 101 insertions(+), 28 deletions(-) rename client/cli/cmd/{details.go => info.go} (86%) rename client/cli/cmd/{sign.go => key_sign.go} (97%) diff --git a/Makefile b/Makefile index 757eed7..ac6cebf 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ .DEFAULT_GOAL := help BINARY_NAME=didctl DOCKER_IMAGE=didctl -VERSION_TAG=0.4.0 +VERSION_TAG=0.4.1 # Custom compilation tags LD_FLAGS="\ @@ -26,6 +26,11 @@ test: # Unit tests go test -race -cover -v -failfast ./... +## scan: Look for knonwn vulnerabilities in the project dependencies +# https://github.com/sonatype-nexus-community/nancy +scan: + @nancy -quiet go.sum + ## release: Prepare assets for a new tagged release release: @-rm -rf release-$(VERSION_TAG) @@ -57,9 +62,9 @@ clean: go mod vendor ## updates: List available updates for direct dependencies +# https://github.com/golang/go/wiki/Modules#how-to-upgrade-and-downgrade-dependencies updates: - # https://github.com/golang/go/wiki/Modules#how-to-upgrade-and-downgrade-dependencies - go list -u -f '{{if (and (not (or .Main .Indirect)) .Update)}}{{.Path}}: {{.Version}} -> {{.Update.Version}}{{end}}' -m all 2> /dev/null + @go list -u -f '{{if (and (not (or .Main .Indirect)) .Update)}}{{.Path}}: {{.Version}} -> {{.Update.Version}}{{end}}' -m all 2> /dev/null ## proto: Compile protocol buffers and RPC services proto: diff --git a/README.md b/README.md index 5a4eb93..e576538 100644 --- a/README.md +++ b/README.md @@ -115,16 +115,21 @@ implementation. The document is organized in 3 main sections. A Decentralized Identifier is defined as a [RFC3986](https://tools.ietf.org/html/rfc3986) Uniform Resource Identifier, with a format based on the generic DID schema. Fore more information you can refer to the -[original documentation](https://w3c-ccg.github.io/did-spec/#decentralized-identifiers-dids). +[original documentation](https://w3c.github.io/did-core/#generic-did-syntax). ```abnf -did-reference = did [ "/" did-path ] [ "#" did-fragment ] -did = "did:" method ":" specific-idstring -method = 1*methodchar -methodchar = %x61-7A / DIGIT -specific-idstring = idstring *( ":" idstring ) -idstring = 1*idchar -idchar = ALPHA / DIGIT / "." / "-" +did = "did:" method-name ":" method-specific-id +method-name = 1*method-char +method-char = %x61-7A / DIGIT +method-specific-id = *idchar *( ":" *idchar ) +idchar = ALPHA / DIGIT / "." / "-" / "_" +did-url = did *( ";" param ) path-abempty [ "?" query ] + [ "#" fragment ] +param = param-name [ "=" param-value ] +param-name = 1*param-char +param-value = *param-char +param-char = ALPHA / DIGIT / "." / "-" / "_" / ":" / + pct-encoded ``` Example of a simple Decentralized Identifier (DID). @@ -218,7 +223,7 @@ At the very least, the document must include the DID subject it's referring to u ```json { - "@context": "https://w3id.org/did/v1", + "@context": "https://www.w3.org/ns/did/v1", "id": "did:bryk:c137:b616fca9-ad86-4be5-bc9c-0e3f8e27dc8d" } ``` @@ -253,7 +258,7 @@ Example of a more complete, and useful, DID Document. ```json { "@context": [ - "https://w3id.org/did/v1", + "https://www.w3.org/ns/did/v1", "https://w3id.org/security/v1" ], "id": "did:bryk:c137:eeb0c865-ce21-4ad6-baf8-5ba287ba8683", @@ -550,7 +555,7 @@ The generated document will be something similar for the following example. ```json { "@context": [ - "https://w3id.org/did/v1", + "https://www.w3.org/ns/did/v1", "https://w3id.org/security/v1" ], "id": "did:bryk:99dc4a30-7434-42e5-ac75-5f330be0ea0a", @@ -600,7 +605,7 @@ The command will perform the required network operations and verifications. [Mar 14 12:15:24.277] INFO integrity proof is valid { "@context": [ - "https://w3id.org/did/v1", + "https://www.w3.org/ns/did/v1", "https://w3id.org/security/v1" ], "id": "did:bryk:4d81bd52-2edb-4703-b8fc-b26d514a9c56", diff --git a/client/cli/cmd/agent.go b/client/cli/cmd/agent.go index e83a4d9..a996684 100644 --- a/client/cli/cmd/agent.go +++ b/client/cli/cmd/agent.go @@ -31,12 +31,14 @@ func init() { Usage: "TCP port to use for the server", FlagKey: "server.port", ByDefault: 9090, + Short: "p", }, { Name: "storage", Usage: "specify the directory to use for data storage", FlagKey: "server.storage", ByDefault: "/etc/didctl/agent", + Short: "s", }, { Name: "pow", diff --git a/client/cli/cmd/delete.go b/client/cli/cmd/delete.go index 80c3389..cfaa91c 100644 --- a/client/cli/cmd/delete.go +++ b/client/cli/cmd/delete.go @@ -12,7 +12,7 @@ var deleteCmd = &cobra.Command{ Use: "delete", Short: "Permanently delete a local identifier", Example: "didctl delete [DID reference name]", - Aliases: []string{"rm", "remove"}, + Aliases: []string{"del", "rm", "remove"}, RunE: func(cmd *cobra.Command, args []string) error { if len(args) != 1 { return errors.New("you must specify a DID reference name") diff --git a/client/cli/cmd/details.go b/client/cli/cmd/info.go similarity index 86% rename from client/cli/cmd/details.go rename to client/cli/cmd/info.go index cd70f90..7ebae2f 100644 --- a/client/cli/cmd/details.go +++ b/client/cli/cmd/info.go @@ -11,15 +11,15 @@ import ( ) var didDetailsCmd = &cobra.Command{ - Use: "details", + Use: "info", Short: "Display the current information available on an existing DID", - Example: "didctl did details [DID reference name]", - Aliases: []string{"info"}, + Example: "didctl info [DID reference name]", + Aliases: []string{"details", "inspect", "view", "doc"}, RunE: runDidDetailsCmd, } func init() { - didCmd.AddCommand(didDetailsCmd) + rootCmd.AddCommand(didDetailsCmd) } func runDidDetailsCmd(_ *cobra.Command, args []string) error { diff --git a/client/cli/cmd/key_add.go b/client/cli/cmd/key_add.go index 7666f54..0aa62d6 100644 --- a/client/cli/cmd/key_add.go +++ b/client/cli/cmd/key_add.go @@ -26,24 +26,28 @@ func init() { Usage: "name to be assigned to the newly added key", FlagKey: "key-add.name", ByDefault: "key-#", + Short: "n", }, { Name: "type", Usage: "type of cryptographic key: RSA (rsa), Ed25519 (ed) or secp256k1 (koblitz)", FlagKey: "key-add.type", ByDefault: "ed", + Short: "t", }, { Name: "encoding", Usage: "encoding to use for key value: hex, base58, base64", FlagKey: "key-add.encoding", - ByDefault: "hex", + ByDefault: "base58", + Short: "e", }, { Name: "authentication", Usage: "enable this key for authentication purposes", FlagKey: "key-add.authentication", ByDefault: false, + Short: "a", }, } if err := cli.SetupCommandParams(addKeyCmd, params); err != nil { diff --git a/client/cli/cmd/key_recover.go b/client/cli/cmd/key_recover.go index d44197b..de634ec 100644 --- a/client/cli/cmd/key_recover.go +++ b/client/cli/cmd/key_recover.go @@ -39,7 +39,7 @@ func init() { if err := cli.SetupCommandParams(recoverKeyCmd, params); err != nil { panic(err) } - keyCmd.AddCommand(recoverKeyCmd) + // keyCmd.AddCommand(recoverKeyCmd) } func runRecoverKeyCmd(_ *cobra.Command, _ []string) error { diff --git a/client/cli/cmd/key_remove.go b/client/cli/cmd/key_remove.go index cf705b7..9ebbb6b 100644 --- a/client/cli/cmd/key_remove.go +++ b/client/cli/cmd/key_remove.go @@ -13,6 +13,7 @@ var removeKeyCmd = &cobra.Command{ Use: "remove", Short: "Remove an existing cryptographic key for the DID", Example: "didctl did key remove [DID reference name] [key name]", + Aliases: []string{"rm"}, RunE: runRemoveKeyCmd, } diff --git a/client/cli/cmd/sign.go b/client/cli/cmd/key_sign.go similarity index 97% rename from client/cli/cmd/sign.go rename to client/cli/cmd/key_sign.go index 97b549c..ca28d25 100644 --- a/client/cli/cmd/sign.go +++ b/client/cli/cmd/key_sign.go @@ -27,18 +27,21 @@ func init() { Usage: "contents to sign, if longer than 32 bytes a SHA3-256 will be generated", FlagKey: "sign.input", ByDefault: "", + Short: "i", }, { Name: "key", Usage: "key to use to produce the signature", FlagKey: "sign.key", ByDefault: "master", + Short: "k", }, { Name: "domain", Usage: "domain value to use when producing LD signatures", FlagKey: "sign.domain", ByDefault: didDomainValue, + Short: "d", }, } if err := cli.SetupCommandParams(signCmd, params); err != nil { diff --git a/client/cli/cmd/list.go b/client/cli/cmd/list.go index 2adb0d4..e3aadc3 100644 --- a/client/cli/cmd/list.go +++ b/client/cli/cmd/list.go @@ -13,6 +13,7 @@ var listCmd = &cobra.Command{ Use: "list", Short: "List registered DIDs", Example: "didctl list", + Aliases: []string{"ls"}, RunE: runListCmd, } diff --git a/client/cli/cmd/register.go b/client/cli/cmd/register.go index b6964bc..f5a52dd 100644 --- a/client/cli/cmd/register.go +++ b/client/cli/cmd/register.go @@ -33,18 +33,21 @@ func init() { Usage: "choose a recovery mechanism for your primary key, 'passphrase' or 'secret-sharing'", FlagKey: "register.recovery-mode", ByDefault: "secret-sharing", + Short: "r", }, { Name: "secret-sharing", Usage: "specify the number of shares and threshold value in the following format: shares,threshold", FlagKey: "register.secret-sharing", ByDefault: "3,2", + Short: "s", }, { Name: "tag", Usage: "specify a tag value for the identifier instance", FlagKey: "register.tag", ByDefault: "", + Short: "t", }, } if err := cli.SetupCommandParams(registerCmd, params); err != nil { @@ -97,7 +100,7 @@ func runRegisterCmd(_ *cobra.Command, args []string) error { return err } ll.Debug("adding master key") - if err = id.AddExistingKey("master", pk, did.KeyTypeEd, did.EncodingHex); err != nil { + if err = id.AddExistingKey("master", pk, did.KeyTypeEd, did.EncodingBase58); err != nil { return err } ll.Debug("setting master key as authentication mechanism") diff --git a/client/cli/cmd/root.go b/client/cli/cmd/root.go index 7e9858f..0f0c7fc 100644 --- a/client/cli/cmd/root.go +++ b/client/cli/cmd/root.go @@ -27,7 +27,7 @@ var rootCmd = &cobra.Command{ Reference client implementation for the "bryk" DID method. The platform allows entities to fully manage Decentralized Identifiers as described on the version -v0.11 of the specification. +v1.0 of the specification. For more information: https://github.com/bryk-io/did-method`, diff --git a/client/cli/cmd/service_add.go b/client/cli/cmd/service_add.go index 59a7caf..839ef1b 100644 --- a/client/cli/cmd/service_add.go +++ b/client/cli/cmd/service_add.go @@ -27,18 +27,21 @@ func init() { Usage: "service's reference name", FlagKey: "service-add.name", ByDefault: "external-service-#", + Short: "n", }, { Name: "type", Usage: "type identifier for the service handler", FlagKey: "service-add.type", ByDefault: "identity.bryk.io.ExternalService", + Short: "t", }, { Name: "endpoint", Usage: "main URL to access the service", FlagKey: "service-add.endpoint", ByDefault: "", + Short: "e", }, } if err := cli.SetupCommandParams(addServiceCmd, params); err != nil { diff --git a/client/cli/cmd/service_remove.go b/client/cli/cmd/service_remove.go index 7b2eaa6..4f98102 100644 --- a/client/cli/cmd/service_remove.go +++ b/client/cli/cmd/service_remove.go @@ -13,6 +13,7 @@ var removeServiceCmd = &cobra.Command{ Use: "remove", Short: "Remove an existing service entry for the DID", Example: "didctl did service remove [DID reference name] [service name]", + Aliases: []string{"rm"}, RunE: runRemoveServiceCmd, } diff --git a/client/cli/cmd/sync.go b/client/cli/cmd/sync.go index 9ec0fc0..2500dc0 100644 --- a/client/cli/cmd/sync.go +++ b/client/cli/cmd/sync.go @@ -31,18 +31,21 @@ func init() { Usage: "cryptographic key to use for the sync operation", FlagKey: "sync.key", ByDefault: "master", + Short: "k", }, { Name: "deactivate", Usage: "instruct the network agent to deactivate the identifier", FlagKey: "sync.deactivate", ByDefault: false, + Short: "d", }, { Name: "pow", Usage: "set the required request ticket difficulty level", FlagKey: "sync.pow", ByDefault: 24, + Short: "p", }, } if err := cli.SetupCommandParams(syncCmd, params); err != nil { diff --git a/client/cli/cmd/verify.go b/client/cli/cmd/verify.go index 39de924..2ae1afd 100644 --- a/client/cli/cmd/verify.go +++ b/client/cli/cmd/verify.go @@ -27,6 +27,7 @@ func init() { Usage: "original contents to run the verification against", FlagKey: "verify.input", ByDefault: "", + Short: "i", }, } if err := cli.SetupCommandParams(verifyCmd, params); err != nil { diff --git a/client/cli/cmd/version.go b/client/cli/cmd/version.go index 4ea8d8a..4b1ddb8 100644 --- a/client/cli/cmd/version.go +++ b/client/cli/cmd/version.go @@ -21,7 +21,6 @@ var buildTimestamp string var versionCmd = &cobra.Command{ Use: "version", Short: "Display version information", - Aliases: []string{"info"}, Run: func(cmd *cobra.Command, args []string) { var components = map[string]string{ "Version": coreVersion, diff --git a/go.mod b/go.mod index 289ff73..c5771c9 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/bryk-io/did-method go 1.13 require ( - github.com/gogo/googleapis v1.3.0 + github.com/gogo/googleapis v1.3.2 github.com/gogo/protobuf v1.3.1 github.com/golang/protobuf v1.3.2 github.com/grpc-ecosystem/grpc-gateway v1.12.1 @@ -17,7 +17,7 @@ require ( github.com/spf13/viper v1.6.1 github.com/vmihailenco/msgpack v4.0.4+incompatible github.com/x-cray/logrus-prefixed-formatter v0.5.2 - go.bryk.io/x v0.0.0-20191214162130-8a2dd183e3c9 + go.bryk.io/x v0.0.0-20200112145239-9ac4ce6207cc golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c - google.golang.org/grpc v1.25.1 + google.golang.org/grpc v1.26.0 ) diff --git a/go.sum b/go.sum index cd0c930..ec47110 100644 --- a/go.sum +++ b/go.sum @@ -44,6 +44,8 @@ github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA= github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20160729034951-a0c5244a21f4/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -68,6 +70,8 @@ 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/dgraph-io/badger/v2 v2.0.0 h1:Cr05o2TUd2IcLbEY0aGd8mbjm1YyQpy+dswo3BcDXrE= github.com/dgraph-io/badger/v2 v2.0.0/go.mod h1:YoRSIp1LmAJ7zH7tZwRvjNMUYLxB4wl3ebYkaIruZ04= +github.com/dgraph-io/badger/v2 v2.0.1 h1:+D6dhIqC6jIeCclnxMHqk4HPuXgrRN5UfBsLR4dNQ3A= +github.com/dgraph-io/badger/v2 v2.0.1/go.mod h1:YoRSIp1LmAJ7zH7tZwRvjNMUYLxB4wl3ebYkaIruZ04= github.com/dgraph-io/ristretto v0.0.0-20191025175511-c1f00be0418e h1:aeUNgwup7PnDOBAD1BOKAqzb/W/NksOj6r3dwKKuqfg= github.com/dgraph-io/ristretto v0.0.0-20191025175511-c1f00be0418e/go.mod h1:edzKIzGvqUCMzhTVWbiTSe75zD9Xxq0GtSBtFmaUTZs= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= @@ -77,6 +81,7 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= 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/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -90,6 +95,10 @@ github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/googleapis v1.3.0 h1:M695OaDJ5ipWvDPcoAg/YL9c3uORAegkEfBqTQF/fTQ= github.com/gogo/googleapis v1.3.0/go.mod h1:d+q1s/xVJxZGKWwC/6UfPIF33J+G1Tq4GYv9Y+Tg/EU= +github.com/gogo/googleapis v1.3.1 h1:CzMaKrvF6Qa7XtRii064vKBQiyvmY8H8vG1xa1/W1JA= +github.com/gogo/googleapis v1.3.1/go.mod h1:d+q1s/xVJxZGKWwC/6UfPIF33J+G1Tq4GYv9Y+Tg/EU= +github.com/gogo/googleapis v1.3.2 h1:kX1es4djPJrsDhY7aZKJy7aZasdcB5oSOEphMjSB53c= +github.com/gogo/googleapis v1.3.2/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= @@ -110,6 +119,7 @@ github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= @@ -127,6 +137,7 @@ 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/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= @@ -137,6 +148,7 @@ github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= @@ -184,6 +196,7 @@ github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod h1 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-proto-validators v0.2.0 h1:F6LFfmgVnfULfaRsQWBbe7F7ocuHCr9+7m+GAeDzNbQ= github.com/mwitkow/go-proto-validators v0.2.0/go.mod h1:ZfA1hW+UH/2ZHOWvQ3HnQaU0DtnpXu850MZiy+YUgcc= +github.com/mwitkow/go-proto-validators v0.3.0/go.mod h1:ej0Qp0qMgHN/KtDyUt+Q1/tA7a5VarXUOUxD+oeD30w= github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -199,6 +212,8 @@ github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/piprate/json-gold v0.2.0 h1:cY1ER2Yz5R+Hr0i0RtXLkKuAZAO7gONmS5jvoODLNe0= github.com/piprate/json-gold v0.2.0/go.mod h1:5EEeMX0Gg1CyQxoy4QRhufCfMSCOvcRAaqwkrn6NqqY= +github.com/piprate/json-gold v0.3.0 h1:a1vHx7Q1jOO1pjCtKwTI/WCzwaQwRt9VM7apK2uy200= +github.com/piprate/json-gold v0.3.0/go.mod h1:OK1z7UgtBZk06n2cDE2OSq1kffmjFFp5/2yhLLCz9UM= 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= @@ -212,11 +227,15 @@ github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDf github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.2.1 h1:JnMpQc6ppsNgw9QPAGF6Dod479itz7lvlsMzzNayLOI= github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U= +github.com/prometheus/client_golang v1.3.0 h1:miYCvYqFXtl/J9FIy8eNpBfYthAEFg+Ys0XyUVEcDsc= +github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.1.0 h1:ElTg5tNp4DqfV7UQjDqv2+RJlNzsDtvNAWccbItceIE= +github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -227,6 +246,8 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQlL8= github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= @@ -281,8 +302,14 @@ github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaU github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= github.com/vmihailenco/msgpack/v4 v4.2.2 h1:0iUl6es8EcZ2THOPT4zXHOiao17nMMCAgtKBE25cj9o= github.com/vmihailenco/msgpack/v4 v4.2.2/go.mod h1:Mu3B7ZwLd5nNOLVOKt9DecVl7IVg0xkDiEjk6CwMrww= +github.com/vmihailenco/msgpack/v4 v4.3.1 h1:9Ntwx2CBHXef6XQYkLfByWMwmQm5WspKAR6Xr+O5/ls= +github.com/vmihailenco/msgpack/v4 v4.3.1/go.mod h1:DuaveEe48abshDmz5UBKyZ+yDugvaeFk5ayfrewUOaw= +github.com/vmihailenco/msgpack/v4 v4.3.5 h1:UBGCmLC4h5pe4sMyL3E8fqrpCTtbLesLH5mHb/0xC2M= +github.com/vmihailenco/msgpack/v4 v4.3.5/go.mod h1:DuaveEe48abshDmz5UBKyZ+yDugvaeFk5ayfrewUOaw= github.com/vmihailenco/tagparser v0.1.0 h1:u6yzKTY6gW/KxL/K2NTEQUOSXZipyGiIRarGjJKmQzU= github.com/vmihailenco/tagparser v0.1.0/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= +github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37wVyIuWY= +github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/weppos/publicsuffix-go v0.4.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k= github.com/weppos/publicsuffix-go v0.5.0/go.mod h1:z3LCPQ38eedDQSwmsSRW4Y7t2L8Ln16JPQ02lHAdn5k= github.com/x-cray/logrus-prefixed-formatter v0.5.2 h1:00txxvfBM9muc0jiLIEAkAcIMJzfthRT6usrui8uGmg= @@ -298,6 +325,12 @@ go.bryk.io/x v0.0.0-20191214024534-fd9a182c901c h1:cRrSkM/EmA4cUzymAqQEFQ5GWLaD5 go.bryk.io/x v0.0.0-20191214024534-fd9a182c901c/go.mod h1:vP9hCZbiMQX829PZ8kcNSH/+NF4wfNoC5IFUgTdmYXU= go.bryk.io/x v0.0.0-20191214162130-8a2dd183e3c9 h1:csGQgLm9CbnJ4FpaLfKwcoALT8OgbCpNCuBWbjbaBmc= go.bryk.io/x v0.0.0-20191214162130-8a2dd183e3c9/go.mod h1:vP9hCZbiMQX829PZ8kcNSH/+NF4wfNoC5IFUgTdmYXU= +go.bryk.io/x v0.0.0-20200111212238-9a85b450912d h1:+N/vBWJkh0L6RMb+3syoUBzwwu83jWLsuqQkdDK6Rh8= +go.bryk.io/x v0.0.0-20200111212238-9a85b450912d/go.mod h1:vasX71+U0dPksN/C3dDq5jQCuSsYX24sf93XeXQGObs= +go.bryk.io/x v0.0.0-20200111213813-ae59d1738168 h1:ym+OduplPcnYv5wCfTdri3SpM+zwnuugV4OH5WUJGIM= +go.bryk.io/x v0.0.0-20200111213813-ae59d1738168/go.mod h1:WVX3QHMuApvWpUaT5VQlMv062j+rdJlqyqbkDryS+yY= +go.bryk.io/x v0.0.0-20200112145239-9ac4ce6207cc h1:o4ExT+iwhE1NEdXg/A7BBWjxT5OjYzzBcbp2TcmM0UM= +go.bryk.io/x v0.0.0-20200112145239-9ac4ce6207cc/go.mod h1:WVX3QHMuApvWpUaT5VQlMv062j+rdJlqyqbkDryS+yY= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY= @@ -343,6 +376,8 @@ golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smto golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0 h1:2mqDk8w/o6UmeUCu5Qiq2y7iMf6anbx+YA8d1JFoFrs= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1 h1:VeAkjQVzKLmu+JnFcK96TPbkuaTIqwGGAzQ9hgwPjVg= golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -351,6 +386,8 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -367,6 +404,8 @@ golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191127021746-63cb32ae39b2 h1:/J2nHFg1MTqaRLFO7M+J78ASNsJoz3r0cvHBPQ77fsE= golang.org/x/sys v0.0.0-20191127021746-63cb32ae39b2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f h1:68K/z8GLUxV76xGSqwTWw2gyk/jwn79LUL43rES2g8o= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -390,6 +429,7 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= @@ -402,6 +442,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= google.golang.org/grpc v1.25.1 h1:wdKvqQk7IttEw92GoRyKG2IDrUIpgpj6H6m81yfeMW0= 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/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=