From c68a5e96bcce6c6272dc385c6de87de2014858b6 Mon Sep 17 00:00:00 2001 From: Eitan Yarmush Date: Thu, 10 Oct 2019 12:10:19 -0400 Subject: [PATCH] bump go-control-plane (#10) * changelog * bumped go proto --- Gopkg.lock | 40 +++++-------------- Gopkg.toml | 6 ++- api/interface.go | 11 ++--- changelog/v0.1.1/update-go-control-plane.yaml | 6 +++ 4 files changed, 28 insertions(+), 35 deletions(-) create mode 100644 changelog/v0.1.1/update-go-control-plane.yaml diff --git a/Gopkg.lock b/Gopkg.lock index dfa9101..018b570 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,7 +2,7 @@ [[projects]] - digest = "1:7214e04012a19e4797878709eaac41e64d535cac3c266514b50bdabf940e2a4c" + digest = "1:c62982c3f5c0e8b449bed24bf572ba926f47ddced4ae4f593c37895aa674942d" name = "github.com/envoyproxy/go-control-plane" packages = [ "envoy/api/v2/core", @@ -10,8 +10,8 @@ "envoy/type", ] pruneopts = "UT" - revision = "0f0598e8dab0c0306119ca6fff632b0a672cbfa1" - version = "v0.8.2" + revision = "52b167a709f111e6298136064bbaae43419ab22f" + version = "v0.9.0" [[projects]] digest = "1:743f8008a7fed04ef0d52261aef346766bbd5b3e360b90296d85289f8ef5c2e2" @@ -21,29 +21,7 @@ revision = "9b492f1473afa33350d86b62c298b45da868a33f" [[projects]] - digest = "1:e13cb038286ab79c110c415198e69fd8b02c5e7794cda168c04e3149736d8a21" - name = "github.com/gogo/googleapis" - packages = ["google/rpc"] - pruneopts = "UT" - revision = "08a7655d27152912db7aaf4f983275eaf8d128ef" - version = "v1.0.0" - -[[projects]] - digest = "1:c23ef5b1fa68d209f3a299f58f3de6ecf126c1724a8c2d28e7930c291eb32dd5" - name = "github.com/gogo/protobuf" - packages = [ - "gogoproto", - "proto", - "protoc-gen-gogo/descriptor", - "sortkeys", - "types", - ] - pruneopts = "UT" - revision = "ba06b47c162d49f2af050fb4c75bcbc86a159d5c" - version = "v1.2.1" - -[[projects]] - digest = "1:5d1b5a25486fc7d4e133646d834f6fca7ba1cef9903d40e7aa786c41b89e9e91" + digest = "1:68f0ad2c2af816280679ccac300f7b765fb6a6567fa949e07fb4c7125a6a6398" name = "github.com/golang/protobuf" packages = [ "proto", @@ -51,11 +29,14 @@ "ptypes", "ptypes/any", "ptypes/duration", + "ptypes/empty", + "ptypes/struct", "ptypes/timestamp", + "ptypes/wrappers", ] pruneopts = "UT" - revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" - version = "v1.2.0" + revision = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7" + version = "v1.3.2" [[projects]] digest = "1:59392ed8afb901aab4287d4894df8191722e34f3957716f4350c8c133ce99046" @@ -246,9 +227,10 @@ input-imports = [ "github.com/envoyproxy/go-control-plane/envoy/service/auth/v2", "github.com/envoyproxy/go-control-plane/envoy/type", - "github.com/gogo/googleapis/google/rpc", "github.com/onsi/ginkgo", "github.com/onsi/gomega", + "google.golang.org/genproto/googleapis/rpc/status", + "google.golang.org/grpc/codes", ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 6dd8398..05b468a 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -4,4 +4,8 @@ [[constraint]] name = "github.com/envoyproxy/go-control-plane" - version = "=v0.8.2" \ No newline at end of file + version = "v0.9.0" + +[[override]] + version = "1.3.2" + name = "github.com/golang/protobuf" \ No newline at end of file diff --git a/api/interface.go b/api/interface.go index 9840917..8389e4c 100644 --- a/api/interface.go +++ b/api/interface.go @@ -5,7 +5,8 @@ import ( envoyauthv2 "github.com/envoyproxy/go-control-plane/envoy/service/auth/v2" envoytype "github.com/envoyproxy/go-control-plane/envoy/type" - "github.com/gogo/googleapis/google/rpc" + "google.golang.org/genproto/googleapis/rpc/status" + "google.golang.org/grpc/codes" ) type StartFunc func(ctx context.Context) error @@ -115,8 +116,8 @@ type ExtAuthPlugin interface { func AuthorizedResponse() *AuthorizationResponse { return &AuthorizationResponse{ CheckResponse: envoyauthv2.CheckResponse{ - Status: &rpc.Status{ - Code: int32(rpc.OK), + Status: &status.Status{ + Code: int32(codes.OK), }, }, } @@ -126,8 +127,8 @@ func AuthorizedResponse() *AuthorizationResponse { func UnauthorizedResponse() *AuthorizationResponse { return &AuthorizationResponse{ CheckResponse: envoyauthv2.CheckResponse{ - Status: &rpc.Status{ - Code: int32(rpc.PERMISSION_DENIED), + Status: &status.Status{ + Code: int32(codes.PermissionDenied), }, }, } diff --git a/changelog/v0.1.1/update-go-control-plane.yaml b/changelog/v0.1.1/update-go-control-plane.yaml new file mode 100644 index 0000000..91b0830 --- /dev/null +++ b/changelog/v0.1.1/update-go-control-plane.yaml @@ -0,0 +1,6 @@ +changelog: + - type: DEPENDENCY_BUMP + dependencyOwner: envoyproxy + dependencyRepo: go-control-plane + dependencyTag: v0.9.0 + description: Update go-control-plane to 0.9.0 \ No newline at end of file