From 9a5cf66857e0b42a25cf170ef38b4df7db6a792b Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Fri, 19 Apr 2024 16:48:44 +0200 Subject: [PATCH] Update some env related apis --- pkg/environments/environments_v1.pb.go | 172 ++++++++++---------- pkg/environments/environments_v1_grpc.pb.go | 22 +-- proto | 2 +- 3 files changed, 94 insertions(+), 102 deletions(-) diff --git a/pkg/environments/environments_v1.pb.go b/pkg/environments/environments_v1.pb.go index 04367af..ee04014 100644 --- a/pkg/environments/environments_v1.pb.go +++ b/pkg/environments/environments_v1.pb.go @@ -118,16 +118,16 @@ func (Kubernetes) EnumDescriptor() ([]byte, []int) { // * // Represents a environment UUID only // I don't think we need it -type EnvironmentId struct { +type EnvironmentName struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // Contour ID: UUID + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // Contour ID: UUID } -func (x *EnvironmentId) Reset() { - *x = EnvironmentId{} +func (x *EnvironmentName) Reset() { + *x = EnvironmentName{} if protoimpl.UnsafeEnabled { mi := &file_environments_environments_v1_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -135,13 +135,13 @@ func (x *EnvironmentId) Reset() { } } -func (x *EnvironmentId) String() string { +func (x *EnvironmentName) String() string { return protoimpl.X.MessageStringOf(x) } -func (*EnvironmentId) ProtoMessage() {} +func (*EnvironmentName) ProtoMessage() {} -func (x *EnvironmentId) ProtoReflect() protoreflect.Message { +func (x *EnvironmentName) ProtoReflect() protoreflect.Message { mi := &file_environments_environments_v1_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -153,14 +153,14 @@ func (x *EnvironmentId) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use EnvironmentId.ProtoReflect.Descriptor instead. -func (*EnvironmentId) Descriptor() ([]byte, []int) { +// Deprecated: Use EnvironmentName.ProtoReflect.Descriptor instead. +func (*EnvironmentName) Descriptor() ([]byte, []int) { return file_environments_environments_v1_proto_rawDescGZIP(), []int{0} } -func (x *EnvironmentId) GetId() string { +func (x *EnvironmentName) GetName() string { if x != nil { - return x.Id + return x.Name } return "" } @@ -170,7 +170,6 @@ type EnvironmentData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` // Environment name Provider Provider `protobuf:"varint,2,opt,name=provider,proto3,enum=environments.Provider" json:"provider,omitempty"` // Provide Kubernetes Kubernetes `protobuf:"varint,3,opt,name=kubernetes,proto3,enum=environments.Kubernetes" json:"kubernetes,omitempty"` HetznerOptions *HetznerOptions `protobuf:"bytes,4,opt,name=hetzner_options,json=hetznerOptions,proto3" json:"hetzner_options,omitempty"` @@ -208,13 +207,6 @@ func (*EnvironmentData) Descriptor() ([]byte, []int) { return file_environments_environments_v1_proto_rawDescGZIP(), []int{1} } -func (x *EnvironmentData) GetName() string { - if x != nil { - return x.Name - } - return "" -} - func (x *EnvironmentData) GetProvider() Provider { if x != nil { return x.Provider @@ -296,7 +288,7 @@ type EnvironmentFull struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id *EnvironmentId `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Name *EnvironmentName `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Data *EnvironmentData `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` } @@ -332,9 +324,9 @@ func (*EnvironmentFull) Descriptor() ([]byte, []int) { return file_environments_environments_v1_proto_rawDescGZIP(), []int{3} } -func (x *EnvironmentFull) GetId() *EnvironmentId { +func (x *EnvironmentFull) GetName() *EnvironmentName { if x != nil { - return x.Id + return x.Name } return nil } @@ -354,71 +346,71 @@ var file_environments_environments_v1_proto_rawDesc = []byte{ 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0c, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, - 0x1f, 0x0a, 0x0d, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, - 0x22, 0xda, 0x01, 0x0a, 0x0f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, - 0x44, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76, - 0x69, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x65, 0x6e, 0x76, - 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, - 0x65, 0x72, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x38, 0x0a, 0x0a, - 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, - 0x32, 0x18, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, - 0x4b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x52, 0x0a, 0x6b, 0x75, 0x62, 0x65, - 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x12, 0x45, 0x0a, 0x0f, 0x68, 0x65, 0x74, 0x7a, 0x6e, 0x65, - 0x72, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1c, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x48, - 0x65, 0x74, 0x7a, 0x6e, 0x65, 0x72, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x0e, 0x68, - 0x65, 0x74, 0x7a, 0x6e, 0x65, 0x72, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x5a, 0x0a, - 0x0e, 0x48, 0x65, 0x74, 0x7a, 0x6e, 0x65, 0x72, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, - 0x1f, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, - 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x65, 0x72, 0x76, 0x65, - 0x72, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x71, 0x0a, 0x0f, 0x45, 0x6e, 0x76, - 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x12, 0x2b, 0x0a, 0x02, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, + 0x25, 0x0a, 0x0f, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x4e, 0x61, + 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xc6, 0x01, 0x0a, 0x0f, 0x45, 0x6e, 0x76, 0x69, 0x72, + 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x12, 0x32, 0x0a, 0x08, 0x70, 0x72, + 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x65, + 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x76, + 0x69, 0x64, 0x65, 0x72, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x38, + 0x0a, 0x0a, 0x6b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, + 0x73, 0x2e, 0x4b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x52, 0x0a, 0x6b, 0x75, + 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x12, 0x45, 0x0a, 0x0f, 0x68, 0x65, 0x74, 0x7a, + 0x6e, 0x65, 0x72, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x1c, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, + 0x2e, 0x48, 0x65, 0x74, 0x7a, 0x6e, 0x65, 0x72, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, + 0x0e, 0x68, 0x65, 0x74, 0x7a, 0x6e, 0x65, 0x72, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x5a, 0x0a, 0x0e, 0x48, 0x65, 0x74, 0x7a, 0x6e, 0x65, 0x72, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x54, 0x79, + 0x70, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x6c, 0x6f, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x65, 0x72, + 0x76, 0x65, 0x72, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x77, 0x0a, 0x0f, 0x45, + 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x12, 0x31, + 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x65, + 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, + 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x12, 0x31, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, + 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x2a, 0x3a, 0x0a, 0x08, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, + 0x12, 0x18, 0x0a, 0x14, 0x50, 0x52, 0x4f, 0x56, 0x49, 0x44, 0x45, 0x52, 0x5f, 0x55, 0x4e, 0x53, + 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x52, + 0x4f, 0x56, 0x49, 0x44, 0x45, 0x52, 0x5f, 0x48, 0x45, 0x54, 0x5a, 0x4e, 0x45, 0x52, 0x10, 0x01, + 0x2a, 0x3c, 0x0a, 0x0a, 0x4b, 0x75, 0x62, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x12, 0x1a, + 0x0a, 0x16, 0x4b, 0x55, 0x42, 0x45, 0x52, 0x4e, 0x45, 0x54, 0x45, 0x53, 0x5f, 0x55, 0x4e, 0x53, + 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x4b, 0x55, + 0x42, 0x45, 0x52, 0x4e, 0x45, 0x54, 0x45, 0x53, 0x5f, 0x4b, 0x33, 0x53, 0x10, 0x01, 0x32, 0xef, + 0x02, 0x0a, 0x0c, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, + 0x48, 0x0a, 0x06, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, + 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, + 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x1a, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, - 0x65, 0x6e, 0x74, 0x49, 0x64, 0x52, 0x02, 0x69, 0x64, 0x12, 0x31, 0x0a, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, - 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, - 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x2a, 0x3a, 0x0a, 0x08, - 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x14, 0x50, 0x52, 0x4f, 0x56, - 0x49, 0x44, 0x45, 0x52, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, - 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x50, 0x52, 0x4f, 0x56, 0x49, 0x44, 0x45, 0x52, 0x5f, 0x48, - 0x45, 0x54, 0x5a, 0x4e, 0x45, 0x52, 0x10, 0x01, 0x2a, 0x3c, 0x0a, 0x0a, 0x4b, 0x75, 0x62, 0x65, - 0x72, 0x6e, 0x65, 0x74, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x16, 0x4b, 0x55, 0x42, 0x45, 0x52, 0x4e, - 0x45, 0x54, 0x45, 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, - 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x4b, 0x55, 0x42, 0x45, 0x52, 0x4e, 0x45, 0x54, 0x45, 0x53, - 0x5f, 0x4b, 0x33, 0x53, 0x10, 0x01, 0x32, 0xed, 0x02, 0x0a, 0x0c, 0x45, 0x6e, 0x76, 0x69, 0x72, - 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x48, 0x0a, 0x06, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x12, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, - 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, - 0x1a, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, - 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x22, - 0x00, 0x12, 0x48, 0x0a, 0x06, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x1d, 0x2e, 0x65, 0x6e, - 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, - 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x1a, 0x1d, 0x2e, 0x65, 0x6e, 0x76, - 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, - 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x22, 0x00, 0x12, 0x41, 0x0a, 0x06, 0x44, - 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, - 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, - 0x46, 0x75, 0x6c, 0x6c, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x43, - 0x0a, 0x03, 0x47, 0x65, 0x74, 0x12, 0x1b, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, - 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, - 0x49, 0x64, 0x1a, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, - 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, - 0x6c, 0x22, 0x00, 0x12, 0x41, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x1a, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, + 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x22, 0x00, 0x12, 0x48, 0x0a, 0x06, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x12, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, - 0x6c, 0x6c, 0x22, 0x00, 0x30, 0x01, 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x2e, 0x62, 0x61, - 0x64, 0x68, 0x6f, 0x75, 0x73, 0x65, 0x70, 0x6c, 0x61, 0x6e, 0x74, 0x73, 0x2e, 0x6e, 0x65, 0x74, - 0x2f, 0x73, 0x6f, 0x66, 0x74, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2f, 0x73, 0x6f, 0x66, 0x74, - 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2d, 0x67, 0x6f, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, - 0x70, 0x6b, 0x67, 0x2f, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6c, 0x6c, 0x1a, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, + 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, + 0x6c, 0x22, 0x00, 0x12, 0x41, 0x0a, 0x06, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x1d, 0x2e, + 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, + 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x1a, 0x16, 0x2e, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, + 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x45, 0x0a, 0x03, 0x47, 0x65, 0x74, 0x12, 0x1d, 0x2e, + 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, + 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x1d, 0x2e, 0x65, + 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, 0x69, + 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x22, 0x00, 0x12, 0x41, 0x0a, + 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1d, 0x2e, + 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x6e, 0x76, + 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x00, 0x30, 0x01, + 0x42, 0x48, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x64, 0x68, 0x6f, 0x75, 0x73, 0x65, + 0x70, 0x6c, 0x61, 0x6e, 0x74, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x2f, 0x73, 0x6f, 0x66, 0x74, 0x70, + 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2f, 0x73, 0x6f, 0x66, 0x74, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, + 0x2d, 0x67, 0x6f, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x65, 0x6e, + 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -438,7 +430,7 @@ var file_environments_environments_v1_proto_msgTypes = make([]protoimpl.MessageI var file_environments_environments_v1_proto_goTypes = []interface{}{ (Provider)(0), // 0: environments.Provider (Kubernetes)(0), // 1: environments.Kubernetes - (*EnvironmentId)(nil), // 2: environments.EnvironmentId + (*EnvironmentName)(nil), // 2: environments.EnvironmentName (*EnvironmentData)(nil), // 3: environments.EnvironmentData (*HetznerOptions)(nil), // 4: environments.HetznerOptions (*EnvironmentFull)(nil), // 5: environments.EnvironmentFull @@ -448,18 +440,18 @@ var file_environments_environments_v1_proto_depIdxs = []int32{ 0, // 0: environments.EnvironmentData.provider:type_name -> environments.Provider 1, // 1: environments.EnvironmentData.kubernetes:type_name -> environments.Kubernetes 4, // 2: environments.EnvironmentData.hetzner_options:type_name -> environments.HetznerOptions - 2, // 3: environments.EnvironmentFull.id:type_name -> environments.EnvironmentId + 2, // 3: environments.EnvironmentFull.name:type_name -> environments.EnvironmentName 3, // 4: environments.EnvironmentFull.data:type_name -> environments.EnvironmentData 3, // 5: environments.Environments.Create:input_type -> environments.EnvironmentData 5, // 6: environments.Environments.Update:input_type -> environments.EnvironmentFull 5, // 7: environments.Environments.Delete:input_type -> environments.EnvironmentFull - 2, // 8: environments.Environments.Get:input_type -> environments.EnvironmentId + 2, // 8: environments.Environments.Get:input_type -> environments.EnvironmentName 6, // 9: environments.Environments.List:input_type -> google.protobuf.Empty 5, // 10: environments.Environments.Create:output_type -> environments.EnvironmentFull 5, // 11: environments.Environments.Update:output_type -> environments.EnvironmentFull 6, // 12: environments.Environments.Delete:output_type -> google.protobuf.Empty 5, // 13: environments.Environments.Get:output_type -> environments.EnvironmentFull - 5, // 14: environments.Environments.List:output_type -> environments.EnvironmentFull + 2, // 14: environments.Environments.List:output_type -> environments.EnvironmentName 10, // [10:15] is the sub-list for method output_type 5, // [5:10] is the sub-list for method input_type 5, // [5:5] is the sub-list for extension type_name @@ -474,7 +466,7 @@ func file_environments_environments_v1_proto_init() { } if !protoimpl.UnsafeEnabled { file_environments_environments_v1_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EnvironmentId); i { + switch v := v.(*EnvironmentName); i { case 0: return &v.state case 1: diff --git a/pkg/environments/environments_v1_grpc.pb.go b/pkg/environments/environments_v1_grpc.pb.go index 046dd8e..c4c8396 100644 --- a/pkg/environments/environments_v1_grpc.pb.go +++ b/pkg/environments/environments_v1_grpc.pb.go @@ -22,7 +22,7 @@ type EnvironmentsClient interface { Create(ctx context.Context, in *EnvironmentData, opts ...grpc.CallOption) (*EnvironmentFull, error) Update(ctx context.Context, in *EnvironmentFull, opts ...grpc.CallOption) (*EnvironmentFull, error) Delete(ctx context.Context, in *EnvironmentFull, opts ...grpc.CallOption) (*emptypb.Empty, error) - Get(ctx context.Context, in *EnvironmentId, opts ...grpc.CallOption) (*EnvironmentFull, error) + Get(ctx context.Context, in *EnvironmentName, opts ...grpc.CallOption) (*EnvironmentFull, error) List(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (Environments_ListClient, error) } @@ -61,7 +61,7 @@ func (c *environmentsClient) Delete(ctx context.Context, in *EnvironmentFull, op return out, nil } -func (c *environmentsClient) Get(ctx context.Context, in *EnvironmentId, opts ...grpc.CallOption) (*EnvironmentFull, error) { +func (c *environmentsClient) Get(ctx context.Context, in *EnvironmentName, opts ...grpc.CallOption) (*EnvironmentFull, error) { out := new(EnvironmentFull) err := c.cc.Invoke(ctx, "/environments.Environments/Get", in, out, opts...) if err != nil { @@ -86,7 +86,7 @@ func (c *environmentsClient) List(ctx context.Context, in *emptypb.Empty, opts . } type Environments_ListClient interface { - Recv() (*EnvironmentFull, error) + Recv() (*EnvironmentName, error) grpc.ClientStream } @@ -94,8 +94,8 @@ type environmentsListClient struct { grpc.ClientStream } -func (x *environmentsListClient) Recv() (*EnvironmentFull, error) { - m := new(EnvironmentFull) +func (x *environmentsListClient) Recv() (*EnvironmentName, error) { + m := new(EnvironmentName) if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err } @@ -109,7 +109,7 @@ type EnvironmentsServer interface { Create(context.Context, *EnvironmentData) (*EnvironmentFull, error) Update(context.Context, *EnvironmentFull) (*EnvironmentFull, error) Delete(context.Context, *EnvironmentFull) (*emptypb.Empty, error) - Get(context.Context, *EnvironmentId) (*EnvironmentFull, error) + Get(context.Context, *EnvironmentName) (*EnvironmentFull, error) List(*emptypb.Empty, Environments_ListServer) error mustEmbedUnimplementedEnvironmentsServer() } @@ -127,7 +127,7 @@ func (UnimplementedEnvironmentsServer) Update(context.Context, *EnvironmentFull) func (UnimplementedEnvironmentsServer) Delete(context.Context, *EnvironmentFull) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method Delete not implemented") } -func (UnimplementedEnvironmentsServer) Get(context.Context, *EnvironmentId) (*EnvironmentFull, error) { +func (UnimplementedEnvironmentsServer) Get(context.Context, *EnvironmentName) (*EnvironmentFull, error) { return nil, status.Errorf(codes.Unimplemented, "method Get not implemented") } func (UnimplementedEnvironmentsServer) List(*emptypb.Empty, Environments_ListServer) error { @@ -201,7 +201,7 @@ func _Environments_Delete_Handler(srv interface{}, ctx context.Context, dec func } func _Environments_Get_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(EnvironmentId) + in := new(EnvironmentName) if err := dec(in); err != nil { return nil, err } @@ -213,7 +213,7 @@ func _Environments_Get_Handler(srv interface{}, ctx context.Context, dec func(in FullMethod: "/environments.Environments/Get", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(EnvironmentsServer).Get(ctx, req.(*EnvironmentId)) + return srv.(EnvironmentsServer).Get(ctx, req.(*EnvironmentName)) } return interceptor(ctx, in, info, handler) } @@ -227,7 +227,7 @@ func _Environments_List_Handler(srv interface{}, stream grpc.ServerStream) error } type Environments_ListServer interface { - Send(*EnvironmentFull) error + Send(*EnvironmentName) error grpc.ServerStream } @@ -235,7 +235,7 @@ type environmentsListServer struct { grpc.ServerStream } -func (x *environmentsListServer) Send(m *EnvironmentFull) error { +func (x *environmentsListServer) Send(m *EnvironmentName) error { return x.ServerStream.SendMsg(m) } diff --git a/proto b/proto index f4ea64a..a71f2b7 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit f4ea64a22412c643eaf3f5b482caf933f5a42c2c +Subproject commit a71f2b7cb57ff0e1dfa81aee4a8732c9316a5509