From 6877e3677494ced6f08a888da40dfa3fa20a7180 Mon Sep 17 00:00:00 2001 From: Daniel Hess Date: Fri, 16 May 2025 10:52:59 -0700 Subject: [PATCH 1/4] j5 latest deps --- j5-lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/j5-lock.yaml b/j5-lock.yaml index 7da2e8e..9ebada9 100644 --- a/j5-lock.yaml +++ b/j5-lock.yaml @@ -1,5 +1,5 @@ inputs: - name: registry/pentops/j5 - version: ef5ad711d751f70caef57f1d3ea6e6359c1e45f9 + version: c918124a4d170edfe7bbf02e0c0cd15de3103ebc - name: registry/pentops/messaging version: cf9d6419c7cd3df56f0ca849ac19b8e2a0f794cc From 3bb73b6ed7f70d24ed8307def74eff59bdbfa0d3 Mon Sep 17 00:00:00 2001 From: Daniel Hess Date: Fri, 16 May 2025 10:54:46 -0700 Subject: [PATCH 2/4] generate the protos --- proto/o5/trigger/v1/service/trigger.p.j5s.proto | 2 +- proto/o5/trigger/v1/topic/trigger.p.j5s.proto | 2 +- proto/o5/trigger/v1/trigger.j5s.proto | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proto/o5/trigger/v1/service/trigger.p.j5s.proto b/proto/o5/trigger/v1/service/trigger.p.j5s.proto index f3bd8a8..12c83bb 100644 --- a/proto/o5/trigger/v1/service/trigger.p.j5s.proto +++ b/proto/o5/trigger/v1/service/trigger.p.j5s.proto @@ -1,4 +1,4 @@ -// Generated by j5build v0.0.0-20250407052915-b2fc017d8ac2. DO NOT EDIT +// Generated by j5build v0.0.0-20250514220842-c918124a4d17. DO NOT EDIT syntax = "proto3"; diff --git a/proto/o5/trigger/v1/topic/trigger.p.j5s.proto b/proto/o5/trigger/v1/topic/trigger.p.j5s.proto index c1a4726..e27642c 100644 --- a/proto/o5/trigger/v1/topic/trigger.p.j5s.proto +++ b/proto/o5/trigger/v1/topic/trigger.p.j5s.proto @@ -1,4 +1,4 @@ -// Generated by j5build v0.0.0-20250407052915-b2fc017d8ac2. DO NOT EDIT +// Generated by j5build v0.0.0-20250514220842-c918124a4d17. DO NOT EDIT syntax = "proto3"; diff --git a/proto/o5/trigger/v1/trigger.j5s.proto b/proto/o5/trigger/v1/trigger.j5s.proto index 8c5a4d4..0973955 100644 --- a/proto/o5/trigger/v1/trigger.j5s.proto +++ b/proto/o5/trigger/v1/trigger.j5s.proto @@ -1,4 +1,4 @@ -// Generated by j5build v0.0.0-20250407052915-b2fc017d8ac2. DO NOT EDIT +// Generated by j5build v0.0.0-20250514220842-c918124a4d17. DO NOT EDIT syntax = "proto3"; From f905c2293a89c6cfb9ad3dfd063fa27e60af41e3 Mon Sep 17 00:00:00 2001 From: Daniel Hess Date: Fri, 16 May 2025 10:54:57 -0700 Subject: [PATCH 3/4] generate the go --- .../trigger/v1/trigger_pb/trigger.j5s.pb.go | 104 +++++++++--------- .../v1/trigger_spb/trigger.p.j5s.pb.go | 14 +-- .../v1/trigger_spb/trigger.p.j5s_grpc.pb.go | 2 - .../v1/trigger_tpb/trigger.p.j5s.pb.go | 52 +++++---- .../v1/trigger_tpb/trigger.p.j5s_grpc.pb.go | 2 - 5 files changed, 81 insertions(+), 93 deletions(-) diff --git a/gen/o5/trigger/v1/trigger_pb/trigger.j5s.pb.go b/gen/o5/trigger/v1/trigger_pb/trigger.j5s.pb.go index ee08605..f1a53da 100644 --- a/gen/o5/trigger/v1/trigger_pb/trigger.j5s.pb.go +++ b/gen/o5/trigger/v1/trigger_pb/trigger.j5s.pb.go @@ -1,5 +1,3 @@ -// Generated by j5build v0.0.0-20250407052915-b2fc017d8ac2. DO NOT EDIT - // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 @@ -942,10 +940,10 @@ type ActionType_Create struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TriggerId *string `protobuf:"bytes,1,opt,name=trigger_id,json=triggerId,proto3,oneof" json:"trigger_id,omitempty"` - TriggerName string `protobuf:"bytes,2,opt,name=trigger_name,json=triggerName,proto3" json:"trigger_name,omitempty"` - AppName string `protobuf:"bytes,3,opt,name=app_name,json=appName,proto3" json:"app_name,omitempty"` - Cron string `protobuf:"bytes,4,opt,name=cron,proto3" json:"cron,omitempty"` + TriggerId string `protobuf:"bytes,1,opt,name=trigger_id,json=triggerID,proto3" json:"trigger_id,omitempty"` + TriggerName string `protobuf:"bytes,2,opt,name=trigger_name,json=triggerName,proto3" json:"trigger_name,omitempty"` + AppName string `protobuf:"bytes,3,opt,name=app_name,json=appName,proto3" json:"app_name,omitempty"` + Cron string `protobuf:"bytes,4,opt,name=cron,proto3" json:"cron,omitempty"` } func (x *ActionType_Create) Reset() { @@ -981,8 +979,8 @@ func (*ActionType_Create) Descriptor() ([]byte, []int) { } func (x *ActionType_Create) GetTriggerId() string { - if x != nil && x.TriggerId != nil { - return *x.TriggerId + if x != nil { + return x.TriggerId } return "" } @@ -1013,7 +1011,7 @@ type ActionType_Update struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TriggerId string `protobuf:"bytes,1,opt,name=trigger_id,json=triggerId,proto3" json:"trigger_id,omitempty"` + TriggerId string `protobuf:"bytes,1,opt,name=trigger_id,json=triggerID,proto3" json:"trigger_id,omitempty"` TriggerName string `protobuf:"bytes,2,opt,name=trigger_name,json=triggerName,proto3" json:"trigger_name,omitempty"` AppName string `protobuf:"bytes,3,opt,name=app_name,json=appName,proto3" json:"app_name,omitempty"` Cron string `protobuf:"bytes,4,opt,name=cron,proto3" json:"cron,omitempty"` @@ -1084,7 +1082,7 @@ type ActionType_Archive struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TriggerId string `protobuf:"bytes,1,opt,name=trigger_id,json=triggerId,proto3" json:"trigger_id,omitempty"` + TriggerId string `protobuf:"bytes,1,opt,name=trigger_id,json=triggerID,proto3" json:"trigger_id,omitempty"` } func (x *ActionType_Archive) Reset() { @@ -1289,7 +1287,7 @@ var file_o5_trigger_v1_trigger_j5s_proto_rawDesc = []byte{ 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x62, 0x00, 0x8a, 0xf7, 0x98, 0xc6, 0x02, 0x07, 0xaa, 0x01, 0x04, 0x52, 0x02, 0x08, 0x01, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x3a, 0x17, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0xea, 0x85, 0x8f, 0x02, 0x0b, 0x0a, 0x07, 0x74, 0x72, - 0x69, 0x67, 0x67, 0x65, 0x72, 0x10, 0x03, 0x22, 0xeb, 0x05, 0x0a, 0x0a, 0x41, 0x63, 0x74, 0x69, + 0x69, 0x67, 0x67, 0x65, 0x72, 0x10, 0x03, 0x22, 0xda, 0x05, 0x0a, 0x0a, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x43, 0x0a, 0x06, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, @@ -1303,52 +1301,51 @@ var file_o5_trigger_v1_trigger_j5s_proto_rawDesc = []byte{ 0x0b, 0x32, 0x21, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x42, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x48, 0x00, 0x52, - 0x07, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x1a, 0xe2, 0x01, 0x0a, 0x06, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x12, 0x44, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, + 0x07, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x1a, 0xd1, 0x01, 0x0a, 0x06, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x12, 0x42, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x20, 0xba, 0x48, 0x15, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d, 0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, - 0x24, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xb2, 0x02, 0x00, 0x48, 0x00, 0x52, 0x09, 0x74, 0x72, 0x69, - 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x0c, 0x74, 0x72, 0x69, - 0x67, 0x67, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, - 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x08, - 0x61, 0x70, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, - 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x07, - 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, - 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x42, 0x0d, - 0x0a, 0x0b, 0x5f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x1a, 0xd1, 0x01, - 0x0a, 0x06, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x42, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, - 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x23, 0xba, 0x48, - 0x18, 0xc8, 0x01, 0x01, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d, 0x5a, - 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xb2, 0x02, - 0x00, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x0c, - 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, - 0x01, 0x00, 0x52, 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, - 0x29, 0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x24, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xb2, 0x02, 0x00, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, + 0x65, 0x72, 0x49, 0x44, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, + 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, + 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x0b, 0x74, + 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x0a, 0x08, 0x61, 0x70, + 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, + 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x07, 0x61, 0x70, + 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x08, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, 0x04, 0x63, + 0x72, 0x6f, 0x6e, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x1a, 0xd1, 0x01, 0x0a, + 0x06, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x42, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, + 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x23, 0xba, 0x48, 0x18, + 0xc8, 0x01, 0x01, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d, 0x5a, 0x61, + 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xb2, 0x02, 0x00, + 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x44, 0x12, 0x31, 0x0a, 0x0c, 0x74, + 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, - 0x00, 0x52, 0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x04, 0x63, 0x72, - 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, - 0x01, 0x00, 0x52, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, - 0x00, 0x1a, 0x41, 0x0a, 0x07, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x12, 0x2d, 0x0a, 0x0a, - 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x00, 0x52, 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29, + 0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, - 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x3a, 0x07, 0xc2, 0xff, 0x8e, - 0x02, 0x02, 0x52, 0x00, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x5a, 0x00, 0x42, 0x06, 0x0a, - 0x04, 0x74, 0x79, 0x70, 0x65, 0x2a, 0x82, 0x01, 0x0a, 0x0d, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, - 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1e, 0x0a, 0x1a, 0x54, 0x52, 0x49, 0x47, 0x47, - 0x45, 0x52, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, - 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x54, 0x52, 0x49, 0x47, 0x47, - 0x45, 0x52, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x41, 0x43, 0x54, 0x49, 0x56, 0x45, - 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x54, 0x52, 0x49, 0x47, 0x47, 0x45, 0x52, 0x5f, 0x53, 0x54, - 0x41, 0x54, 0x55, 0x53, 0x5f, 0x50, 0x41, 0x55, 0x53, 0x45, 0x44, 0x10, 0x02, 0x12, 0x1b, 0x0a, - 0x17, 0x54, 0x52, 0x49, 0x47, 0x47, 0x45, 0x52, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, - 0x41, 0x52, 0x43, 0x48, 0x49, 0x56, 0x45, 0x44, 0x10, 0x03, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x69, - 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x65, 0x6e, 0x74, 0x6f, 0x70, 0x73, - 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x35, 0x2f, - 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, - 0x65, 0x72, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x07, 0x61, 0x70, 0x70, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x04, 0x63, 0x72, 0x6f, + 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, + 0x00, 0x52, 0x04, 0x63, 0x72, 0x6f, 0x6e, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, + 0x1a, 0x41, 0x0a, 0x07, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x12, 0x2d, 0x0a, 0x0a, 0x74, + 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xf2, 0x01, 0x00, 0x52, + 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x44, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, + 0x02, 0x52, 0x00, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x5a, 0x00, 0x42, 0x06, 0x0a, 0x04, + 0x74, 0x79, 0x70, 0x65, 0x2a, 0x82, 0x01, 0x0a, 0x0d, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, + 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1e, 0x0a, 0x1a, 0x54, 0x52, 0x49, 0x47, 0x47, 0x45, + 0x52, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, + 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x54, 0x52, 0x49, 0x47, 0x47, 0x45, + 0x52, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x41, 0x43, 0x54, 0x49, 0x56, 0x45, 0x10, + 0x01, 0x12, 0x19, 0x0a, 0x15, 0x54, 0x52, 0x49, 0x47, 0x47, 0x45, 0x52, 0x5f, 0x53, 0x54, 0x41, + 0x54, 0x55, 0x53, 0x5f, 0x50, 0x41, 0x55, 0x53, 0x45, 0x44, 0x10, 0x02, 0x12, 0x1b, 0x0a, 0x17, + 0x54, 0x52, 0x49, 0x47, 0x47, 0x45, 0x52, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x5f, 0x41, + 0x52, 0x43, 0x48, 0x49, 0x56, 0x45, 0x44, 0x10, 0x03, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x65, 0x6e, 0x74, 0x6f, 0x70, 0x73, 0x2f, + 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x35, 0x2f, 0x74, + 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, + 0x72, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1631,7 +1628,6 @@ func file_o5_trigger_v1_trigger_j5s_proto_init() { (*ActionType_Update_)(nil), (*ActionType_Archive_)(nil), } - file_o5_trigger_v1_trigger_j5s_proto_msgTypes[13].OneofWrappers = []interface{}{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s.pb.go b/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s.pb.go index 85a72cb..f642988 100644 --- a/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s.pb.go +++ b/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s.pb.go @@ -1,5 +1,3 @@ -// Generated by j5build v0.0.0-20250407052915-b2fc017d8ac2. DO NOT EDIT - // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 @@ -355,7 +353,7 @@ type PauseTriggerRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TriggerId string `protobuf:"bytes,1,opt,name=trigger_id,json=triggerId,proto3" json:"trigger_id,omitempty"` + TriggerId string `protobuf:"bytes,1,opt,name=trigger_id,json=triggerID,proto3" json:"trigger_id,omitempty"` } func (x *PauseTriggerRequest) Reset() { @@ -449,7 +447,7 @@ type ResumeTriggerRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TriggerId string `protobuf:"bytes,1,opt,name=trigger_id,json=triggerId,proto3" json:"trigger_id,omitempty"` + TriggerId string `protobuf:"bytes,1,opt,name=trigger_id,json=triggerID,proto3" json:"trigger_id,omitempty"` } func (x *ResumeTriggerRequest) Reset() { @@ -543,7 +541,7 @@ type ManuallyTriggerRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TriggerId string `protobuf:"bytes,1,opt,name=trigger_id,json=triggerId,proto3" json:"trigger_id,omitempty"` + TriggerId string `protobuf:"bytes,1,opt,name=trigger_id,json=triggerID,proto3" json:"trigger_id,omitempty"` // The time the trigger is for TriggerTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=trigger_time,json=triggerTime,proto3" json:"trigger_time,omitempty"` } @@ -721,7 +719,7 @@ var file_o5_trigger_v1_service_trigger_p_j5s_proto_rawDesc = []byte{ 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x23, 0xba, 0x48, 0x18, 0xc8, 0x01, 0x01, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d, 0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xb2, 0x02, 0x00, 0x52, 0x09, 0x74, 0x72, - 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, + 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x44, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0x65, 0x0a, 0x14, 0x50, 0x61, 0x75, 0x73, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x44, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6f, 0x35, 0x2e, 0x74, @@ -734,7 +732,7 @@ var file_o5_trigger_v1_service_trigger_p_j5s_proto_rawDesc = []byte{ 0x01, 0x28, 0x09, 0x42, 0x23, 0xba, 0x48, 0x18, 0xc8, 0x01, 0x01, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d, 0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xb2, 0x02, 0x00, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, - 0x72, 0x49, 0x64, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0x66, 0x0a, 0x15, + 0x72, 0x49, 0x44, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, 0x22, 0x66, 0x0a, 0x15, 0x52, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x44, 0x0a, 0x07, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, @@ -747,7 +745,7 @@ var file_o5_trigger_v1_service_trigger_p_j5s_proto_rawDesc = []byte{ 0x01, 0x28, 0x09, 0x42, 0x23, 0xba, 0x48, 0x18, 0xc8, 0x01, 0x01, 0x72, 0x13, 0x32, 0x11, 0x5e, 0x5b, 0x30, 0x2d, 0x39, 0x41, 0x2d, 0x5a, 0x61, 0x2d, 0x7a, 0x5d, 0x7b, 0x32, 0x32, 0x7d, 0x24, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xb2, 0x02, 0x00, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, - 0x72, 0x49, 0x64, 0x12, 0x4d, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x74, + 0x72, 0x49, 0x44, 0x12, 0x4d, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, diff --git a/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s_grpc.pb.go b/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s_grpc.pb.go index 0dc2602..2b2ca52 100644 --- a/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s_grpc.pb.go +++ b/gen/o5/trigger/v1/trigger_spb/trigger.p.j5s_grpc.pb.go @@ -1,5 +1,3 @@ -// Generated by j5build v0.0.0-20250407052915-b2fc017d8ac2. DO NOT EDIT - // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 diff --git a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s.pb.go b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s.pb.go index 5c6c52e..b561fae 100644 --- a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s.pb.go +++ b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s.pb.go @@ -1,5 +1,3 @@ -// Generated by j5build v0.0.0-20250407052915-b2fc017d8ac2. DO NOT EDIT - // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.32.0 @@ -287,35 +285,35 @@ var file_o5_trigger_v1_topic_trigger_p_j5s_proto_rawDesc = []byte{ 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x0e, 0xba, 0x48, 0x03, 0xc8, 0x01, 0x01, 0xc2, 0xff, 0x8e, 0x02, 0x03, 0xaa, 0x02, 0x00, 0x52, 0x08, 0x74, 0x69, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x3a, 0x07, 0xc2, 0xff, 0x8e, 0x02, 0x02, 0x52, 0x00, - 0x32, 0x9b, 0x01, 0x0a, 0x13, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x50, 0x75, 0x62, 0x6c, - 0x69, 0x73, 0x68, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x52, 0x0a, 0x0c, 0x54, 0x72, 0x69, 0x67, + 0x32, 0x99, 0x01, 0x0a, 0x13, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x50, 0x75, 0x62, 0x6c, + 0x69, 0x73, 0x68, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x50, 0x0a, 0x0c, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 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, 0x1a, 0x30, 0xda, 0xa2, - 0xf5, 0xe4, 0x02, 0x2a, 0x0a, 0x0f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x70, 0x75, - 0x62, 0x6c, 0x69, 0x73, 0x68, 0x6a, 0x17, 0x0a, 0x15, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, - 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x32, 0x74, - 0x0a, 0x10, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x70, - 0x69, 0x63, 0x12, 0x50, 0x0a, 0x0b, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x27, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, - 0x31, 0x2e, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 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, 0x1a, 0x0e, 0xda, 0xa2, 0xf5, 0xe4, 0x02, 0x08, 0x0a, 0x04, 0x74, 0x69, - 0x63, 0x6b, 0x5a, 0x00, 0x32, 0x6e, 0x0a, 0x0e, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, - 0x79, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x4c, 0x0a, 0x09, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, - 0x70, 0x6c, 0x79, 0x12, 0x25, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, - 0x2e, 0x76, 0x31, 0x2e, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, - 0x70, 0x6c, 0x79, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 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, 0x1a, 0x0e, 0xda, 0xa2, 0xf5, 0xe4, 0x02, 0x08, 0x0a, 0x04, 0x74, 0x69, - 0x63, 0x6b, 0x62, 0x00, 0x42, 0x3a, 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, - 0x6f, 0x6d, 0x2f, 0x70, 0x65, 0x6e, 0x74, 0x6f, 0x70, 0x73, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, - 0x65, 0x72, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x6f, 0x35, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, - 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x74, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x30, 0xda, 0xa2, 0xf5, 0xe4, + 0x02, 0x2a, 0x0a, 0x0f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x70, 0x75, 0x62, 0x6c, + 0x69, 0x73, 0x68, 0x6a, 0x17, 0x0a, 0x15, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, + 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x32, 0x72, 0x0a, 0x10, + 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x6f, 0x70, 0x69, 0x63, + 0x12, 0x4e, 0x0a, 0x0b, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x27, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, + 0x74, 0x6f, 0x70, 0x69, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, + 0x1a, 0x0e, 0xda, 0xa2, 0xf5, 0xe4, 0x02, 0x08, 0x0a, 0x04, 0x74, 0x69, 0x63, 0x6b, 0x5a, 0x00, + 0x32, 0x6c, 0x0a, 0x0e, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x54, 0x6f, 0x70, + 0x69, 0x63, 0x12, 0x4a, 0x0a, 0x09, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, + 0x25, 0x2e, 0x6f, 0x35, 0x2e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x2e, + 0x74, 0x6f, 0x70, 0x69, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x4d, + 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x0e, + 0xda, 0xa2, 0xf5, 0xe4, 0x02, 0x08, 0x0a, 0x04, 0x74, 0x69, 0x63, 0x6b, 0x62, 0x00, 0x42, 0x3a, + 0x5a, 0x38, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x65, 0x6e, + 0x74, 0x6f, 0x70, 0x73, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x67, 0x65, 0x6e, + 0x2f, 0x6f, 0x35, 0x2f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x2f, 0x74, + 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x74, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_grpc.pb.go b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_grpc.pb.go index 30a0d67..b3ae62c 100644 --- a/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_grpc.pb.go +++ b/gen/o5/trigger/v1/trigger_tpb/trigger.p.j5s_grpc.pb.go @@ -1,5 +1,3 @@ -// Generated by j5build v0.0.0-20250407052915-b2fc017d8ac2. DO NOT EDIT - // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 From 4256c2134d6255bf0cf3f43b4c014be3f57acd69 Mon Sep 17 00:00:00 2001 From: Daniel Hess Date: Fri, 16 May 2025 10:58:44 -0700 Subject: [PATCH 4/4] fix tests --- integration/trigger_test.go | 3 +-- integration/universe.go | 3 +-- service/trigger.go | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/integration/trigger_test.go b/integration/trigger_test.go index 0f70fdc..b7ed458 100644 --- a/integration/trigger_test.go +++ b/integration/trigger_test.go @@ -13,7 +13,6 @@ import ( "github.com/pentops/trigger/gen/o5/trigger/v1/trigger_pb" "github.com/pentops/trigger/gen/o5/trigger/v1/trigger_spb" "github.com/pentops/trigger/gen/o5/trigger/v1/trigger_tpb" - "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/timestamppb" ) @@ -35,7 +34,7 @@ func TestTickRequest(tt *testing.T) { Action: &trigger_pb.ActionType{ Type: &trigger_pb.ActionType_Create_{ Create: &trigger_pb.ActionType_Create{ - TriggerId: proto.String(triggerID), + TriggerId: triggerID, AppName: "test", TriggerName: "TestCron", Cron: "CRON_TZ=America/New_York 0 7 * * *", diff --git a/integration/universe.go b/integration/universe.go index 05c6519..f5c2beb 100644 --- a/integration/universe.go +++ b/integration/universe.go @@ -18,7 +18,6 @@ import ( "github.com/pentops/trigger/gen/o5/trigger/v1/trigger_tpb" "github.com/pentops/trigger/service" "github.com/pentops/trigger/utils" - "google.golang.org/protobuf/proto" ) type Universe struct { @@ -141,7 +140,7 @@ func (uu *Universe) CreateTrigger(ctx context.Context, config triggerConfig) err Action: &trigger_pb.ActionType{ Type: &trigger_pb.ActionType_Create_{ Create: &trigger_pb.ActionType_Create{ - TriggerId: proto.String(triggerID), + TriggerId: triggerID, TriggerName: triggerName, AppName: appName, Cron: cron, diff --git a/service/trigger.go b/service/trigger.go index 8144ae6..4679787 100644 --- a/service/trigger.go +++ b/service/trigger.go @@ -78,7 +78,7 @@ func (w *TriggerWorker) TickRequest(ctx context.Context, req *trigger_tpb.TickRe } triggerid := id62.NewString() - if req.GetAction().GetCreate().TriggerId != nil { + if req.GetAction().GetCreate().TriggerId != "" { triggerid = req.GetAction().GetCreate().GetTriggerId() }