From 749591ec98699ff2086aa6a2dd06a1aaf0054d00 Mon Sep 17 00:00:00 2001 From: Kyle Havlovitz Date: Tue, 24 May 2022 10:14:45 -0700 Subject: [PATCH] Specify go_package explicitly --- .changelog/13143.txt | 3 +++ agent/grpc/private/internal/testservice/simple.proto | 2 ++ proto-public/pbacl/acl.pb.go | 7 +------ proto-public/pbconnectca/ca.pb.go | 7 +------ proto-public/pbdataplane/dataplane.pb.go | 7 +------ proto-public/pbserverdiscovery/serverdiscovery.pb.go | 7 +------ proto/pbacl/acl.pb.go | 7 +------ proto/pbautoconf/auto_config.pb.go | 7 +------ proto/pbcommon/common.pb.go | 7 +------ proto/pbconfig/config.pb.go | 7 +------ proto/pbconnect/connect.pb.go | 7 +------ proto/pbpeering/peering.pb.go | 7 +------ proto/pbservice/healthcheck.pb.go | 7 +------ proto/pbservice/node.pb.go | 7 +------ proto/pbservice/service.pb.go | 7 +------ proto/pbstatus/status.pb.go | 7 +------ proto/pbsubscribe/subscribe.pb.go | 7 +------ 17 files changed, 20 insertions(+), 90 deletions(-) create mode 100644 .changelog/13143.txt diff --git a/.changelog/13143.txt b/.changelog/13143.txt new file mode 100644 index 000000000..4b0bf2388 --- /dev/null +++ b/.changelog/13143.txt @@ -0,0 +1,3 @@ +```release-note:improvement +connect: Added a `max_inbound_connections` setting to service-defaults for limiting the number of concurrent inbound connections to each service instance. +``` \ No newline at end of file diff --git a/agent/grpc/private/internal/testservice/simple.proto b/agent/grpc/private/internal/testservice/simple.proto index b3cc5b64a..31a53308f 100644 --- a/agent/grpc/private/internal/testservice/simple.proto +++ b/agent/grpc/private/internal/testservice/simple.proto @@ -2,6 +2,8 @@ syntax = "proto3"; package testservice; +option go_package = "github.com/hashicorp/consul/agent/grpc/private/internal/testservice"; + // Simple service is used to test gRPC plumbing. service Simple { rpc Something(Req) returns (Resp) {} diff --git a/proto-public/pbacl/acl.pb.go b/proto-public/pbacl/acl.pb.go index ec65a181c..24fbd31a0 100644 --- a/proto-public/pbacl/acl.pb.go +++ b/proto-public/pbacl/acl.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 +// protoc-gen-go v1.26.0-rc.1 // protoc (unknown) // source: proto-public/pbacl/acl.proto package pbacl 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 LogoutResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/proto-public/pbconnectca/ca.pb.go b/proto-public/pbconnectca/ca.pb.go index c569cd173..b639d4a96 100644 --- a/proto-public/pbconnectca/ca.pb.go +++ b/proto-public/pbconnectca/ca.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 +// protoc-gen-go v1.26.0-rc.1 // protoc (unknown) // source: proto-public/pbconnectca/ca.proto package pbconnectca import ( - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" timestamppb "google.golang.org/protobuf/types/known/timestamppb" @@ -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 - type WatchRootsRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/proto-public/pbdataplane/dataplane.pb.go b/proto-public/pbdataplane/dataplane.pb.go index 8642778f5..4f9346b3f 100644 --- a/proto-public/pbdataplane/dataplane.pb.go +++ b/proto-public/pbdataplane/dataplane.pb.go @@ -2,14 +2,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 +// protoc-gen-go v1.26.0-rc.1 // protoc (unknown) // source: proto-public/pbdataplane/dataplane.proto package pbdataplane import ( - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" structpb "google.golang.org/protobuf/types/known/structpb" @@ -24,10 +23,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 DataplaneFeatures int32 const ( diff --git a/proto-public/pbserverdiscovery/serverdiscovery.pb.go b/proto-public/pbserverdiscovery/serverdiscovery.pb.go index 3d969dc45..b9db1db2e 100644 --- a/proto-public/pbserverdiscovery/serverdiscovery.pb.go +++ b/proto-public/pbserverdiscovery/serverdiscovery.pb.go @@ -3,14 +3,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 +// protoc-gen-go v1.26.0-rc.1 // protoc (unknown) // source: proto-public/pbserverdiscovery/serverdiscovery.proto package pbserverdiscovery import ( - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -24,10 +23,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 WatchServersRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/proto/pbacl/acl.pb.go b/proto/pbacl/acl.pb.go index 90c0a3189..435a298b0 100644 --- a/proto/pbacl/acl.pb.go +++ b/proto/pbacl/acl.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 +// protoc-gen-go v1.26.0-rc.1 // protoc (unknown) // source: proto/pbacl/acl.proto package pbacl 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 ACLLink struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/proto/pbautoconf/auto_config.pb.go b/proto/pbautoconf/auto_config.pb.go index 2bde181d9..41d2901e6 100644 --- a/proto/pbautoconf/auto_config.pb.go +++ b/proto/pbautoconf/auto_config.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 +// protoc-gen-go v1.26.0-rc.1 // protoc (unknown) // source: proto/pbautoconf/auto_config.proto package pbautoconf import ( - proto "github.com/golang/protobuf/proto" pbconfig "github.com/hashicorp/consul/proto/pbconfig" pbconnect "github.com/hashicorp/consul/proto/pbconnect" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -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 - // AutoConfigRequest is the data structure to be sent along with the // AutoConfig.InitialConfiguration RPC type AutoConfigRequest struct { diff --git a/proto/pbcommon/common.pb.go b/proto/pbcommon/common.pb.go index 0b06a2351..7ccab8739 100644 --- a/proto/pbcommon/common.pb.go +++ b/proto/pbcommon/common.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 +// protoc-gen-go v1.26.0-rc.1 // protoc (unknown) // source: proto/pbcommon/common.proto package pbcommon import ( - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" durationpb "google.golang.org/protobuf/types/known/durationpb" @@ -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 - // RaftIndex is used to track the index used while creating // or modifying a given struct type. // diff --git a/proto/pbconfig/config.pb.go b/proto/pbconfig/config.pb.go index 23606097a..aea729fe3 100644 --- a/proto/pbconfig/config.pb.go +++ b/proto/pbconfig/config.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 +// protoc-gen-go v1.26.0-rc.1 // protoc (unknown) // source: proto/pbconfig/config.proto package pbconfig 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 Config struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/proto/pbconnect/connect.pb.go b/proto/pbconnect/connect.pb.go index ebed2a558..78c9bb077 100644 --- a/proto/pbconnect/connect.pb.go +++ b/proto/pbconnect/connect.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 +// protoc-gen-go v1.26.0-rc.1 // protoc (unknown) // source: proto/pbconnect/connect.proto package pbconnect import ( - proto "github.com/golang/protobuf/proto" pbcommon "github.com/hashicorp/consul/proto/pbcommon" 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 - // CARoots is the list of all currently trusted CA Roots. // // mog annotation: diff --git a/proto/pbpeering/peering.pb.go b/proto/pbpeering/peering.pb.go index 076559173..0259cc964 100644 --- a/proto/pbpeering/peering.pb.go +++ b/proto/pbpeering/peering.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 +// protoc-gen-go v1.26.0-rc.1 // protoc (unknown) // source: proto/pbpeering/peering.proto package pbpeering import ( - proto "github.com/golang/protobuf/proto" pbstatus "github.com/hashicorp/consul/proto/pbstatus" 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 - // PeeringState enumerates all the states a peering can be in type PeeringState int32 diff --git a/proto/pbservice/healthcheck.pb.go b/proto/pbservice/healthcheck.pb.go index 3e14d425d..317f7f6db 100644 --- a/proto/pbservice/healthcheck.pb.go +++ b/proto/pbservice/healthcheck.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 +// protoc-gen-go v1.26.0-rc.1 // protoc (unknown) // source: proto/pbservice/healthcheck.proto package pbservice import ( - proto "github.com/golang/protobuf/proto" pbcommon "github.com/hashicorp/consul/proto/pbcommon" 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 - // HealthCheck represents a single check on a given node // // mog annotation: diff --git a/proto/pbservice/node.pb.go b/proto/pbservice/node.pb.go index a946a8999..fee4534f8 100644 --- a/proto/pbservice/node.pb.go +++ b/proto/pbservice/node.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 +// protoc-gen-go v1.26.0-rc.1 // protoc (unknown) // source: proto/pbservice/node.proto package pbservice import ( - proto "github.com/golang/protobuf/proto" pbcommon "github.com/hashicorp/consul/proto/pbcommon" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -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 - // IndexedCheckServiceNodes is used to return multiple instances for a given service. type IndexedCheckServiceNodes struct { state protoimpl.MessageState diff --git a/proto/pbservice/service.pb.go b/proto/pbservice/service.pb.go index 0061db4b1..80d4b474e 100644 --- a/proto/pbservice/service.pb.go +++ b/proto/pbservice/service.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 +// protoc-gen-go v1.26.0-rc.1 // protoc (unknown) // source: proto/pbservice/service.proto package pbservice import ( - proto "github.com/golang/protobuf/proto" pbcommon "github.com/hashicorp/consul/proto/pbcommon" 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 - // ConnectProxyConfig describes the configuration needed for any proxy managed // or unmanaged. It describes a single logical service's listener and optionally // upstreams and sidecar-related config for a single instance. To describe a diff --git a/proto/pbstatus/status.pb.go b/proto/pbstatus/status.pb.go index 2a8df0f60..f97dbc773 100644 --- a/proto/pbstatus/status.pb.go +++ b/proto/pbstatus/status.pb.go @@ -14,14 +14,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 +// protoc-gen-go v1.26.0-rc.1 // protoc (unknown) // source: proto/pbstatus/status.proto package pbstatus 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" @@ -36,10 +35,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 - // The `Status` type defines a logical error model that is suitable for // different programming environments, including REST APIs and RPC APIs. It is // used by [gRPC](https://github.com/grpc). Each `Status` message contains diff --git a/proto/pbsubscribe/subscribe.pb.go b/proto/pbsubscribe/subscribe.pb.go index 3fcce5bb0..d7459ee9c 100644 --- a/proto/pbsubscribe/subscribe.pb.go +++ b/proto/pbsubscribe/subscribe.pb.go @@ -3,14 +3,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.23.0 +// protoc-gen-go v1.26.0-rc.1 // protoc (unknown) // source: proto/pbsubscribe/subscribe.proto package pbsubscribe import ( - proto "github.com/golang/protobuf/proto" pbservice "github.com/hashicorp/consul/proto/pbservice" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" @@ -25,10 +24,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 - // Topic enumerates the supported event topics. type Topic int32