From fa29e780f08eb1280c81f8e716d98ac52f7a6c57 Mon Sep 17 00:00:00 2001 From: Pratyoy Mukhopadhyay <35388175+pmmukh@users.noreply.github.com> Date: Wed, 28 Jul 2021 14:51:36 -0700 Subject: [PATCH] [NO-TICKET] Upgrade protoc-gen-go to 1.26, upgrade protoc to 3.17.3 (#12171) * [NO-TICKET] Set protoc-gen-go to 1.23, upgrade protoc to 3.17.3 * [NO-TICKET] Upgrade version of protoc-gen-go to 1.26 --- helper/forwarding/types.pb.go | 9 ++------- helper/identity/mfa/types.pb.go | 9 ++------- helper/identity/types.pb.go | 9 ++------- helper/storagepacker/types.pb.go | 9 ++------- physical/raft/types.pb.go | 9 ++------- sdk/database/dbplugin/database.pb.go | 9 ++------- sdk/database/dbplugin/v5/proto/database.pb.go | 9 ++------- sdk/logical/identity.pb.go | 9 ++------- sdk/logical/plugin.pb.go | 9 ++------- sdk/plugin/pb/backend.pb.go | 9 ++------- vault/activity/activity_log.pb.go | 9 ++------- vault/request_forwarding_service.pb.go | 9 ++------- 12 files changed, 24 insertions(+), 84 deletions(-) diff --git a/helper/forwarding/types.pb.go b/helper/forwarding/types.pb.go index 20afe243a..be61f311a 100644 --- a/helper/forwarding/types.pb.go +++ b/helper/forwarding/types.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.15.8 +// protoc-gen-go v1.26.0 +// protoc v3.17.3 // source: helper/forwarding/types.proto package forwarding import ( - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -21,10 +20,6 @@ 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 Request struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/helper/identity/mfa/types.pb.go b/helper/identity/mfa/types.pb.go index 61e676a45..5230f4a1b 100644 --- a/helper/identity/mfa/types.pb.go +++ b/helper/identity/mfa/types.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.15.8 +// protoc-gen-go v1.26.0 +// protoc v3.17.3 // source: helper/identity/mfa/types.proto package mfa import ( - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -21,10 +20,6 @@ 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 - // Config represents the configuration information used *along with* the MFA // secret tied to caller's identity, to verify the MFA credentials supplied. // Configuration information differs by type. Handler of each type should know diff --git a/helper/identity/types.pb.go b/helper/identity/types.pb.go index dec0016d4..a5bd81f8d 100644 --- a/helper/identity/types.pb.go +++ b/helper/identity/types.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.15.8 +// protoc-gen-go v1.26.0 +// protoc v3.17.3 // source: helper/identity/types.proto package identity import ( - proto "github.com/golang/protobuf/proto" mfa "github.com/hashicorp/vault/helper/identity/mfa" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -23,10 +22,6 @@ 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 - // Group represents an identity group. type Group struct { state protoimpl.MessageState diff --git a/helper/storagepacker/types.pb.go b/helper/storagepacker/types.pb.go index 57dbf170e..ba00547df 100644 --- a/helper/storagepacker/types.pb.go +++ b/helper/storagepacker/types.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.15.8 +// protoc-gen-go v1.26.0 +// protoc v3.17.3 // source: helper/storagepacker/types.proto package storagepacker import ( - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" anypb "google.golang.org/protobuf/types/known/anypb" @@ -22,10 +21,6 @@ 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 - // Item represents an entry that gets inserted into the storage packer type Item struct { state protoimpl.MessageState diff --git a/physical/raft/types.pb.go b/physical/raft/types.pb.go index bad68eb7a..07a5a30ec 100644 --- a/physical/raft/types.pb.go +++ b/physical/raft/types.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.15.8 +// protoc-gen-go v1.26.0 +// protoc v3.17.3 // source: physical/raft/types.proto package raft import ( - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -21,10 +20,6 @@ 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 LogOperation struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/sdk/database/dbplugin/database.pb.go b/sdk/database/dbplugin/database.pb.go index 3cb35111c..2bd3b2ffc 100644 --- a/sdk/database/dbplugin/database.pb.go +++ b/sdk/database/dbplugin/database.pb.go @@ -1,14 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.15.8 +// protoc-gen-go v1.26.0 +// protoc v3.17.3 // source: sdk/database/dbplugin/database.proto package dbplugin import ( context "context" - proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -26,10 +25,6 @@ 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 - // Deprecated: Do not use. type InitializeRequest struct { state protoimpl.MessageState diff --git a/sdk/database/dbplugin/v5/proto/database.pb.go b/sdk/database/dbplugin/v5/proto/database.pb.go index 9c8ca8218..9f72fda53 100644 --- a/sdk/database/dbplugin/v5/proto/database.pb.go +++ b/sdk/database/dbplugin/v5/proto/database.pb.go @@ -1,14 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.15.8 +// protoc-gen-go v1.26.0 +// protoc v3.17.3 // source: sdk/database/dbplugin/v5/proto/database.proto package proto import ( context "context" - proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -27,10 +26,6 @@ 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 - ///////////////// // Initialize() ///////////////// diff --git a/sdk/logical/identity.pb.go b/sdk/logical/identity.pb.go index 1f5d3fbba..0a99bc74e 100644 --- a/sdk/logical/identity.pb.go +++ b/sdk/logical/identity.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.15.8 +// protoc-gen-go v1.26.0 +// protoc v3.17.3 // source: sdk/logical/identity.proto package logical import ( - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -21,10 +20,6 @@ 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 Entity struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/sdk/logical/plugin.pb.go b/sdk/logical/plugin.pb.go index e43fc12a8..539e0579a 100644 --- a/sdk/logical/plugin.pb.go +++ b/sdk/logical/plugin.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.15.8 +// protoc-gen-go v1.26.0 +// protoc v3.17.3 // source: sdk/logical/plugin.proto package logical import ( - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -21,10 +20,6 @@ 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 PluginEnvironment struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/sdk/plugin/pb/backend.pb.go b/sdk/plugin/pb/backend.pb.go index cbf595ac3..9b550a0c5 100644 --- a/sdk/plugin/pb/backend.pb.go +++ b/sdk/plugin/pb/backend.pb.go @@ -1,14 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.15.8 +// protoc-gen-go v1.26.0 +// protoc v3.17.3 // source: sdk/plugin/pb/backend.proto package pb import ( context "context" - proto "github.com/golang/protobuf/proto" logical "github.com/hashicorp/vault/sdk/logical" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -27,10 +26,6 @@ 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 Empty struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/vault/activity/activity_log.pb.go b/vault/activity/activity_log.pb.go index 3e7d290b1..3c94d2bbd 100644 --- a/vault/activity/activity_log.pb.go +++ b/vault/activity/activity_log.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.15.8 +// protoc-gen-go v1.26.0 +// protoc v3.17.3 // source: vault/activity/activity_log.proto package activity import ( - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -21,10 +20,6 @@ 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 - // EntityRecord is generated the first time an entity is active // each month. type EntityRecord struct { diff --git a/vault/request_forwarding_service.pb.go b/vault/request_forwarding_service.pb.go index 05ccce30d..ecf5e0da9 100644 --- a/vault/request_forwarding_service.pb.go +++ b/vault/request_forwarding_service.pb.go @@ -1,14 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.15.8 +// protoc-gen-go v1.26.0 +// protoc v3.17.3 // source: vault/request_forwarding_service.proto package vault import ( context "context" - proto "github.com/golang/protobuf/proto" forwarding "github.com/hashicorp/vault/helper/forwarding" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -26,10 +25,6 @@ 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 EchoRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache