From f6cd4a3db9bc09545dd650ba363f3a9707578390 Mon Sep 17 00:00:00 2001 From: Todd Knight Date: Thu, 23 Apr 2020 22:45:04 -0700 Subject: [PATCH] Merged in recent changes to oplog protos. --- .../oplog/oplog_test/test_structures.pb.go | 164 +++++++++--------- internal/oplog/queue_test.go | 4 +- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/internal/oplog/oplog_test/test_structures.pb.go b/internal/oplog/oplog_test/test_structures.pb.go index d6227c0983..e2a824d5be 100644 --- a/internal/oplog/oplog_test/test_structures.pb.go +++ b/internal/oplog/oplog_test/test_structures.pb.go @@ -1,8 +1,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.20.1 +// protoc-gen-go v1.21.0 // protoc v3.11.4 -// source: internal/oplog/oplog_test/oplog_test.proto +// source: controller/storage/oplog/test/v1/test_structures.proto // define a test proto package @@ -45,7 +45,7 @@ type TestUser struct { func (x *TestUser) Reset() { *x = TestUser{} if protoimpl.UnsafeEnabled { - mi := &file_internal_oplog_oplog_test_oplog_test_proto_msgTypes[0] + mi := &file_controller_storage_oplog_test_v1_test_structures_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -58,7 +58,7 @@ func (x *TestUser) String() string { func (*TestUser) ProtoMessage() {} func (x *TestUser) ProtoReflect() protoreflect.Message { - mi := &file_internal_oplog_oplog_test_oplog_test_proto_msgTypes[0] + mi := &file_controller_storage_oplog_test_v1_test_structures_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -71,7 +71,7 @@ func (x *TestUser) ProtoReflect() protoreflect.Message { // Deprecated: Use TestUser.ProtoReflect.Descriptor instead. func (*TestUser) Descriptor() ([]byte, []int) { - return file_internal_oplog_oplog_test_oplog_test_proto_rawDescGZIP(), []int{0} + return file_controller_storage_oplog_test_v1_test_structures_proto_rawDescGZIP(), []int{0} } func (x *TestUser) GetId() uint32 { @@ -126,7 +126,7 @@ type TestCar struct { func (x *TestCar) Reset() { *x = TestCar{} if protoimpl.UnsafeEnabled { - mi := &file_internal_oplog_oplog_test_oplog_test_proto_msgTypes[1] + mi := &file_controller_storage_oplog_test_v1_test_structures_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -139,7 +139,7 @@ func (x *TestCar) String() string { func (*TestCar) ProtoMessage() {} func (x *TestCar) ProtoReflect() protoreflect.Message { - mi := &file_internal_oplog_oplog_test_oplog_test_proto_msgTypes[1] + mi := &file_controller_storage_oplog_test_v1_test_structures_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -152,7 +152,7 @@ func (x *TestCar) ProtoReflect() protoreflect.Message { // Deprecated: Use TestCar.ProtoReflect.Descriptor instead. func (*TestCar) Descriptor() ([]byte, []int) { - return file_internal_oplog_oplog_test_oplog_test_proto_rawDescGZIP(), []int{1} + return file_controller_storage_oplog_test_v1_test_structures_proto_rawDescGZIP(), []int{1} } func (x *TestCar) GetId() uint32 { @@ -198,7 +198,7 @@ type TestRental struct { func (x *TestRental) Reset() { *x = TestRental{} if protoimpl.UnsafeEnabled { - mi := &file_internal_oplog_oplog_test_oplog_test_proto_msgTypes[2] + mi := &file_controller_storage_oplog_test_v1_test_structures_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -211,7 +211,7 @@ func (x *TestRental) String() string { func (*TestRental) ProtoMessage() {} func (x *TestRental) ProtoReflect() protoreflect.Message { - mi := &file_internal_oplog_oplog_test_oplog_test_proto_msgTypes[2] + mi := &file_controller_storage_oplog_test_v1_test_structures_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -224,7 +224,7 @@ func (x *TestRental) ProtoReflect() protoreflect.Message { // Deprecated: Use TestRental.ProtoReflect.Descriptor instead. func (*TestRental) Descriptor() ([]byte, []int) { - return file_internal_oplog_oplog_test_oplog_test_proto_rawDescGZIP(), []int{2} + return file_controller_storage_oplog_test_v1_test_structures_proto_rawDescGZIP(), []int{2} } func (x *TestRental) GetUserId() uint32 { @@ -264,7 +264,7 @@ type TestNonReplayableUser struct { func (x *TestNonReplayableUser) Reset() { *x = TestNonReplayableUser{} if protoimpl.UnsafeEnabled { - mi := &file_internal_oplog_oplog_test_oplog_test_proto_msgTypes[3] + mi := &file_controller_storage_oplog_test_v1_test_structures_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -277,7 +277,7 @@ func (x *TestNonReplayableUser) String() string { func (*TestNonReplayableUser) ProtoMessage() {} func (x *TestNonReplayableUser) ProtoReflect() protoreflect.Message { - mi := &file_internal_oplog_oplog_test_oplog_test_proto_msgTypes[3] + mi := &file_controller_storage_oplog_test_v1_test_structures_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -290,7 +290,7 @@ func (x *TestNonReplayableUser) ProtoReflect() protoreflect.Message { // Deprecated: Use TestNonReplayableUser.ProtoReflect.Descriptor instead. func (*TestNonReplayableUser) Descriptor() ([]byte, []int) { - return file_internal_oplog_oplog_test_oplog_test_proto_rawDescGZIP(), []int{3} + return file_controller_storage_oplog_test_v1_test_structures_proto_rawDescGZIP(), []int{3} } func (x *TestNonReplayableUser) GetId() uint32 { @@ -321,68 +321,68 @@ func (x *TestNonReplayableUser) GetEmail() string { return "" } -var File_internal_oplog_oplog_test_oplog_test_proto protoreflect.FileDescriptor - -var file_internal_oplog_oplog_test_oplog_test_proto_rawDesc = []byte{ - 0x0a, 0x2a, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6f, 0x70, 0x6c, 0x6f, 0x67, - 0x2f, 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x2f, 0x6f, 0x70, 0x6c, 0x6f, - 0x67, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x2d, 0x68, 0x61, - 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, - 0x65, 0x72, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2e, 0x6f, 0x70, - 0x6c, 0x6f, 0x67, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x22, 0x7d, 0x0a, 0x08, 0x54, - 0x65, 0x73, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x70, - 0x68, 0x6f, 0x6e, 0x65, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0b, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x14, - 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, - 0x6d, 0x61, 0x69, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x57, 0x0a, 0x07, 0x54, 0x65, - 0x73, 0x74, 0x43, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x6d, - 0x70, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x70, 0x67, 0x12, 0x14, 0x0a, - 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x22, 0x52, 0x0a, 0x0a, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x6e, 0x74, 0x61, - 0x6c, 0x12, 0x17, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0d, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x15, 0x0a, 0x06, 0x63, 0x61, - 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x61, 0x72, 0x49, - 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x74, 0x0a, 0x15, 0x54, 0x65, 0x73, 0x74, 0x4e, - 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x61, 0x62, 0x6c, 0x65, 0x55, 0x73, 0x65, 0x72, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x5f, 0x6e, 0x75, - 0x6d, 0x62, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x68, 0x6f, 0x6e, - 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x42, 0x46, 0x5a, - 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, - 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x2f, - 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x3b, 0x6f, 0x70, 0x6c, 0x6f, 0x67, - 0x5f, 0x74, 0x65, 0x73, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var File_controller_storage_oplog_test_v1_test_structures_proto protoreflect.FileDescriptor + +var file_controller_storage_oplog_test_v1_test_structures_proto_rawDesc = []byte{ + 0x0a, 0x36, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x73, 0x74, 0x6f, + 0x72, 0x61, 0x67, 0x65, 0x2f, 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x2f, + 0x76, 0x31, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, + 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, + 0x6c, 0x6c, 0x65, 0x72, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x6f, 0x70, 0x6c, + 0x6f, 0x67, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x76, 0x31, 0x22, 0x7d, 0x0a, 0x08, 0x54, 0x65, + 0x73, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x70, 0x68, + 0x6f, 0x6e, 0x65, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0b, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x14, 0x0a, + 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6d, + 0x61, 0x69, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x57, 0x0a, 0x07, 0x54, 0x65, 0x73, + 0x74, 0x43, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x70, + 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x70, 0x67, 0x12, 0x14, 0x0a, 0x05, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x22, 0x52, 0x0a, 0x0a, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x6e, 0x74, 0x61, 0x6c, + 0x12, 0x17, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0d, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x15, 0x0a, 0x06, 0x63, 0x61, 0x72, + 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x61, 0x72, 0x49, 0x64, + 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x74, 0x0a, 0x15, 0x54, 0x65, 0x73, 0x74, 0x4e, 0x6f, + 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x61, 0x62, 0x6c, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, + 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x5f, 0x6e, 0x75, 0x6d, + 0x62, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x68, 0x6f, 0x6e, 0x65, + 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x42, 0x46, 0x5a, 0x44, + 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, + 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x77, 0x61, 0x74, 0x63, 0x68, 0x74, 0x6f, 0x77, 0x65, 0x72, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x2f, 0x6f, + 0x70, 0x6c, 0x6f, 0x67, 0x5f, 0x74, 0x65, 0x73, 0x74, 0x3b, 0x6f, 0x70, 0x6c, 0x6f, 0x67, 0x5f, + 0x74, 0x65, 0x73, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_internal_oplog_oplog_test_oplog_test_proto_rawDescOnce sync.Once - file_internal_oplog_oplog_test_oplog_test_proto_rawDescData = file_internal_oplog_oplog_test_oplog_test_proto_rawDesc + file_controller_storage_oplog_test_v1_test_structures_proto_rawDescOnce sync.Once + file_controller_storage_oplog_test_v1_test_structures_proto_rawDescData = file_controller_storage_oplog_test_v1_test_structures_proto_rawDesc ) -func file_internal_oplog_oplog_test_oplog_test_proto_rawDescGZIP() []byte { - file_internal_oplog_oplog_test_oplog_test_proto_rawDescOnce.Do(func() { - file_internal_oplog_oplog_test_oplog_test_proto_rawDescData = protoimpl.X.CompressGZIP(file_internal_oplog_oplog_test_oplog_test_proto_rawDescData) +func file_controller_storage_oplog_test_v1_test_structures_proto_rawDescGZIP() []byte { + file_controller_storage_oplog_test_v1_test_structures_proto_rawDescOnce.Do(func() { + file_controller_storage_oplog_test_v1_test_structures_proto_rawDescData = protoimpl.X.CompressGZIP(file_controller_storage_oplog_test_v1_test_structures_proto_rawDescData) }) - return file_internal_oplog_oplog_test_oplog_test_proto_rawDescData + return file_controller_storage_oplog_test_v1_test_structures_proto_rawDescData } -var file_internal_oplog_oplog_test_oplog_test_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -var file_internal_oplog_oplog_test_oplog_test_proto_goTypes = []interface{}{ - (*TestUser)(nil), // 0: hashicorp.watchtower.controller.oplog.test.v1.TestUser - (*TestCar)(nil), // 1: hashicorp.watchtower.controller.oplog.test.v1.TestCar - (*TestRental)(nil), // 2: hashicorp.watchtower.controller.oplog.test.v1.TestRental - (*TestNonReplayableUser)(nil), // 3: hashicorp.watchtower.controller.oplog.test.v1.TestNonReplayableUser +var file_controller_storage_oplog_test_v1_test_structures_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_controller_storage_oplog_test_v1_test_structures_proto_goTypes = []interface{}{ + (*TestUser)(nil), // 0: controller.storage.oplog.test.v1.TestUser + (*TestCar)(nil), // 1: controller.storage.oplog.test.v1.TestCar + (*TestRental)(nil), // 2: controller.storage.oplog.test.v1.TestRental + (*TestNonReplayableUser)(nil), // 3: controller.storage.oplog.test.v1.TestNonReplayableUser } -var file_internal_oplog_oplog_test_oplog_test_proto_depIdxs = []int32{ +var file_controller_storage_oplog_test_v1_test_structures_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 @@ -390,13 +390,13 @@ var file_internal_oplog_oplog_test_oplog_test_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_internal_oplog_oplog_test_oplog_test_proto_init() } -func file_internal_oplog_oplog_test_oplog_test_proto_init() { - if File_internal_oplog_oplog_test_oplog_test_proto != nil { +func init() { file_controller_storage_oplog_test_v1_test_structures_proto_init() } +func file_controller_storage_oplog_test_v1_test_structures_proto_init() { + if File_controller_storage_oplog_test_v1_test_structures_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_internal_oplog_oplog_test_oplog_test_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_controller_storage_oplog_test_v1_test_structures_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestUser); i { case 0: return &v.state @@ -408,7 +408,7 @@ func file_internal_oplog_oplog_test_oplog_test_proto_init() { return nil } } - file_internal_oplog_oplog_test_oplog_test_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_controller_storage_oplog_test_v1_test_structures_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestCar); i { case 0: return &v.state @@ -420,7 +420,7 @@ func file_internal_oplog_oplog_test_oplog_test_proto_init() { return nil } } - file_internal_oplog_oplog_test_oplog_test_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_controller_storage_oplog_test_v1_test_structures_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestRental); i { case 0: return &v.state @@ -432,7 +432,7 @@ func file_internal_oplog_oplog_test_oplog_test_proto_init() { return nil } } - file_internal_oplog_oplog_test_oplog_test_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_controller_storage_oplog_test_v1_test_structures_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TestNonReplayableUser); i { case 0: return &v.state @@ -449,18 +449,18 @@ func file_internal_oplog_oplog_test_oplog_test_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_internal_oplog_oplog_test_oplog_test_proto_rawDesc, + RawDescriptor: file_controller_storage_oplog_test_v1_test_structures_proto_rawDesc, NumEnums: 0, NumMessages: 4, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_internal_oplog_oplog_test_oplog_test_proto_goTypes, - DependencyIndexes: file_internal_oplog_oplog_test_oplog_test_proto_depIdxs, - MessageInfos: file_internal_oplog_oplog_test_oplog_test_proto_msgTypes, + GoTypes: file_controller_storage_oplog_test_v1_test_structures_proto_goTypes, + DependencyIndexes: file_controller_storage_oplog_test_v1_test_structures_proto_depIdxs, + MessageInfos: file_controller_storage_oplog_test_v1_test_structures_proto_msgTypes, }.Build() - File_internal_oplog_oplog_test_oplog_test_proto = out.File - file_internal_oplog_oplog_test_oplog_test_proto_rawDesc = nil - file_internal_oplog_oplog_test_oplog_test_proto_goTypes = nil - file_internal_oplog_oplog_test_oplog_test_proto_depIdxs = nil + File_controller_storage_oplog_test_v1_test_structures_proto = out.File + file_controller_storage_oplog_test_v1_test_structures_proto_rawDesc = nil + file_controller_storage_oplog_test_v1_test_structures_proto_goTypes = nil + file_controller_storage_oplog_test_v1_test_structures_proto_depIdxs = nil } diff --git a/internal/oplog/queue_test.go b/internal/oplog/queue_test.go index 1acca7a0b5..c8c86476ac 100644 --- a/internal/oplog/queue_test.go +++ b/internal/oplog/queue_test.go @@ -92,12 +92,12 @@ func Test_Queue(t *testing.T) { PhoneNumber: "867-5309", Email: "alice@bob.com", } - err = queue.Add(u, "user", OpType_CREATE_OP) + err = queue.Add(u, "user", OpType_OP_TYPE_CREATE) assert.Check(t, err != nil) assert.Equal(t, err.Error(), "error *oplog_test.TestNonReplayableUser is not a ReplayableMessage") }) t.Run("nil message", func(t *testing.T) { - err = queue.Add(nil, "user", OpType_CREATE_OP) + err = queue.Add(nil, "user", OpType_OP_TYPE_CREATE) assert.Check(t, err != nil) assert.Equal(t, err.Error(), "error is not a ReplayableMessage") })