PMM-6760 Fix protobuf dependency (#591)

* PMM-6760 Fix protobuf dependency * PMM-6760 Update
percona · Oct 13, 2020 · f1b6388 · f1b6388
1 parent 586b64b
commit f1b6388
Show file tree

Hide file tree

Showing 31 changed files with 199 additions and 37 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -40,13 +40,13 @@ required = [
   name = "github.com/pkg/errors"
   version = "=0.9.1"
 [[constraint]]
+  # FIXME Update to 1.4.3 once it is tagged. See https://github.com/golang/protobuf/issues/1219
   name = "github.com/golang/protobuf"
-  version = "=1.4.2"
+  source = "github.com/cybrcodr/protobuf"
+  revision = "3beb084e9a50bff8d7ac57f1c9aa41671f479cbd"
 [[constraint]]
-  # FIXME Update to 1.26.0 once it is tagged. See https://github.com/golang/protobuf/issues/1219
   name = "google.golang.org/protobuf"
-  # version = "=1.26.0"
-  revision = "f62736dede0a74248d862247dbcb53ab69582a05"
+  version = "=1.25.0"
 [[constraint]]
   name = "google.golang.org/grpc"
   version = "=1.32.0"

diff --git a/api/agentlocalpb/agentlocal.pb.go b/api/agentlocalpb/agentlocal.pb.go
diff --git a/api/agentpb/agent.pb.go b/api/agentpb/agent.pb.go
diff --git a/api/agentpb/collector.pb.go b/api/agentpb/collector.pb.go
diff --git a/api/inventorypb/agent_status.pb.go b/api/inventorypb/agent_status.pb.go
diff --git a/api/inventorypb/agents.pb.go b/api/inventorypb/agents.pb.go
diff --git a/api/inventorypb/nodes.pb.go b/api/inventorypb/nodes.pb.go
diff --git a/api/inventorypb/services.pb.go b/api/inventorypb/services.pb.go
diff --git a/api/managementpb/actions.pb.go b/api/managementpb/actions.pb.go
diff --git a/api/managementpb/annotation.pb.go b/api/managementpb/annotation.pb.go
diff --git a/api/managementpb/checks.pb.go b/api/managementpb/checks.pb.go
diff --git a/api/managementpb/dbaas/kubernetes.pb.go b/api/managementpb/dbaas/kubernetes.pb.go