From b22679d48e8caf3c6dfbcc5d2c178b27ca28c09d Mon Sep 17 00:00:00 2001 From: Alexey Palazhchenko Date: Tue, 13 Oct 2020 11:11:58 +0300 Subject: [PATCH 1/2] PMM-6760 Fix protobuf dependency --- Gopkg.lock | 15 +++++++++------ Gopkg.toml | 8 ++++---- utils/depstests/depstests.go | 2 ++ utils/depstests/protobuf_test.go | 22 ++++++++++++++++++++++ 4 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 utils/depstests/depstests.go create mode 100644 utils/depstests/protobuf_test.go diff --git a/Gopkg.lock b/Gopkg.lock index eeb70734e4..8aeafe4f10 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -247,7 +247,7 @@ revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" [[projects]] - digest = "1:57d0b887eebb6fefe6c03e830990573e6f2166f94bdbd063533f028f71f43b65" + digest = "1:9e17a600e850883a04031a0dacb03ec04100a31e3614e321978dd1608636d0a2" name = "github.com/golang/protobuf" packages = [ "descriptor", @@ -265,8 +265,8 @@ "ptypes/wrappers", ] pruneopts = "NUT" - revision = "d04d7b157bb510b1e0c10132224b616ac0e26b17" - version = "v1.4.2" + revision = "9555db085a1e42fd2a40d91bd0c85038df7ab6d7" + source = "github.com/cybrcodr/protobuf" [[projects]] digest = "1:85d0c5fbdc502c3e55f78d7d2f62f9d1a95deb5921e5806b14a6b6948abe678d" @@ -744,7 +744,7 @@ version = "v1.32.0" [[projects]] - digest = "1:31077c00ccc16efd35add9d1d5e9a24d8c105b54e2a4052af923a19839fa9b79" + digest = "1:678baddf5584eab077d61e74fd42f8fe60b54911cfbce375039745f3b15c1102" name = "google.golang.org/protobuf" packages = [ "cmd/protoc-gen-go/internal_gengo", @@ -761,12 +761,13 @@ "internal/encoding/tag", "internal/encoding/text", "internal/errors", + "internal/fieldsort", "internal/filedesc", "internal/filetype", "internal/flags", "internal/genid", "internal/impl", - "internal/order", + "internal/mapsort", "internal/pragma", "internal/set", "internal/strs", @@ -786,7 +787,8 @@ "types/pluginpb", ] pruneopts = "NUT" - revision = "f62736dede0a74248d862247dbcb53ab69582a05" + revision = "3f7a61f89bb6813f89d981d1870ed68da0b3c3f1" + version = "v1.25.0" [[projects]] digest = "1:22b2dee6f30bc8601f087449a2a819df8388e54e9547349c658f14d8f8c590f2" @@ -844,6 +846,7 @@ "github.com/go-swagger/go-swagger", "github.com/go-swagger/go-swagger/cmd/swagger", "github.com/golang/protobuf/descriptor", + "github.com/golang/protobuf/jsonpb", "github.com/golang/protobuf/proto", "github.com/golang/protobuf/protoc-gen-go", "github.com/golang/protobuf/ptypes", diff --git a/Gopkg.toml b/Gopkg.toml index cbf0eed03e..a55ccaef44 100644 --- 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 = "9555db085a1e42fd2a40d91bd0c85038df7ab6d7" [[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/utils/depstests/depstests.go b/utils/depstests/depstests.go new file mode 100644 index 0000000000..40d21be5e1 --- /dev/null +++ b/utils/depstests/depstests.go @@ -0,0 +1,2 @@ +// Package depstests contains tests for our critical dependencies. +package depstests diff --git a/utils/depstests/protobuf_test.go b/utils/depstests/protobuf_test.go new file mode 100644 index 0000000000..f5983f1951 --- /dev/null +++ b/utils/depstests/protobuf_test.go @@ -0,0 +1,22 @@ +package depstests + +import ( + "testing" + "time" + + "github.com/golang/protobuf/jsonpb" + "github.com/golang/protobuf/ptypes" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestDuration(t *testing.T) { + // https://github.com/golang/protobuf/issues/883 + // https://github.com/golang/protobuf/issues/1219 + // https://jira.percona.com/browse/PMM-6760 + + var m jsonpb.Marshaler + s, err := m.MarshalToString(ptypes.DurationProto(-time.Nanosecond)) + require.NoError(t, err) + assert.Equal(t, `"-0.000000001s"`, s) +} From 00d29436e4b13ed33f6478610933e9cb8afcdc6c Mon Sep 17 00:00:00 2001 From: Alexey Palazhchenko Date: Tue, 13 Oct 2020 11:31:18 +0300 Subject: [PATCH 2/2] PMM-6760 Update --- Gopkg.lock | 4 ++-- Gopkg.toml | 2 +- api/agentlocalpb/agentlocal.pb.go | 7 ++++++- api/agentpb/agent.pb.go | 7 ++++++- api/agentpb/collector.pb.go | 7 ++++++- api/inventorypb/agent_status.pb.go | 7 ++++++- api/inventorypb/agents.pb.go | 7 ++++++- api/inventorypb/nodes.pb.go | 7 ++++++- api/inventorypb/services.pb.go | 7 ++++++- api/managementpb/actions.pb.go | 7 ++++++- api/managementpb/annotation.pb.go | 7 ++++++- api/managementpb/checks.pb.go | 7 ++++++- api/managementpb/dbaas/kubernetes.pb.go | 7 ++++++- api/managementpb/dbaas/xtradb_cluster.pb.go | 7 ++++++- api/managementpb/external.pb.go | 7 ++++++- api/managementpb/mongodb.pb.go | 7 ++++++- api/managementpb/mysql.pb.go | 7 ++++++- api/managementpb/node.pb.go | 7 ++++++- api/managementpb/postgresql.pb.go | 7 ++++++- api/managementpb/proxysql.pb.go | 7 ++++++- api/managementpb/rds.pb.go | 7 ++++++- api/managementpb/service.pb.go | 7 ++++++- api/qanpb/collector.pb.go | 7 ++++++- api/qanpb/filters.pb.go | 7 ++++++- api/qanpb/metrics_names.pb.go | 7 ++++++- api/qanpb/object_details.pb.go | 7 ++++++- api/qanpb/profile.pb.go | 7 ++++++- api/qanpb/qan.pb.go | 7 ++++++- api/serverpb/server.pb.go | 7 ++++++- 29 files changed, 165 insertions(+), 30 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 8aeafe4f10..67550b6679 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -247,7 +247,7 @@ revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" [[projects]] - digest = "1:9e17a600e850883a04031a0dacb03ec04100a31e3614e321978dd1608636d0a2" + digest = "1:c761d51467dc0d440251e98aded657e8ff4faf3fc09d7e5aa0e2f4d8e297b30d" name = "github.com/golang/protobuf" packages = [ "descriptor", @@ -265,7 +265,7 @@ "ptypes/wrappers", ] pruneopts = "NUT" - revision = "9555db085a1e42fd2a40d91bd0c85038df7ab6d7" + revision = "3beb084e9a50bff8d7ac57f1c9aa41671f479cbd" source = "github.com/cybrcodr/protobuf" [[projects]] diff --git a/Gopkg.toml b/Gopkg.toml index a55ccaef44..58a44ed7e9 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -43,7 +43,7 @@ required = [ # FIXME Update to 1.4.3 once it is tagged. See https://github.com/golang/protobuf/issues/1219 name = "github.com/golang/protobuf" source = "github.com/cybrcodr/protobuf" - revision = "9555db085a1e42fd2a40d91bd0c85038df7ab6d7" + revision = "3beb084e9a50bff8d7ac57f1c9aa41671f479cbd" [[constraint]] name = "google.golang.org/protobuf" version = "=1.25.0" diff --git a/api/agentlocalpb/agentlocal.pb.go b/api/agentlocalpb/agentlocal.pb.go index 514206fe0c..d72d53b638 100644 --- a/api/agentlocalpb/agentlocal.pb.go +++ b/api/agentlocalpb/agentlocal.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: agentlocalpb/agentlocal.proto @@ -8,6 +8,7 @@ package agentlocalpb import ( context "context" + proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" inventorypb "github.com/percona/pmm/api/inventorypb" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -27,6 +28,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // ServerInfo contains information about the PMM Server. type ServerInfo struct { state protoimpl.MessageState diff --git a/api/agentpb/agent.pb.go b/api/agentpb/agent.pb.go index 2b880eeb74..aa48ca02d3 100644 --- a/api/agentpb/agent.pb.go +++ b/api/agentpb/agent.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: agentpb/agent.proto @@ -8,6 +8,7 @@ package agentpb import ( context "context" + proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" timestamp "github.com/golang/protobuf/ptypes/timestamp" inventorypb "github.com/percona/pmm/api/inventorypb" @@ -27,6 +28,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // MysqlExplainOutputFormat output formats supported by MySQL Explain action. type MysqlExplainOutputFormat int32 diff --git a/api/agentpb/collector.pb.go b/api/agentpb/collector.pb.go index ec5b2e348f..c4aed8d86f 100644 --- a/api/agentpb/collector.pb.go +++ b/api/agentpb/collector.pb.go @@ -1,12 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: agentpb/collector.proto package agentpb import ( + proto "github.com/golang/protobuf/proto" inventorypb "github.com/percona/pmm/api/inventorypb" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -21,6 +22,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // ExampleFormat is format of query example: real or query without values. // // Deprecated: is not used, should not be used, should be removed. diff --git a/api/inventorypb/agent_status.pb.go b/api/inventorypb/agent_status.pb.go index 2e7d0a2a0c..7197567f44 100644 --- a/api/inventorypb/agent_status.pb.go +++ b/api/inventorypb/agent_status.pb.go @@ -1,12 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: inventorypb/agent_status.proto package inventorypb import ( + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -20,6 +21,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // AgentStatus represents actual Agent status. type AgentStatus int32 diff --git a/api/inventorypb/agents.pb.go b/api/inventorypb/agents.pb.go index 0c2719bdb8..b7e204d39f 100644 --- a/api/inventorypb/agents.pb.go +++ b/api/inventorypb/agents.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: inventorypb/agents.proto @@ -8,6 +8,7 @@ package inventorypb import ( context "context" + proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -26,6 +27,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // AgentType describes supported Agent types. type AgentType int32 diff --git a/api/inventorypb/nodes.pb.go b/api/inventorypb/nodes.pb.go index 42e1e4cf98..d7e6fe1f67 100644 --- a/api/inventorypb/nodes.pb.go +++ b/api/inventorypb/nodes.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: inventorypb/nodes.proto @@ -8,6 +8,7 @@ package inventorypb import ( context "context" + proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -26,6 +27,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // NodeType describes supported Node types. type NodeType int32 diff --git a/api/inventorypb/services.pb.go b/api/inventorypb/services.pb.go index 0d9b1e09c1..7eb22e69ca 100644 --- a/api/inventorypb/services.pb.go +++ b/api/inventorypb/services.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: inventorypb/services.proto @@ -8,6 +8,7 @@ package inventorypb import ( context "context" + proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -26,6 +27,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // ServiceType describes supported Service types. type ServiceType int32 diff --git a/api/managementpb/actions.pb.go b/api/managementpb/actions.pb.go index e9e13a7dd3..ab4f29be6e 100644 --- a/api/managementpb/actions.pb.go +++ b/api/managementpb/actions.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: managementpb/actions.proto @@ -8,6 +8,7 @@ package managementpb import ( context "context" + proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -26,6 +27,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // ActionType represents Action type. type ActionType int32 diff --git a/api/managementpb/annotation.pb.go b/api/managementpb/annotation.pb.go index 3d299b9c9a..02dc07284b 100644 --- a/api/managementpb/annotation.pb.go +++ b/api/managementpb/annotation.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: managementpb/annotation.proto @@ -8,6 +8,7 @@ package managementpb import ( context "context" + proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -26,6 +27,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // AddAnnotationRequest is a params to add new annotation. type AddAnnotationRequest struct { state protoimpl.MessageState diff --git a/api/managementpb/checks.pb.go b/api/managementpb/checks.pb.go index 52a074372f..23cc3073de 100644 --- a/api/managementpb/checks.pb.go +++ b/api/managementpb/checks.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: managementpb/checks.proto @@ -8,6 +8,7 @@ package managementpb import ( context "context" + proto "github.com/golang/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -25,6 +26,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // Severity represents severity level of the check result. type Severity int32 diff --git a/api/managementpb/dbaas/kubernetes.pb.go b/api/managementpb/dbaas/kubernetes.pb.go index 1e1414ce2a..780d113459 100644 --- a/api/managementpb/dbaas/kubernetes.pb.go +++ b/api/managementpb/dbaas/kubernetes.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: managementpb/dbaas/kubernetes.proto @@ -8,6 +8,7 @@ package dbaasv1beta1 import ( context "context" + proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -26,6 +27,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // KubeAuth represents Kubernetes / kubectl authentication and authorization information. type KubeAuth struct { state protoimpl.MessageState diff --git a/api/managementpb/dbaas/xtradb_cluster.pb.go b/api/managementpb/dbaas/xtradb_cluster.pb.go index ee41a6fcb0..e88fcd3c07 100644 --- a/api/managementpb/dbaas/xtradb_cluster.pb.go +++ b/api/managementpb/dbaas/xtradb_cluster.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: managementpb/dbaas/xtradb_cluster.proto @@ -8,6 +8,7 @@ package dbaasv1beta1 import ( context "context" + proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -26,6 +27,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // XtraDBClusterState represents XtraDB cluster CR state. type XtraDBClusterState int32 diff --git a/api/managementpb/external.pb.go b/api/managementpb/external.pb.go index 847b58d7da..442c5c5a23 100644 --- a/api/managementpb/external.pb.go +++ b/api/managementpb/external.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: managementpb/external.proto @@ -8,6 +8,7 @@ package managementpb import ( context "context" + proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" inventorypb "github.com/percona/pmm/api/inventorypb" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -27,6 +28,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + type AddExternalRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/api/managementpb/mongodb.pb.go b/api/managementpb/mongodb.pb.go index 20fefb604a..aefc5f8fe7 100644 --- a/api/managementpb/mongodb.pb.go +++ b/api/managementpb/mongodb.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: managementpb/mongodb.proto @@ -8,6 +8,7 @@ package managementpb import ( context "context" + proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" inventorypb "github.com/percona/pmm/api/inventorypb" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -27,6 +28,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + type AddMongoDBRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/api/managementpb/mysql.pb.go b/api/managementpb/mysql.pb.go index e134f05896..1f96ca1cd4 100644 --- a/api/managementpb/mysql.pb.go +++ b/api/managementpb/mysql.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: managementpb/mysql.proto @@ -8,6 +8,7 @@ package managementpb import ( context "context" + proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" inventorypb "github.com/percona/pmm/api/inventorypb" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -27,6 +28,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + type AddMySQLRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/api/managementpb/node.pb.go b/api/managementpb/node.pb.go index 9a15414b60..b8325cb5c2 100644 --- a/api/managementpb/node.pb.go +++ b/api/managementpb/node.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: managementpb/node.proto @@ -8,6 +8,7 @@ package managementpb import ( context "context" + proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" inventorypb "github.com/percona/pmm/api/inventorypb" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -27,6 +28,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + type RegisterNodeRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/api/managementpb/postgresql.pb.go b/api/managementpb/postgresql.pb.go index cbe6427bd0..3eecf437f8 100644 --- a/api/managementpb/postgresql.pb.go +++ b/api/managementpb/postgresql.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: managementpb/postgresql.proto @@ -8,6 +8,7 @@ package managementpb import ( context "context" + proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" inventorypb "github.com/percona/pmm/api/inventorypb" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -27,6 +28,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + type AddPostgreSQLRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/api/managementpb/proxysql.pb.go b/api/managementpb/proxysql.pb.go index 1ef1e37c2a..8ee1f8df1a 100644 --- a/api/managementpb/proxysql.pb.go +++ b/api/managementpb/proxysql.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: managementpb/proxysql.proto @@ -8,6 +8,7 @@ package managementpb import ( context "context" + proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" inventorypb "github.com/percona/pmm/api/inventorypb" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -27,6 +28,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + type AddProxySQLRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/api/managementpb/rds.pb.go b/api/managementpb/rds.pb.go index 1f573d55e5..d59cecfa9d 100644 --- a/api/managementpb/rds.pb.go +++ b/api/managementpb/rds.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: managementpb/rds.proto @@ -8,6 +8,7 @@ package managementpb import ( context "context" + proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" inventorypb "github.com/percona/pmm/api/inventorypb" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -27,6 +28,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // DiscoverRDSEngine describes supported RDS instance engines. type DiscoverRDSEngine int32 diff --git a/api/managementpb/service.pb.go b/api/managementpb/service.pb.go index 8a78e70faa..3684f7924c 100644 --- a/api/managementpb/service.pb.go +++ b/api/managementpb/service.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: managementpb/service.proto @@ -8,6 +8,7 @@ package managementpb import ( context "context" + proto "github.com/golang/protobuf/proto" _ "github.com/mwitkow/go-proto-validators" inventorypb "github.com/percona/pmm/api/inventorypb" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -27,6 +28,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // AddNodeParams is a params to add new node to inventory while adding new service. type AddNodeParams struct { state protoimpl.MessageState diff --git a/api/qanpb/collector.pb.go b/api/qanpb/collector.pb.go index 7b1590baaf..1d40f26881 100644 --- a/api/qanpb/collector.pb.go +++ b/api/qanpb/collector.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: qanpb/collector.proto @@ -8,6 +8,7 @@ package qanpb import ( context "context" + proto "github.com/golang/protobuf/proto" inventorypb "github.com/percona/pmm/api/inventorypb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -25,6 +26,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + type CollectRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/api/qanpb/filters.pb.go b/api/qanpb/filters.pb.go index 5c9592c895..313be130d8 100644 --- a/api/qanpb/filters.pb.go +++ b/api/qanpb/filters.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: qanpb/filters.proto @@ -8,6 +8,7 @@ package qanpb import ( context "context" + proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -26,6 +27,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // FiltersRequest contains period for which we need filters. type FiltersRequest struct { state protoimpl.MessageState diff --git a/api/qanpb/metrics_names.pb.go b/api/qanpb/metrics_names.pb.go index 95856bb300..6ade6409df 100644 --- a/api/qanpb/metrics_names.pb.go +++ b/api/qanpb/metrics_names.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: qanpb/metrics_names.proto @@ -8,6 +8,7 @@ package qanpb import ( context "context" + proto "github.com/golang/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -25,6 +26,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // MetricsNamesRequest is emty. type MetricsNamesRequest struct { state protoimpl.MessageState diff --git a/api/qanpb/object_details.pb.go b/api/qanpb/object_details.pb.go index ed5ceb318f..2fa50dd305 100644 --- a/api/qanpb/object_details.pb.go +++ b/api/qanpb/object_details.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: qanpb/object_details.proto @@ -8,6 +8,7 @@ package qanpb import ( context "context" + proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -26,6 +27,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // MetricsRequest defines filtering of metrics for specific value of dimension (ex.: host=hostname1 or queryid=1D410B4BE5060972. type MetricsRequest struct { state protoimpl.MessageState diff --git a/api/qanpb/profile.pb.go b/api/qanpb/profile.pb.go index fa8691c9b2..4dead2f27f 100644 --- a/api/qanpb/profile.pb.go +++ b/api/qanpb/profile.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: qanpb/profile.proto @@ -8,6 +8,7 @@ package qanpb import ( context "context" + proto "github.com/golang/protobuf/proto" timestamp "github.com/golang/protobuf/ptypes/timestamp" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -26,6 +27,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // ReportRequest defines filtering of metrics report for db server or other dimentions. type ReportRequest struct { state protoimpl.MessageState diff --git a/api/qanpb/qan.pb.go b/api/qanpb/qan.pb.go index 1259e976eb..ec00a1d527 100644 --- a/api/qanpb/qan.pb.go +++ b/api/qanpb/qan.pb.go @@ -1,12 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: qanpb/qan.proto package qanpb import ( + proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -20,6 +21,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // ExampleFormat is format of query example: real or query without values. // // Deprecated: is not used, should not be used, should be removed. diff --git a/api/serverpb/server.pb.go b/api/serverpb/server.pb.go index 3b1b336415..58e8e6712f 100644 --- a/api/serverpb/server.pb.go +++ b/api/serverpb/server.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel +// protoc-gen-go v1.25.0 // protoc v3.13.0 // source: serverpb/server.proto @@ -8,6 +8,7 @@ package serverpb import ( context "context" + proto "github.com/golang/protobuf/proto" duration "github.com/golang/protobuf/ptypes/duration" timestamp "github.com/golang/protobuf/ptypes/timestamp" _ "github.com/mwitkow/go-proto-validators" @@ -28,6 +29,10 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +// This is a compile-time assertion that a sufficiently up-to-date version +// of the legacy proto package is being used. +const _ = proto.ProtoPackageIsVersion4 + // DistributionMethod defines PMM Server distribution method: Docker image, OVF/OVA, or AMI. type DistributionMethod int32