diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md index aa9fe74d3c7..f8b7135b8a7 100644 --- a/CHANGELOG-3.4.md +++ b/CHANGELOG-3.4.md @@ -110,7 +110,7 @@ See [code changes](https://github.com/coreos/etcd/compare/v3.3.0...v3.4.0) and [ - Upgrade [`github.com/spf13/cobra`](https://github.com/spf13/cobra/releases) from [**`spf13/cobra@1c44ec8d3`**](https://github.com/spf13/cobra/commit/1c44ec8d3f1552cac48999f9306da23c4d8a288b) to [**`spf13/cobra@cd30c2a7e`**](https://github.com/spf13/cobra/commit/cd30c2a7e91a1d63fd9a0027accf18a681e9d50b). - Upgrade [`github.com/spf13/pflag`](https://github.com/spf13/pflag/releases) from [**`v1.0.0`**](https://github.com/spf13/pflag/releases/tag/v1.0.0) to [**`spf13/pflag@1ce0cc6db`**](https://github.com/spf13/pflag/commit/1ce0cc6db4029d97571db82f85092fccedb572ce). - Upgrade [`github.com/coreos/go-systemd`](https://github.com/coreos/go-systemd/releases) from [**`v15`**](https://github.com/coreos/go-systemd/releases/tag/v15) to [**`v17`**](https://github.com/coreos/go-systemd/releases/tag/v17). -- Upgrade [`github.com/grpc-ecosystem/grpc-gateway`](https://github.com/grpc-ecosystem/grpc-gateway/releases) from [**`v1.3.1`**](https://github.com/grpc-ecosystem/grpc-gateway/releases/tag/v1.3.1) to [**`v1.4.0`**](https://github.com/grpc-ecosystem/grpc-gateway/releases/tag/v1.4.0). +- Upgrade [`github.com/grpc-ecosystem/grpc-gateway`](https://github.com/grpc-ecosystem/grpc-gateway/releases) from [**`v1.3.1`**](https://github.com/grpc-ecosystem/grpc-gateway/releases/tag/v1.3.1) to [**`v1.4.1`**](https://github.com/grpc-ecosystem/grpc-gateway/releases/tag/v1.4.1). ### Metrics, Monitoring diff --git a/Gopkg.lock b/Gopkg.lock index bb74a2414d6..50309aa9f26 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -111,8 +111,8 @@ "runtime/internal", "utilities" ] - revision = "74ba57806b9706edc6e2c9e5854ced57a9cd5ba0" - version = "v1.4.0" + revision = "92583770e3f01b09a0d3e9bdf64321d8bebd48f2" + version = "v1.4.1" [[projects]] name = "github.com/inconshreveable/mousetrap" diff --git a/scripts/genproto.sh b/scripts/genproto.sh index c440b4392dd..ba120f8e794 100755 --- a/scripts/genproto.sh +++ b/scripts/genproto.sh @@ -20,7 +20,7 @@ DIRS="./wal/walpb ./etcdserver/etcdserverpb ./etcdserver/api/snap/snappb ./raft/ # exact version of packages to build GOGO_PROTO_SHA="1adfc126b41513cc696b209667c8656ea7aac67c" -GRPC_GATEWAY_SHA="74ba57806b9706edc6e2c9e5854ced57a9cd5ba0" +GRPC_GATEWAY_SHA="92583770e3f01b09a0d3e9bdf64321d8bebd48f2" SCHWAG_SHA="b7d0fc9aadaaae3d61aaadfc12e4a2f945514912" # set up self-contained GOPATH for building diff --git a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/errors.go b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/errors.go index d82dc7f8d90..0e2bdf4457d 100644 --- a/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/errors.go +++ b/vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/errors.go @@ -1,10 +1,10 @@ package runtime import ( + "context" "io" "net/http" - "context" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" "github.com/golang/protobuf/ptypes/any" @@ -38,7 +38,7 @@ func HTTPStatusFromCode(code codes.Code) int { case codes.ResourceExhausted: return http.StatusTooManyRequests case codes.FailedPrecondition: - return http.StatusBadRequest + return http.StatusPreconditionFailed case codes.Aborted: return http.StatusConflict case codes.OutOfRange: