From 69e3f93ee8a3ce83cfd4682621a61a8a49716093 Mon Sep 17 00:00:00 2001 From: Semir Patel Date: Tue, 12 Dec 2023 13:50:19 -0600 Subject: [PATCH] resource: add partition resource to proto-public to keep ENT and CE in sync (#19920) --- .../pbtenancy/v2beta1/partition.pb.binary.go | 18 ++ .../pbtenancy/v2beta1/partition.pb.go | 170 ++++++++++++++++++ .../pbtenancy/v2beta1/partition.proto | 15 ++ .../v2beta1/partition_deepcopy.gen.go | 27 +++ .../pbtenancy/v2beta1/partition_json.gen.go | 22 +++ .../pbtenancy/v2beta1/resource_types.gen.go | 7 + 6 files changed, 259 insertions(+) create mode 100644 proto-public/pbtenancy/v2beta1/partition.pb.binary.go create mode 100644 proto-public/pbtenancy/v2beta1/partition.pb.go create mode 100644 proto-public/pbtenancy/v2beta1/partition.proto create mode 100644 proto-public/pbtenancy/v2beta1/partition_deepcopy.gen.go create mode 100644 proto-public/pbtenancy/v2beta1/partition_json.gen.go diff --git a/proto-public/pbtenancy/v2beta1/partition.pb.binary.go b/proto-public/pbtenancy/v2beta1/partition.pb.binary.go new file mode 100644 index 0000000000..bf5f81f83b --- /dev/null +++ b/proto-public/pbtenancy/v2beta1/partition.pb.binary.go @@ -0,0 +1,18 @@ +// Code generated by protoc-gen-go-binary. DO NOT EDIT. +// source: pbtenancy/v2beta1/partition.proto + +package tenancyv2beta1 + +import ( + "google.golang.org/protobuf/proto" +) + +// MarshalBinary implements encoding.BinaryMarshaler +func (msg *Partition) MarshalBinary() ([]byte, error) { + return proto.Marshal(msg) +} + +// UnmarshalBinary implements encoding.BinaryUnmarshaler +func (msg *Partition) UnmarshalBinary(b []byte) error { + return proto.Unmarshal(b, msg) +} diff --git a/proto-public/pbtenancy/v2beta1/partition.pb.go b/proto-public/pbtenancy/v2beta1/partition.pb.go new file mode 100644 index 0000000000..f86ccb6efd --- /dev/null +++ b/proto-public/pbtenancy/v2beta1/partition.pb.go @@ -0,0 +1,170 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.31.0 +// protoc (unknown) +// source: pbtenancy/v2beta1/partition.proto + +package tenancyv2beta1 + +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) +) + +// The name of the partition (enterprise only) is in the outer Resource.ID.Name. +// It must be unique within a cluster and must be a DNS hostname. +// There are also other reserved names that may not be used. +type Partition struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // Optional user provided description. It is not used internally. + Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"` +} + +func (x *Partition) Reset() { + *x = Partition{} + if protoimpl.UnsafeEnabled { + mi := &file_pbtenancy_v2beta1_partition_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Partition) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Partition) ProtoMessage() {} + +func (x *Partition) ProtoReflect() protoreflect.Message { + mi := &file_pbtenancy_v2beta1_partition_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 Partition.ProtoReflect.Descriptor instead. +func (*Partition) Descriptor() ([]byte, []int) { + return file_pbtenancy_v2beta1_partition_proto_rawDescGZIP(), []int{0} +} + +func (x *Partition) GetDescription() string { + if x != nil { + return x.Description + } + return "" +} + +var File_pbtenancy_v2beta1_partition_proto protoreflect.FileDescriptor + +var file_pbtenancy_v2beta1_partition_proto_rawDesc = []byte{ + 0x0a, 0x21, 0x70, 0x62, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2f, 0x76, 0x32, 0x62, 0x65, + 0x74, 0x61, 0x31, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 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, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 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, 0x35, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x01, 0x42, 0xa4, 0x02, 0x0a, 0x24, 0x63, + 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, + 0x73, 0x75, 0x6c, 0x2e, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2e, 0x76, 0x32, 0x62, 0x65, + 0x74, 0x61, 0x31, 0x42, 0x0e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 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, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, + 0x31, 0x3b, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, + 0xa2, 0x02, 0x03, 0x48, 0x43, 0x54, 0xaa, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, + 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, + 0x79, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x20, 0x48, 0x61, 0x73, 0x68, + 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x54, 0x65, 0x6e, + 0x61, 0x6e, 0x63, 0x79, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x2c, 0x48, + 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, + 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 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, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, + 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_pbtenancy_v2beta1_partition_proto_rawDescOnce sync.Once + file_pbtenancy_v2beta1_partition_proto_rawDescData = file_pbtenancy_v2beta1_partition_proto_rawDesc +) + +func file_pbtenancy_v2beta1_partition_proto_rawDescGZIP() []byte { + file_pbtenancy_v2beta1_partition_proto_rawDescOnce.Do(func() { + file_pbtenancy_v2beta1_partition_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbtenancy_v2beta1_partition_proto_rawDescData) + }) + return file_pbtenancy_v2beta1_partition_proto_rawDescData +} + +var file_pbtenancy_v2beta1_partition_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_pbtenancy_v2beta1_partition_proto_goTypes = []interface{}{ + (*Partition)(nil), // 0: hashicorp.consul.tenancy.v2beta1.Partition +} +var file_pbtenancy_v2beta1_partition_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_pbtenancy_v2beta1_partition_proto_init() } +func file_pbtenancy_v2beta1_partition_proto_init() { + if File_pbtenancy_v2beta1_partition_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_pbtenancy_v2beta1_partition_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Partition); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_pbtenancy_v2beta1_partition_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_pbtenancy_v2beta1_partition_proto_goTypes, + DependencyIndexes: file_pbtenancy_v2beta1_partition_proto_depIdxs, + MessageInfos: file_pbtenancy_v2beta1_partition_proto_msgTypes, + }.Build() + File_pbtenancy_v2beta1_partition_proto = out.File + file_pbtenancy_v2beta1_partition_proto_rawDesc = nil + file_pbtenancy_v2beta1_partition_proto_goTypes = nil + file_pbtenancy_v2beta1_partition_proto_depIdxs = nil +} diff --git a/proto-public/pbtenancy/v2beta1/partition.proto b/proto-public/pbtenancy/v2beta1/partition.proto new file mode 100644 index 0000000000..28aadea877 --- /dev/null +++ b/proto-public/pbtenancy/v2beta1/partition.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +package hashicorp.consul.tenancy.v2beta1; + +import "pbresource/annotations.proto"; + +// The name of the partition (enterprise only) is in the outer Resource.ID.Name. +// It must be unique within a cluster and must be a DNS hostname. +// There are also other reserved names that may not be used. +message Partition { + option (hashicorp.consul.resource.spec) = {scope: SCOPE_CLUSTER}; + + // Optional user provided description. It is not used internally. + string description = 1; +} diff --git a/proto-public/pbtenancy/v2beta1/partition_deepcopy.gen.go b/proto-public/pbtenancy/v2beta1/partition_deepcopy.gen.go new file mode 100644 index 0000000000..5cd234a927 --- /dev/null +++ b/proto-public/pbtenancy/v2beta1/partition_deepcopy.gen.go @@ -0,0 +1,27 @@ +// Code generated by protoc-gen-deepcopy. DO NOT EDIT. +package tenancyv2beta1 + +import ( + proto "google.golang.org/protobuf/proto" +) + +// DeepCopyInto supports using Partition within kubernetes types, where deepcopy-gen is used. +func (in *Partition) DeepCopyInto(out *Partition) { + proto.Reset(out) + proto.Merge(out, proto.Clone(in)) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Partition. Required by controller-gen. +func (in *Partition) DeepCopy() *Partition { + if in == nil { + return nil + } + out := new(Partition) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new Partition. Required by controller-gen. +func (in *Partition) DeepCopyInterface() interface{} { + return in.DeepCopy() +} diff --git a/proto-public/pbtenancy/v2beta1/partition_json.gen.go b/proto-public/pbtenancy/v2beta1/partition_json.gen.go new file mode 100644 index 0000000000..5345607c21 --- /dev/null +++ b/proto-public/pbtenancy/v2beta1/partition_json.gen.go @@ -0,0 +1,22 @@ +// Code generated by protoc-json-shim. DO NOT EDIT. +package tenancyv2beta1 + +import ( + protojson "google.golang.org/protobuf/encoding/protojson" +) + +// MarshalJSON is a custom marshaler for Partition +func (this *Partition) MarshalJSON() ([]byte, error) { + str, err := PartitionMarshaler.Marshal(this) + return []byte(str), err +} + +// UnmarshalJSON is a custom unmarshaler for Partition +func (this *Partition) UnmarshalJSON(b []byte) error { + return PartitionUnmarshaler.Unmarshal(b, this) +} + +var ( + PartitionMarshaler = &protojson.MarshalOptions{} + PartitionUnmarshaler = &protojson.UnmarshalOptions{DiscardUnknown: false} +) diff --git a/proto-public/pbtenancy/v2beta1/resource_types.gen.go b/proto-public/pbtenancy/v2beta1/resource_types.gen.go index b0c3040408..0ba553c60c 100644 --- a/proto-public/pbtenancy/v2beta1/resource_types.gen.go +++ b/proto-public/pbtenancy/v2beta1/resource_types.gen.go @@ -11,6 +11,7 @@ const ( Version = "v2beta1" NamespaceKind = "Namespace" + PartitionKind = "Partition" ) var ( @@ -19,4 +20,10 @@ var ( GroupVersion: Version, Kind: NamespaceKind, } + + PartitionType = &pbresource.Type{ + Group: GroupName, + GroupVersion: Version, + Kind: PartitionKind, + } )