diff --git a/internal/auth/internal/controllers/trafficpermissions/builder.go b/internal/auth/internal/controllers/trafficpermissions/builder.go index 7eb952b563..3fa129f999 100644 --- a/internal/auth/internal/controllers/trafficpermissions/builder.go +++ b/internal/auth/internal/controllers/trafficpermissions/builder.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/consul/internal/auth/internal/types" "github.com/hashicorp/consul/internal/resource" pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1" - pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2" + pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1" "github.com/hashicorp/consul/proto-public/pbresource" ) diff --git a/internal/auth/internal/controllers/trafficpermissions/expander/expander_ce/expander_ce.go b/internal/auth/internal/controllers/trafficpermissions/expander/expander_ce/expander_ce.go index f90397cf3c..0ae1436230 100644 --- a/internal/auth/internal/controllers/trafficpermissions/expander/expander_ce/expander_ce.go +++ b/internal/auth/internal/controllers/trafficpermissions/expander/expander_ce/expander_ce.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/consul/internal/auth/internal/types" "github.com/hashicorp/consul/internal/controller" pbauth "github.com/hashicorp/consul/proto-public/pbauth/v2beta1" - pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2" + pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1" ) type XTrafficPermissions interface { diff --git a/internal/auth/internal/controllers/trafficpermissions/expander/interface.go b/internal/auth/internal/controllers/trafficpermissions/expander/interface.go index 84d1a88bb0..421f41c9c5 100644 --- a/internal/auth/internal/controllers/trafficpermissions/expander/interface.go +++ b/internal/auth/internal/controllers/trafficpermissions/expander/interface.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/consul/internal/auth/internal/types" "github.com/hashicorp/consul/internal/controller" - pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2" + pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1" ) // SamenessGroupExpander is used to expand sameness group for a ComputedTrafficPermission resource diff --git a/internal/catalog/internal/controllers/failover/controller.go b/internal/catalog/internal/controllers/failover/controller.go index 455ade9797..30761b1c3b 100644 --- a/internal/catalog/internal/controllers/failover/controller.go +++ b/internal/catalog/internal/controllers/failover/controller.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/consul/internal/controller/dependency" "github.com/hashicorp/consul/internal/resource" pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1" - pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2" + pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1" "github.com/hashicorp/consul/proto-public/pbresource" ) diff --git a/internal/catalog/internal/controllers/failover/expander/expander_ce/expander_test.go b/internal/catalog/internal/controllers/failover/expander/expander_ce/expander_test.go index 60cfb6b9c5..72a16fd2f4 100644 --- a/internal/catalog/internal/controllers/failover/expander/expander_ce/expander_test.go +++ b/internal/catalog/internal/controllers/failover/expander/expander_ce/expander_test.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/consul/internal/resource" rtest "github.com/hashicorp/consul/internal/resource/resourcetest" pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1" - pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2" + pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1" "github.com/hashicorp/consul/proto-public/pbresource" "github.com/hashicorp/consul/sdk/testutil" "github.com/stretchr/testify/require" diff --git a/internal/multicluster/internal/controllers/exportedservices/builder.go b/internal/multicluster/internal/controllers/exportedservices/builder.go index 8aa2ae8150..f9ba1057ba 100644 --- a/internal/multicluster/internal/controllers/exportedservices/builder.go +++ b/internal/multicluster/internal/controllers/exportedservices/builder.go @@ -10,6 +10,7 @@ import ( "github.com/hashicorp/consul/internal/multicluster/internal/types" "github.com/hashicorp/consul/internal/resource" pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2" + pbmulticlusterv2beta1 "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1" "github.com/hashicorp/consul/proto-public/pbresource" ) @@ -22,12 +23,12 @@ type serviceExports struct { type exportedServicesBuilder struct { data map[resource.ReferenceKey]*serviceExports samenessGroupsExpander ExportedServicesSamenessGroupExpander - samenessGroupsNameToMemberMap map[string][]*pbmulticluster.SamenessGroupMember + samenessGroupsNameToMemberMap map[string][]*pbmulticlusterv2beta1.SamenessGroupMember missingSamenessGroups map[resource.ReferenceKey][]string } func newExportedServicesBuilder(samenessGroupsExpander ExportedServicesSamenessGroupExpander, samenessGroups []*types.DecodedSamenessGroup) *exportedServicesBuilder { - samenessGroupsNameToMemberMap := make(map[string][]*pbmulticluster.SamenessGroupMember) + samenessGroupsNameToMemberMap := make(map[string][]*pbmulticlusterv2beta1.SamenessGroupMember) for _, sg := range samenessGroups { sgData := sg.GetData() if sgData == nil { diff --git a/internal/multicluster/internal/controllers/exportedservices/controller.go b/internal/multicluster/internal/controllers/exportedservices/controller.go index 9af676a867..9a63b17604 100644 --- a/internal/multicluster/internal/controllers/exportedservices/controller.go +++ b/internal/multicluster/internal/controllers/exportedservices/controller.go @@ -18,6 +18,7 @@ import ( "github.com/hashicorp/consul/internal/storage" pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1" pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2" + pbmulticlusterv2beta1 "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1" "github.com/hashicorp/consul/proto-public/pbresource" ) @@ -30,7 +31,7 @@ type ExportedServicesSamenessGroupExpander interface { // them as individual slices // // It also returns back the list of sameness group names that can't be resolved. - Expand([]*pbmulticluster.ExportedServicesConsumer, map[string][]*pbmulticluster.SamenessGroupMember) (*expanderTypes.ExpandedConsumers, error) + Expand([]*pbmulticluster.ExportedServicesConsumer, map[string][]*pbmulticlusterv2beta1.SamenessGroupMember) (*expanderTypes.ExpandedConsumers, error) // List returns the list of sameness groups present in a given partition List(context.Context, controller.Runtime, controller.Request) ([]*types.DecodedSamenessGroup, error) diff --git a/internal/multicluster/internal/controllers/exportedservices/expander/expander_ce/expander.go b/internal/multicluster/internal/controllers/exportedservices/expander/expander_ce/expander.go index 80343283f4..0909d82454 100644 --- a/internal/multicluster/internal/controllers/exportedservices/expander/expander_ce/expander.go +++ b/internal/multicluster/internal/controllers/exportedservices/expander/expander_ce/expander.go @@ -11,6 +11,7 @@ import ( expanderTypes "github.com/hashicorp/consul/internal/multicluster/internal/controllers/exportedservices/expander/types" "github.com/hashicorp/consul/internal/multicluster/internal/types" pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2" + pbmulticlusterv2beta1 "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1" ) type SamenessGroupExpander struct{} @@ -23,7 +24,7 @@ func (sg *SamenessGroupExpander) List(_ context.Context, _ controller.Runtime, _ return nil, nil } -func (sg *SamenessGroupExpander) Expand(consumers []*pbmulticluster.ExportedServicesConsumer, _ map[string][]*pbmulticluster.SamenessGroupMember) (*expanderTypes.ExpandedConsumers, error) { +func (sg *SamenessGroupExpander) Expand(consumers []*pbmulticluster.ExportedServicesConsumer, _ map[string][]*pbmulticlusterv2beta1.SamenessGroupMember) (*expanderTypes.ExpandedConsumers, error) { peers := make([]string, 0) peersMap := make(map[string]struct{}) for _, c := range consumers { diff --git a/internal/multicluster/internal/types/decoded.go b/internal/multicluster/internal/types/decoded.go index e28cfd41d8..ebeb7f6a77 100644 --- a/internal/multicluster/internal/types/decoded.go +++ b/internal/multicluster/internal/types/decoded.go @@ -5,13 +5,14 @@ package types import ( "github.com/hashicorp/consul/internal/resource" - pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2" + v2 "github.com/hashicorp/consul/proto-public/pbmulticluster/v2" + v2beta1 "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1" ) type ( - DecodedExportedServices = resource.DecodedResource[*pbmulticluster.ExportedServices] - DecodedNamespaceExportedServices = resource.DecodedResource[*pbmulticluster.NamespaceExportedServices] - DecodedPartitionExportedServices = resource.DecodedResource[*pbmulticluster.PartitionExportedServices] + DecodedExportedServices = resource.DecodedResource[*v2.ExportedServices] + DecodedNamespaceExportedServices = resource.DecodedResource[*v2.NamespaceExportedServices] + DecodedPartitionExportedServices = resource.DecodedResource[*v2.PartitionExportedServices] - DecodedSamenessGroup = resource.DecodedResource[*pbmulticluster.SamenessGroup] + DecodedSamenessGroup = resource.DecodedResource[*v2beta1.SamenessGroup] ) diff --git a/proto-public/pbmulticluster/v2/resources.rtypes.go b/proto-public/pbmulticluster/v2/resources.rtypes.go index 6cbbc35735..8ac6f6b860 100644 --- a/proto-public/pbmulticluster/v2/resources.rtypes.go +++ b/proto-public/pbmulticluster/v2/resources.rtypes.go @@ -14,7 +14,6 @@ const ( ExportedServicesKind = "ExportedServices" NamespaceExportedServicesKind = "NamespaceExportedServices" PartitionExportedServicesKind = "PartitionExportedServices" - SamenessGroupKind = "SamenessGroup" ) var ( @@ -41,10 +40,4 @@ var ( GroupVersion: Version, Kind: PartitionExportedServicesKind, } - - SamenessGroupType = &pbresource.Type{ - Group: GroupName, - GroupVersion: Version, - Kind: SamenessGroupKind, - } ) diff --git a/proto-public/pbmulticluster/v2/sameness_group.pb.go b/proto-public/pbmulticluster/v2/sameness_group.pb.go deleted file mode 100644 index e99d572f67..0000000000 --- a/proto-public/pbmulticluster/v2/sameness_group.pb.go +++ /dev/null @@ -1,288 +0,0 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.31.0 -// protoc (unknown) -// source: pbmulticluster/v2/sameness_group.proto - -package multiclusterv2 - -import ( - _ "github.com/hashicorp/consul/proto-public/pbresource" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -type SamenessGroup struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - DefaultForFailover bool `protobuf:"varint,1,opt,name=default_for_failover,json=defaultForFailover,proto3" json:"default_for_failover,omitempty"` - Members []*SamenessGroupMember `protobuf:"bytes,2,rep,name=members,proto3" json:"members,omitempty"` -} - -func (x *SamenessGroup) Reset() { - *x = SamenessGroup{} - if protoimpl.UnsafeEnabled { - mi := &file_pbmulticluster_v2_sameness_group_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SamenessGroup) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SamenessGroup) ProtoMessage() {} - -func (x *SamenessGroup) ProtoReflect() protoreflect.Message { - mi := &file_pbmulticluster_v2_sameness_group_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use SamenessGroup.ProtoReflect.Descriptor instead. -func (*SamenessGroup) Descriptor() ([]byte, []int) { - return file_pbmulticluster_v2_sameness_group_proto_rawDescGZIP(), []int{0} -} - -func (x *SamenessGroup) GetDefaultForFailover() bool { - if x != nil { - return x.DefaultForFailover - } - return false -} - -func (x *SamenessGroup) GetMembers() []*SamenessGroupMember { - if x != nil { - return x.Members - } - return nil -} - -type SamenessGroupMember struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // Types that are assignable to Member: - // - // *SamenessGroupMember_Peer - // *SamenessGroupMember_Partition - Member isSamenessGroupMember_Member `protobuf_oneof:"member"` -} - -func (x *SamenessGroupMember) Reset() { - *x = SamenessGroupMember{} - if protoimpl.UnsafeEnabled { - mi := &file_pbmulticluster_v2_sameness_group_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SamenessGroupMember) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SamenessGroupMember) ProtoMessage() {} - -func (x *SamenessGroupMember) ProtoReflect() protoreflect.Message { - mi := &file_pbmulticluster_v2_sameness_group_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use SamenessGroupMember.ProtoReflect.Descriptor instead. -func (*SamenessGroupMember) Descriptor() ([]byte, []int) { - return file_pbmulticluster_v2_sameness_group_proto_rawDescGZIP(), []int{1} -} - -func (m *SamenessGroupMember) GetMember() isSamenessGroupMember_Member { - if m != nil { - return m.Member - } - return nil -} - -func (x *SamenessGroupMember) GetPeer() string { - if x, ok := x.GetMember().(*SamenessGroupMember_Peer); ok { - return x.Peer - } - return "" -} - -func (x *SamenessGroupMember) GetPartition() string { - if x, ok := x.GetMember().(*SamenessGroupMember_Partition); ok { - return x.Partition - } - return "" -} - -type isSamenessGroupMember_Member interface { - isSamenessGroupMember_Member() -} - -type SamenessGroupMember_Peer struct { - Peer string `protobuf:"bytes,1,opt,name=peer,proto3,oneof"` -} - -type SamenessGroupMember_Partition struct { - Partition string `protobuf:"bytes,2,opt,name=partition,proto3,oneof"` -} - -func (*SamenessGroupMember_Peer) isSamenessGroupMember_Member() {} - -func (*SamenessGroupMember_Partition) isSamenessGroupMember_Member() {} - -var File_pbmulticluster_v2_sameness_group_proto protoreflect.FileDescriptor - -var file_pbmulticluster_v2_sameness_group_proto_rawDesc = []byte{ - 0x0a, 0x26, 0x70, 0x62, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, - 0x2f, 0x76, 0x32, 0x2f, 0x73, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x67, 0x72, 0x6f, - 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, - 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x75, 0x6c, 0x74, 0x69, - 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9a, 0x01, 0x0a, 0x0d, 0x53, 0x61, 0x6d, - 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x30, 0x0a, 0x14, 0x64, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x66, 0x61, 0x69, 0x6c, 0x6f, 0x76, - 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x46, 0x6f, 0x72, 0x46, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x12, 0x4f, 0x0a, 0x07, - 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, - 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, - 0x2e, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, - 0x2e, 0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, - 0x6d, 0x62, 0x65, 0x72, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x3a, 0x06, 0xa2, - 0x93, 0x04, 0x02, 0x08, 0x02, 0x22, 0x55, 0x0a, 0x13, 0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, - 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x04, - 0x70, 0x65, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x70, 0x65, - 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x42, 0x08, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0xa8, 0x02, 0x0a, - 0x24, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, - 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, - 0x65, 0x72, 0x2e, 0x76, 0x32, 0x42, 0x12, 0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, - 0x72, 0x6f, 0x75, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x49, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, - 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x70, - 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, - 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x32, 0x3b, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, - 0x73, 0x74, 0x65, 0x72, 0x76, 0x32, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x20, 0x48, - 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, - 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x56, 0x32, 0xca, - 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, - 0x75, 0x6c, 0x5c, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5c, - 0x56, 0x32, 0xe2, 0x02, 0x2c, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, - 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, - 0x65, 0x72, 0x5c, 0x56, 0x32, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, - 0x61, 0xea, 0x02, 0x23, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, - 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, - 0x74, 0x65, 0x72, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_pbmulticluster_v2_sameness_group_proto_rawDescOnce sync.Once - file_pbmulticluster_v2_sameness_group_proto_rawDescData = file_pbmulticluster_v2_sameness_group_proto_rawDesc -) - -func file_pbmulticluster_v2_sameness_group_proto_rawDescGZIP() []byte { - file_pbmulticluster_v2_sameness_group_proto_rawDescOnce.Do(func() { - file_pbmulticluster_v2_sameness_group_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmulticluster_v2_sameness_group_proto_rawDescData) - }) - return file_pbmulticluster_v2_sameness_group_proto_rawDescData -} - -var file_pbmulticluster_v2_sameness_group_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_pbmulticluster_v2_sameness_group_proto_goTypes = []interface{}{ - (*SamenessGroup)(nil), // 0: hashicorp.consul.multicluster.v2.SamenessGroup - (*SamenessGroupMember)(nil), // 1: hashicorp.consul.multicluster.v2.SamenessGroupMember -} -var file_pbmulticluster_v2_sameness_group_proto_depIdxs = []int32{ - 1, // 0: hashicorp.consul.multicluster.v2.SamenessGroup.members:type_name -> hashicorp.consul.multicluster.v2.SamenessGroupMember - 1, // [1:1] is the sub-list for method output_type - 1, // [1:1] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name -} - -func init() { file_pbmulticluster_v2_sameness_group_proto_init() } -func file_pbmulticluster_v2_sameness_group_proto_init() { - if File_pbmulticluster_v2_sameness_group_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_pbmulticluster_v2_sameness_group_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SamenessGroup); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_pbmulticluster_v2_sameness_group_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SamenessGroupMember); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_pbmulticluster_v2_sameness_group_proto_msgTypes[1].OneofWrappers = []interface{}{ - (*SamenessGroupMember_Peer)(nil), - (*SamenessGroupMember_Partition)(nil), - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_pbmulticluster_v2_sameness_group_proto_rawDesc, - NumEnums: 0, - NumMessages: 2, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_pbmulticluster_v2_sameness_group_proto_goTypes, - DependencyIndexes: file_pbmulticluster_v2_sameness_group_proto_depIdxs, - MessageInfos: file_pbmulticluster_v2_sameness_group_proto_msgTypes, - }.Build() - File_pbmulticluster_v2_sameness_group_proto = out.File - file_pbmulticluster_v2_sameness_group_proto_rawDesc = nil - file_pbmulticluster_v2_sameness_group_proto_goTypes = nil - file_pbmulticluster_v2_sameness_group_proto_depIdxs = nil -} diff --git a/proto-public/pbmulticluster/v2beta1/resources.rtypes.go b/proto-public/pbmulticluster/v2beta1/resources.rtypes.go new file mode 100644 index 0000000000..c07aa6d1cd --- /dev/null +++ b/proto-public/pbmulticluster/v2beta1/resources.rtypes.go @@ -0,0 +1,22 @@ +// Code generated by protoc-gen-resource-types. DO NOT EDIT. + +package multiclusterv2beta1 + +import ( + "github.com/hashicorp/consul/proto-public/pbresource" +) + +const ( + GroupName = "multicluster" + Version = "v2beta1" + + SamenessGroupKind = "SamenessGroup" +) + +var ( + SamenessGroupType = &pbresource.Type{ + Group: GroupName, + GroupVersion: Version, + Kind: SamenessGroupKind, + } +) diff --git a/proto-public/pbmulticluster/v2/sameness_group.pb.binary.go b/proto-public/pbmulticluster/v2beta1/sameness_group.pb.binary.go similarity index 89% rename from proto-public/pbmulticluster/v2/sameness_group.pb.binary.go rename to proto-public/pbmulticluster/v2beta1/sameness_group.pb.binary.go index 4187c2f81d..d067128561 100644 --- a/proto-public/pbmulticluster/v2/sameness_group.pb.binary.go +++ b/proto-public/pbmulticluster/v2beta1/sameness_group.pb.binary.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-binary. DO NOT EDIT. -// source: pbmulticluster/v2/sameness_group.proto +// source: pbmulticluster/v2beta1/sameness_group.proto -package multiclusterv2 +package multiclusterv2beta1 import ( "google.golang.org/protobuf/proto" diff --git a/proto-public/pbmulticluster/v2beta1/sameness_group.pb.go b/proto-public/pbmulticluster/v2beta1/sameness_group.pb.go new file mode 100644 index 0000000000..da11051f79 --- /dev/null +++ b/proto-public/pbmulticluster/v2beta1/sameness_group.pb.go @@ -0,0 +1,292 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.31.0 +// protoc (unknown) +// source: pbmulticluster/v2beta1/sameness_group.proto + +package multiclusterv2beta1 + +import ( + _ "github.com/hashicorp/consul/proto-public/pbresource" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type SamenessGroup struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + DefaultForFailover bool `protobuf:"varint,1,opt,name=default_for_failover,json=defaultForFailover,proto3" json:"default_for_failover,omitempty"` + Members []*SamenessGroupMember `protobuf:"bytes,2,rep,name=members,proto3" json:"members,omitempty"` +} + +func (x *SamenessGroup) Reset() { + *x = SamenessGroup{} + if protoimpl.UnsafeEnabled { + mi := &file_pbmulticluster_v2beta1_sameness_group_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SamenessGroup) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SamenessGroup) ProtoMessage() {} + +func (x *SamenessGroup) ProtoReflect() protoreflect.Message { + mi := &file_pbmulticluster_v2beta1_sameness_group_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SamenessGroup.ProtoReflect.Descriptor instead. +func (*SamenessGroup) Descriptor() ([]byte, []int) { + return file_pbmulticluster_v2beta1_sameness_group_proto_rawDescGZIP(), []int{0} +} + +func (x *SamenessGroup) GetDefaultForFailover() bool { + if x != nil { + return x.DefaultForFailover + } + return false +} + +func (x *SamenessGroup) GetMembers() []*SamenessGroupMember { + if x != nil { + return x.Members + } + return nil +} + +type SamenessGroupMember struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // Types that are assignable to Member: + // + // *SamenessGroupMember_Peer + // *SamenessGroupMember_Partition + Member isSamenessGroupMember_Member `protobuf_oneof:"member"` +} + +func (x *SamenessGroupMember) Reset() { + *x = SamenessGroupMember{} + if protoimpl.UnsafeEnabled { + mi := &file_pbmulticluster_v2beta1_sameness_group_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SamenessGroupMember) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SamenessGroupMember) ProtoMessage() {} + +func (x *SamenessGroupMember) ProtoReflect() protoreflect.Message { + mi := &file_pbmulticluster_v2beta1_sameness_group_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use SamenessGroupMember.ProtoReflect.Descriptor instead. +func (*SamenessGroupMember) Descriptor() ([]byte, []int) { + return file_pbmulticluster_v2beta1_sameness_group_proto_rawDescGZIP(), []int{1} +} + +func (m *SamenessGroupMember) GetMember() isSamenessGroupMember_Member { + if m != nil { + return m.Member + } + return nil +} + +func (x *SamenessGroupMember) GetPeer() string { + if x, ok := x.GetMember().(*SamenessGroupMember_Peer); ok { + return x.Peer + } + return "" +} + +func (x *SamenessGroupMember) GetPartition() string { + if x, ok := x.GetMember().(*SamenessGroupMember_Partition); ok { + return x.Partition + } + return "" +} + +type isSamenessGroupMember_Member interface { + isSamenessGroupMember_Member() +} + +type SamenessGroupMember_Peer struct { + Peer string `protobuf:"bytes,1,opt,name=peer,proto3,oneof"` +} + +type SamenessGroupMember_Partition struct { + Partition string `protobuf:"bytes,2,opt,name=partition,proto3,oneof"` +} + +func (*SamenessGroupMember_Peer) isSamenessGroupMember_Member() {} + +func (*SamenessGroupMember_Partition) isSamenessGroupMember_Member() {} + +var File_pbmulticluster_v2beta1_sameness_group_proto protoreflect.FileDescriptor + +var file_pbmulticluster_v2beta1_sameness_group_proto_rawDesc = []byte{ + 0x0a, 0x2b, 0x70, 0x62, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, + 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x73, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, + 0x73, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x25, 0x68, + 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, + 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x62, + 0x65, 0x74, 0x61, 0x31, 0x1a, 0x1c, 0x70, 0x62, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x22, 0x9f, 0x01, 0x0a, 0x0d, 0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x12, 0x30, 0x0a, 0x14, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, + 0x66, 0x6f, 0x72, 0x5f, 0x66, 0x61, 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x12, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x46, 0x6f, 0x72, 0x46, 0x61, + 0x69, 0x6c, 0x6f, 0x76, 0x65, 0x72, 0x12, 0x54, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, + 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, + 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x75, 0x6c, 0x74, 0x69, + 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, + 0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, + 0x62, 0x65, 0x72, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x3a, 0x06, 0xa2, 0x93, + 0x04, 0x02, 0x08, 0x02, 0x22, 0x55, 0x0a, 0x13, 0x53, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, + 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x04, 0x70, + 0x65, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x70, 0x65, 0x65, + 0x72, 0x12, 0x1e, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x42, 0x08, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x42, 0xcb, 0x02, 0x0a, 0x29, + 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, + 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, + 0x72, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x12, 0x53, 0x61, 0x6d, 0x65, 0x6e, + 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, + 0x53, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, + 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x2d, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x2f, 0x70, 0x62, 0x6d, 0x75, 0x6c, 0x74, + 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, + 0x3b, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x76, 0x32, 0x62, + 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x25, 0x48, 0x61, 0x73, + 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x75, + 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, + 0x61, 0x31, 0xca, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, + 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, + 0x65, 0x72, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x31, 0x48, 0x61, 0x73, + 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x75, + 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, + 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, + 0x28, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x3a, 0x3a, 0x43, 0x6f, 0x6e, 0x73, + 0x75, 0x6c, 0x3a, 0x3a, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, + 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, +} + +var ( + file_pbmulticluster_v2beta1_sameness_group_proto_rawDescOnce sync.Once + file_pbmulticluster_v2beta1_sameness_group_proto_rawDescData = file_pbmulticluster_v2beta1_sameness_group_proto_rawDesc +) + +func file_pbmulticluster_v2beta1_sameness_group_proto_rawDescGZIP() []byte { + file_pbmulticluster_v2beta1_sameness_group_proto_rawDescOnce.Do(func() { + file_pbmulticluster_v2beta1_sameness_group_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmulticluster_v2beta1_sameness_group_proto_rawDescData) + }) + return file_pbmulticluster_v2beta1_sameness_group_proto_rawDescData +} + +var file_pbmulticluster_v2beta1_sameness_group_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_pbmulticluster_v2beta1_sameness_group_proto_goTypes = []interface{}{ + (*SamenessGroup)(nil), // 0: hashicorp.consul.multicluster.v2beta1.SamenessGroup + (*SamenessGroupMember)(nil), // 1: hashicorp.consul.multicluster.v2beta1.SamenessGroupMember +} +var file_pbmulticluster_v2beta1_sameness_group_proto_depIdxs = []int32{ + 1, // 0: hashicorp.consul.multicluster.v2beta1.SamenessGroup.members:type_name -> hashicorp.consul.multicluster.v2beta1.SamenessGroupMember + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_pbmulticluster_v2beta1_sameness_group_proto_init() } +func file_pbmulticluster_v2beta1_sameness_group_proto_init() { + if File_pbmulticluster_v2beta1_sameness_group_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_pbmulticluster_v2beta1_sameness_group_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SamenessGroup); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pbmulticluster_v2beta1_sameness_group_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SamenessGroupMember); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + file_pbmulticluster_v2beta1_sameness_group_proto_msgTypes[1].OneofWrappers = []interface{}{ + (*SamenessGroupMember_Peer)(nil), + (*SamenessGroupMember_Partition)(nil), + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_pbmulticluster_v2beta1_sameness_group_proto_rawDesc, + NumEnums: 0, + NumMessages: 2, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_pbmulticluster_v2beta1_sameness_group_proto_goTypes, + DependencyIndexes: file_pbmulticluster_v2beta1_sameness_group_proto_depIdxs, + MessageInfos: file_pbmulticluster_v2beta1_sameness_group_proto_msgTypes, + }.Build() + File_pbmulticluster_v2beta1_sameness_group_proto = out.File + file_pbmulticluster_v2beta1_sameness_group_proto_rawDesc = nil + file_pbmulticluster_v2beta1_sameness_group_proto_goTypes = nil + file_pbmulticluster_v2beta1_sameness_group_proto_depIdxs = nil +} diff --git a/proto-public/pbmulticluster/v2/sameness_group.proto b/proto-public/pbmulticluster/v2beta1/sameness_group.proto similarity index 89% rename from proto-public/pbmulticluster/v2/sameness_group.proto rename to proto-public/pbmulticluster/v2beta1/sameness_group.proto index c1527e8f63..5181342bfe 100644 --- a/proto-public/pbmulticluster/v2/sameness_group.proto +++ b/proto-public/pbmulticluster/v2beta1/sameness_group.proto @@ -3,7 +3,7 @@ syntax = "proto3"; -package hashicorp.consul.multicluster.v2; +package hashicorp.consul.multicluster.v2beta1; import "pbresource/annotations.proto"; diff --git a/proto-public/pbmulticluster/v2/sameness_group_deepcopy.gen.go b/proto-public/pbmulticluster/v2beta1/sameness_group_deepcopy.gen.go similarity index 98% rename from proto-public/pbmulticluster/v2/sameness_group_deepcopy.gen.go rename to proto-public/pbmulticluster/v2beta1/sameness_group_deepcopy.gen.go index b8d5a06547..8be15ea7a0 100644 --- a/proto-public/pbmulticluster/v2/sameness_group_deepcopy.gen.go +++ b/proto-public/pbmulticluster/v2beta1/sameness_group_deepcopy.gen.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-deepcopy. DO NOT EDIT. -package multiclusterv2 +package multiclusterv2beta1 import ( proto "google.golang.org/protobuf/proto" diff --git a/proto-public/pbmulticluster/v2/sameness_group_json.gen.go b/proto-public/pbmulticluster/v2beta1/sameness_group_json.gen.go similarity index 97% rename from proto-public/pbmulticluster/v2/sameness_group_json.gen.go rename to proto-public/pbmulticluster/v2beta1/sameness_group_json.gen.go index aa6389840d..d3434feed2 100644 --- a/proto-public/pbmulticluster/v2/sameness_group_json.gen.go +++ b/proto-public/pbmulticluster/v2beta1/sameness_group_json.gen.go @@ -1,5 +1,5 @@ // Code generated by protoc-json-shim. DO NOT EDIT. -package multiclusterv2 +package multiclusterv2beta1 import ( protojson "google.golang.org/protobuf/encoding/protojson" diff --git a/testing/deployer/util/v2.go b/testing/deployer/util/v2.go index 3255d98a4a..cebae23a3a 100644 --- a/testing/deployer/util/v2.go +++ b/testing/deployer/util/v2.go @@ -6,7 +6,7 @@ package util import ( "fmt" - pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2" + pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1" "github.com/hashicorp/consul/proto-public/pbresource" )