diff --git a/internal/contracts/state/v1/binding.pb.go b/internal/contracts/state/v1/binding.pb.go index 6af30ce40..2c759d0a4 100644 --- a/internal/contracts/state/v1/binding.pb.go +++ b/internal/contracts/state/v1/binding.pb.go @@ -901,94 +901,6 @@ func (*ResumeBindingResponse) Descriptor() ([]byte, []int) { return file_state_v1_binding_proto_rawDescGZIP(), []int{17} } -type ArmedBindingsForSourceRequest struct { - state protoimpl.MessageState `protogen:"open.v1"` - Source string `protobuf:"bytes,1,opt,name=source,proto3" json:"source,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *ArmedBindingsForSourceRequest) Reset() { - *x = ArmedBindingsForSourceRequest{} - mi := &file_state_v1_binding_proto_msgTypes[18] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *ArmedBindingsForSourceRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ArmedBindingsForSourceRequest) ProtoMessage() {} - -func (x *ArmedBindingsForSourceRequest) ProtoReflect() protoreflect.Message { - mi := &file_state_v1_binding_proto_msgTypes[18] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ArmedBindingsForSourceRequest.ProtoReflect.Descriptor instead. -func (*ArmedBindingsForSourceRequest) Descriptor() ([]byte, []int) { - return file_state_v1_binding_proto_rawDescGZIP(), []int{18} -} - -func (x *ArmedBindingsForSourceRequest) GetSource() string { - if x != nil { - return x.Source - } - return "" -} - -type ArmedBindingsForSourceResponse struct { - state protoimpl.MessageState `protogen:"open.v1"` - Bindings []*Binding `protobuf:"bytes,1,rep,name=bindings,proto3" json:"bindings,omitempty"` - unknownFields protoimpl.UnknownFields - sizeCache protoimpl.SizeCache -} - -func (x *ArmedBindingsForSourceResponse) Reset() { - *x = ArmedBindingsForSourceResponse{} - mi := &file_state_v1_binding_proto_msgTypes[19] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *ArmedBindingsForSourceResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ArmedBindingsForSourceResponse) ProtoMessage() {} - -func (x *ArmedBindingsForSourceResponse) ProtoReflect() protoreflect.Message { - mi := &file_state_v1_binding_proto_msgTypes[19] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ArmedBindingsForSourceResponse.ProtoReflect.Descriptor instead. -func (*ArmedBindingsForSourceResponse) Descriptor() ([]byte, []int) { - return file_state_v1_binding_proto_rawDescGZIP(), []int{19} -} - -func (x *ArmedBindingsForSourceResponse) GetBindings() []*Binding { - if x != nil { - return x.Bindings - } - return nil -} - var File_state_v1_binding_proto protoreflect.FileDescriptor const file_state_v1_binding_proto_rawDesc = "" + @@ -1045,11 +957,7 @@ const file_state_v1_binding_proto_rawDesc = "" + "\x14PauseBindingResponse\"&\n" + "\x14ResumeBindingRequest\x12\x0e\n" + "\x02id\x18\x01 \x01(\tR\x02id\"\x17\n" + - "\x15ResumeBindingResponse\"7\n" + - "\x1dArmedBindingsForSourceRequest\x12\x16\n" + - "\x06source\x18\x01 \x01(\tR\x06source\"O\n" + - "\x1eArmedBindingsForSourceResponse\x12-\n" + - "\bbindings\x18\x01 \x03(\v2\x11.state.v1.BindingR\bbindings2\x81\x06\n" + + "\x15ResumeBindingResponse2\x94\x05\n" + "\x0eBindingService\x12P\n" + "\rInsertBinding\x12\x1e.state.v1.InsertBindingRequest\x1a\x1f.state.v1.InsertBindingResponse\x12G\n" + "\n" + @@ -1059,8 +967,7 @@ const file_state_v1_binding_proto_rawDesc = "" + "\rDeleteBinding\x12\x1e.state.v1.DeleteBindingRequest\x1a\x1f.state.v1.DeleteBindingResponse\x12S\n" + "\x0eApproveBinding\x12\x1f.state.v1.ApproveBindingRequest\x1a .state.v1.ApproveBindingResponse\x12M\n" + "\fPauseBinding\x12\x1d.state.v1.PauseBindingRequest\x1a\x1e.state.v1.PauseBindingResponse\x12P\n" + - "\rResumeBinding\x12\x1e.state.v1.ResumeBindingRequest\x1a\x1f.state.v1.ResumeBindingResponse\x12k\n" + - "\x16ArmedBindingsForSource\x12'.state.v1.ArmedBindingsForSourceRequest\x1a(.state.v1.ArmedBindingsForSourceResponseB\xa6\x01\n" + + "\rResumeBinding\x12\x1e.state.v1.ResumeBindingRequest\x1a\x1f.state.v1.ResumeBindingResponseB\xa6\x01\n" + "\fcom.state.v1B\fBindingProtoP\x01ZGgithub.com/samcharles93/archie-core/internal/contracts/state/v1;statev1\xa2\x02\x03SXX\xaa\x02\bState.V1\xca\x02\bState\\V1\xe2\x02\x14State\\V1\\GPBMetadata\xea\x02\tState::V1b\x06proto3" var ( @@ -1075,62 +982,57 @@ func file_state_v1_binding_proto_rawDescGZIP() []byte { return file_state_v1_binding_proto_rawDescData } -var file_state_v1_binding_proto_msgTypes = make([]protoimpl.MessageInfo, 20) +var file_state_v1_binding_proto_msgTypes = make([]protoimpl.MessageInfo, 18) var file_state_v1_binding_proto_goTypes = []any{ - (*BindingMatcher)(nil), // 0: state.v1.BindingMatcher - (*Binding)(nil), // 1: state.v1.Binding - (*InsertBindingRequest)(nil), // 2: state.v1.InsertBindingRequest - (*InsertBindingResponse)(nil), // 3: state.v1.InsertBindingResponse - (*GetBindingRequest)(nil), // 4: state.v1.GetBindingRequest - (*GetBindingResponse)(nil), // 5: state.v1.GetBindingResponse - (*ListBindingsRequest)(nil), // 6: state.v1.ListBindingsRequest - (*ListBindingsResponse)(nil), // 7: state.v1.ListBindingsResponse - (*UpdateBindingRequest)(nil), // 8: state.v1.UpdateBindingRequest - (*UpdateBindingResponse)(nil), // 9: state.v1.UpdateBindingResponse - (*DeleteBindingRequest)(nil), // 10: state.v1.DeleteBindingRequest - (*DeleteBindingResponse)(nil), // 11: state.v1.DeleteBindingResponse - (*ApproveBindingRequest)(nil), // 12: state.v1.ApproveBindingRequest - (*ApproveBindingResponse)(nil), // 13: state.v1.ApproveBindingResponse - (*PauseBindingRequest)(nil), // 14: state.v1.PauseBindingRequest - (*PauseBindingResponse)(nil), // 15: state.v1.PauseBindingResponse - (*ResumeBindingRequest)(nil), // 16: state.v1.ResumeBindingRequest - (*ResumeBindingResponse)(nil), // 17: state.v1.ResumeBindingResponse - (*ArmedBindingsForSourceRequest)(nil), // 18: state.v1.ArmedBindingsForSourceRequest - (*ArmedBindingsForSourceResponse)(nil), // 19: state.v1.ArmedBindingsForSourceResponse - (*timestamppb.Timestamp)(nil), // 20: google.protobuf.Timestamp + (*BindingMatcher)(nil), // 0: state.v1.BindingMatcher + (*Binding)(nil), // 1: state.v1.Binding + (*InsertBindingRequest)(nil), // 2: state.v1.InsertBindingRequest + (*InsertBindingResponse)(nil), // 3: state.v1.InsertBindingResponse + (*GetBindingRequest)(nil), // 4: state.v1.GetBindingRequest + (*GetBindingResponse)(nil), // 5: state.v1.GetBindingResponse + (*ListBindingsRequest)(nil), // 6: state.v1.ListBindingsRequest + (*ListBindingsResponse)(nil), // 7: state.v1.ListBindingsResponse + (*UpdateBindingRequest)(nil), // 8: state.v1.UpdateBindingRequest + (*UpdateBindingResponse)(nil), // 9: state.v1.UpdateBindingResponse + (*DeleteBindingRequest)(nil), // 10: state.v1.DeleteBindingRequest + (*DeleteBindingResponse)(nil), // 11: state.v1.DeleteBindingResponse + (*ApproveBindingRequest)(nil), // 12: state.v1.ApproveBindingRequest + (*ApproveBindingResponse)(nil), // 13: state.v1.ApproveBindingResponse + (*PauseBindingRequest)(nil), // 14: state.v1.PauseBindingRequest + (*PauseBindingResponse)(nil), // 15: state.v1.PauseBindingResponse + (*ResumeBindingRequest)(nil), // 16: state.v1.ResumeBindingRequest + (*ResumeBindingResponse)(nil), // 17: state.v1.ResumeBindingResponse + (*timestamppb.Timestamp)(nil), // 18: google.protobuf.Timestamp } var file_state_v1_binding_proto_depIdxs = []int32{ 0, // 0: state.v1.Binding.matcher:type_name -> state.v1.BindingMatcher - 20, // 1: state.v1.Binding.created_at:type_name -> google.protobuf.Timestamp - 20, // 2: state.v1.Binding.updated_at:type_name -> google.protobuf.Timestamp + 18, // 1: state.v1.Binding.created_at:type_name -> google.protobuf.Timestamp + 18, // 2: state.v1.Binding.updated_at:type_name -> google.protobuf.Timestamp 1, // 3: state.v1.InsertBindingRequest.binding:type_name -> state.v1.Binding 1, // 4: state.v1.GetBindingResponse.binding:type_name -> state.v1.Binding 1, // 5: state.v1.ListBindingsResponse.bindings:type_name -> state.v1.Binding 1, // 6: state.v1.UpdateBindingRequest.binding:type_name -> state.v1.Binding - 1, // 7: state.v1.ArmedBindingsForSourceResponse.bindings:type_name -> state.v1.Binding - 2, // 8: state.v1.BindingService.InsertBinding:input_type -> state.v1.InsertBindingRequest - 4, // 9: state.v1.BindingService.GetBinding:input_type -> state.v1.GetBindingRequest - 6, // 10: state.v1.BindingService.ListBindings:input_type -> state.v1.ListBindingsRequest - 8, // 11: state.v1.BindingService.UpdateBinding:input_type -> state.v1.UpdateBindingRequest - 10, // 12: state.v1.BindingService.DeleteBinding:input_type -> state.v1.DeleteBindingRequest - 12, // 13: state.v1.BindingService.ApproveBinding:input_type -> state.v1.ApproveBindingRequest - 14, // 14: state.v1.BindingService.PauseBinding:input_type -> state.v1.PauseBindingRequest - 16, // 15: state.v1.BindingService.ResumeBinding:input_type -> state.v1.ResumeBindingRequest - 18, // 16: state.v1.BindingService.ArmedBindingsForSource:input_type -> state.v1.ArmedBindingsForSourceRequest - 3, // 17: state.v1.BindingService.InsertBinding:output_type -> state.v1.InsertBindingResponse - 5, // 18: state.v1.BindingService.GetBinding:output_type -> state.v1.GetBindingResponse - 7, // 19: state.v1.BindingService.ListBindings:output_type -> state.v1.ListBindingsResponse - 9, // 20: state.v1.BindingService.UpdateBinding:output_type -> state.v1.UpdateBindingResponse - 11, // 21: state.v1.BindingService.DeleteBinding:output_type -> state.v1.DeleteBindingResponse - 13, // 22: state.v1.BindingService.ApproveBinding:output_type -> state.v1.ApproveBindingResponse - 15, // 23: state.v1.BindingService.PauseBinding:output_type -> state.v1.PauseBindingResponse - 17, // 24: state.v1.BindingService.ResumeBinding:output_type -> state.v1.ResumeBindingResponse - 19, // 25: state.v1.BindingService.ArmedBindingsForSource:output_type -> state.v1.ArmedBindingsForSourceResponse - 17, // [17:26] is the sub-list for method output_type - 8, // [8:17] is the sub-list for method input_type - 8, // [8:8] is the sub-list for extension type_name - 8, // [8:8] is the sub-list for extension extendee - 0, // [0:8] is the sub-list for field type_name + 2, // 7: state.v1.BindingService.InsertBinding:input_type -> state.v1.InsertBindingRequest + 4, // 8: state.v1.BindingService.GetBinding:input_type -> state.v1.GetBindingRequest + 6, // 9: state.v1.BindingService.ListBindings:input_type -> state.v1.ListBindingsRequest + 8, // 10: state.v1.BindingService.UpdateBinding:input_type -> state.v1.UpdateBindingRequest + 10, // 11: state.v1.BindingService.DeleteBinding:input_type -> state.v1.DeleteBindingRequest + 12, // 12: state.v1.BindingService.ApproveBinding:input_type -> state.v1.ApproveBindingRequest + 14, // 13: state.v1.BindingService.PauseBinding:input_type -> state.v1.PauseBindingRequest + 16, // 14: state.v1.BindingService.ResumeBinding:input_type -> state.v1.ResumeBindingRequest + 3, // 15: state.v1.BindingService.InsertBinding:output_type -> state.v1.InsertBindingResponse + 5, // 16: state.v1.BindingService.GetBinding:output_type -> state.v1.GetBindingResponse + 7, // 17: state.v1.BindingService.ListBindings:output_type -> state.v1.ListBindingsResponse + 9, // 18: state.v1.BindingService.UpdateBinding:output_type -> state.v1.UpdateBindingResponse + 11, // 19: state.v1.BindingService.DeleteBinding:output_type -> state.v1.DeleteBindingResponse + 13, // 20: state.v1.BindingService.ApproveBinding:output_type -> state.v1.ApproveBindingResponse + 15, // 21: state.v1.BindingService.PauseBinding:output_type -> state.v1.PauseBindingResponse + 17, // 22: state.v1.BindingService.ResumeBinding:output_type -> state.v1.ResumeBindingResponse + 15, // [15:23] is the sub-list for method output_type + 7, // [7:15] is the sub-list for method input_type + 7, // [7:7] is the sub-list for extension type_name + 7, // [7:7] is the sub-list for extension extendee + 0, // [0:7] is the sub-list for field type_name } func init() { file_state_v1_binding_proto_init() } @@ -1144,7 +1046,7 @@ func file_state_v1_binding_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_state_v1_binding_proto_rawDesc), len(file_state_v1_binding_proto_rawDesc)), NumEnums: 0, - NumMessages: 20, + NumMessages: 18, NumExtensions: 0, NumServices: 1, }, diff --git a/internal/contracts/state/v1/binding_grpc.pb.go b/internal/contracts/state/v1/binding_grpc.pb.go index 958b42829..a8f0e1714 100644 --- a/internal/contracts/state/v1/binding_grpc.pb.go +++ b/internal/contracts/state/v1/binding_grpc.pb.go @@ -19,15 +19,14 @@ import ( const _ = grpc.SupportPackageIsVersion9 const ( - BindingService_InsertBinding_FullMethodName = "/state.v1.BindingService/InsertBinding" - BindingService_GetBinding_FullMethodName = "/state.v1.BindingService/GetBinding" - BindingService_ListBindings_FullMethodName = "/state.v1.BindingService/ListBindings" - BindingService_UpdateBinding_FullMethodName = "/state.v1.BindingService/UpdateBinding" - BindingService_DeleteBinding_FullMethodName = "/state.v1.BindingService/DeleteBinding" - BindingService_ApproveBinding_FullMethodName = "/state.v1.BindingService/ApproveBinding" - BindingService_PauseBinding_FullMethodName = "/state.v1.BindingService/PauseBinding" - BindingService_ResumeBinding_FullMethodName = "/state.v1.BindingService/ResumeBinding" - BindingService_ArmedBindingsForSource_FullMethodName = "/state.v1.BindingService/ArmedBindingsForSource" + BindingService_InsertBinding_FullMethodName = "/state.v1.BindingService/InsertBinding" + BindingService_GetBinding_FullMethodName = "/state.v1.BindingService/GetBinding" + BindingService_ListBindings_FullMethodName = "/state.v1.BindingService/ListBindings" + BindingService_UpdateBinding_FullMethodName = "/state.v1.BindingService/UpdateBinding" + BindingService_DeleteBinding_FullMethodName = "/state.v1.BindingService/DeleteBinding" + BindingService_ApproveBinding_FullMethodName = "/state.v1.BindingService/ApproveBinding" + BindingService_PauseBinding_FullMethodName = "/state.v1.BindingService/PauseBinding" + BindingService_ResumeBinding_FullMethodName = "/state.v1.BindingService/ResumeBinding" ) // BindingServiceClient is the client API for BindingService service. @@ -42,7 +41,6 @@ type BindingServiceClient interface { ApproveBinding(ctx context.Context, in *ApproveBindingRequest, opts ...grpc.CallOption) (*ApproveBindingResponse, error) PauseBinding(ctx context.Context, in *PauseBindingRequest, opts ...grpc.CallOption) (*PauseBindingResponse, error) ResumeBinding(ctx context.Context, in *ResumeBindingRequest, opts ...grpc.CallOption) (*ResumeBindingResponse, error) - ArmedBindingsForSource(ctx context.Context, in *ArmedBindingsForSourceRequest, opts ...grpc.CallOption) (*ArmedBindingsForSourceResponse, error) } type bindingServiceClient struct { @@ -133,16 +131,6 @@ func (c *bindingServiceClient) ResumeBinding(ctx context.Context, in *ResumeBind return out, nil } -func (c *bindingServiceClient) ArmedBindingsForSource(ctx context.Context, in *ArmedBindingsForSourceRequest, opts ...grpc.CallOption) (*ArmedBindingsForSourceResponse, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(ArmedBindingsForSourceResponse) - err := c.cc.Invoke(ctx, BindingService_ArmedBindingsForSource_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - // BindingServiceServer is the server API for BindingService service. // All implementations must embed UnimplementedBindingServiceServer // for forward compatibility. @@ -155,7 +143,6 @@ type BindingServiceServer interface { ApproveBinding(context.Context, *ApproveBindingRequest) (*ApproveBindingResponse, error) PauseBinding(context.Context, *PauseBindingRequest) (*PauseBindingResponse, error) ResumeBinding(context.Context, *ResumeBindingRequest) (*ResumeBindingResponse, error) - ArmedBindingsForSource(context.Context, *ArmedBindingsForSourceRequest) (*ArmedBindingsForSourceResponse, error) mustEmbedUnimplementedBindingServiceServer() } @@ -190,9 +177,6 @@ func (UnimplementedBindingServiceServer) PauseBinding(context.Context, *PauseBin func (UnimplementedBindingServiceServer) ResumeBinding(context.Context, *ResumeBindingRequest) (*ResumeBindingResponse, error) { return nil, status.Error(codes.Unimplemented, "method ResumeBinding not implemented") } -func (UnimplementedBindingServiceServer) ArmedBindingsForSource(context.Context, *ArmedBindingsForSourceRequest) (*ArmedBindingsForSourceResponse, error) { - return nil, status.Error(codes.Unimplemented, "method ArmedBindingsForSource not implemented") -} func (UnimplementedBindingServiceServer) mustEmbedUnimplementedBindingServiceServer() {} func (UnimplementedBindingServiceServer) testEmbeddedByValue() {} @@ -358,24 +342,6 @@ func _BindingService_ResumeBinding_Handler(srv interface{}, ctx context.Context, return interceptor(ctx, in, info, handler) } -func _BindingService_ArmedBindingsForSource_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ArmedBindingsForSourceRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(BindingServiceServer).ArmedBindingsForSource(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: BindingService_ArmedBindingsForSource_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BindingServiceServer).ArmedBindingsForSource(ctx, req.(*ArmedBindingsForSourceRequest)) - } - return interceptor(ctx, in, info, handler) -} - // BindingService_ServiceDesc is the grpc.ServiceDesc for BindingService service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -415,10 +381,6 @@ var BindingService_ServiceDesc = grpc.ServiceDesc{ MethodName: "ResumeBinding", Handler: _BindingService_ResumeBinding_Handler, }, - { - MethodName: "ArmedBindingsForSource", - Handler: _BindingService_ArmedBindingsForSource_Handler, - }, }, Streams: []grpc.StreamDesc{}, Metadata: "state/v1/binding.proto", diff --git a/internal/daemon/binding_dispatch_test.go b/internal/daemon/binding_dispatch_test.go index de57215ec..dae94ab0d 100644 --- a/internal/daemon/binding_dispatch_test.go +++ b/internal/daemon/binding_dispatch_test.go @@ -36,10 +36,6 @@ func (s *ledgerStore) ListBindings(context.Context) ([]binding.Binding, error) { return []binding.Binding{dispatchBinding}, nil } -func (s *ledgerStore) ArmedBindingsForSource(context.Context, string) ([]binding.Binding, error) { - return []binding.Binding{dispatchBinding}, nil -} - func (s *ledgerStore) ListUndispatchedCaptures(context.Context, []string, int) ([]storecontract.CapturedEvent, error) { s.mu.Lock() pending := !s.claimed["capture"] diff --git a/internal/daemon/workflow_org_test.go b/internal/daemon/workflow_org_test.go index 1873a032c..9379e789b 100644 --- a/internal/daemon/workflow_org_test.go +++ b/internal/daemon/workflow_org_test.go @@ -56,10 +56,6 @@ func (s *orgBindingStore) ListBindings(context.Context) ([]binding.Binding, erro return s.bindings, nil } -func (s *orgBindingStore) ArmedBindingsForSource(_ context.Context, source string) ([]binding.Binding, error) { - return slices.DeleteFunc(slices.Clone(s.bindings), func(b binding.Binding) bool { return b.Matcher.Source != source }), nil -} - func (s *orgBindingStore) ListUndispatchedCaptures(_ context.Context, bindings []string, _ int) ([]storecontract.CapturedEvent, error) { var captures []storecontract.CapturedEvent for _, b := range s.bindings { diff --git a/internal/domain/storecontract/binding.go b/internal/domain/storecontract/binding.go index 59bd36fe5..02d4ba3ba 100644 --- a/internal/domain/storecontract/binding.go +++ b/internal/domain/storecontract/binding.go @@ -49,7 +49,6 @@ type DispatchFilter struct { // BindingDispatcher looks up armed bindings, lists undispatched captures and // records dispatches. type BindingDispatcher interface { - ArmedBindingsForSource(ctx context.Context, source string) ([]binding.Binding, error) RecordDispatch( ctx context.Context, bindingID string, diff --git a/internal/infrastructure/postgres/edastore.go b/internal/infrastructure/postgres/edastore.go index a6f66919b..3e23ba3ab 100644 --- a/internal/infrastructure/postgres/edastore.go +++ b/internal/infrastructure/postgres/edastore.go @@ -547,23 +547,6 @@ func (s *EDA) ListBindings(ctx context.Context) ([]binding.Binding, error) { return out, nil } -// ArmedBindingsForSource returns the armed bindings a source can dispatch. -func (s *EDA) ArmedBindingsForSource(ctx context.Context, source string) ([]binding.Binding, error) { - rows, err := s.q.ArmedBindingsForSource(ctx, postgresdb.ArmedBindingsForSourceParams{Source: source, ScopeOrg: scopeOrg(ctx)}) - if err != nil { - return nil, fmt.Errorf("edastore: list armed bindings: %w", err) - } - out := make([]binding.Binding, 0, len(rows)) - for _, r := range rows { - b, err := bindingValue(postgresdb.GetBindingRow(r)) - if err != nil { - return nil, err - } - out = append(out, b) - } - return out, nil -} - // UpdateBinding rewrites a binding's editable fields, bumps its version and // drops it back to pending_approval. func (s *EDA) UpdateBinding(ctx context.Context, b binding.Binding) error { diff --git a/internal/infrastructure/postgres/postgresdb/edastore.sql.go b/internal/infrastructure/postgres/postgresdb/edastore.sql.go index 3503daae7..d588c5544 100644 --- a/internal/infrastructure/postgres/postgresdb/edastore.sql.go +++ b/internal/infrastructure/postgres/postgresdb/edastore.sql.go @@ -12,72 +12,6 @@ import ( "github.com/jackc/pgx/v5/pgtype" ) -const armedBindingsForSource = `-- name: ArmedBindingsForSource :many -SELECT id, name, source, mapping, workflow, owner, repo, version, status, created_at, updated_at, filter, inputs, repo_param, org_id, workspace_id -FROM bindings WHERE source = $1 AND status = 'armed' AND ($2::text IS NULL OR org_id = $2) ORDER BY created_at DESC -` - -type ArmedBindingsForSourceParams struct { - Source string - ScopeOrg pgtype.Text -} - -type ArmedBindingsForSourceRow struct { - ID string - Name string - Source string - Mapping string - Workflow string - Owner string - Repo string - Version int64 - Status string - CreatedAt time.Time - UpdatedAt time.Time - Filter string - Inputs string - RepoParam string - OrgID string - WorkspaceID string -} - -func (q *Queries) ArmedBindingsForSource(ctx context.Context, arg ArmedBindingsForSourceParams) ([]ArmedBindingsForSourceRow, error) { - rows, err := q.db.Query(ctx, armedBindingsForSource, arg.Source, arg.ScopeOrg) - if err != nil { - return nil, err - } - defer rows.Close() - var items []ArmedBindingsForSourceRow - for rows.Next() { - var i ArmedBindingsForSourceRow - if err := rows.Scan( - &i.ID, - &i.Name, - &i.Source, - &i.Mapping, - &i.Workflow, - &i.Owner, - &i.Repo, - &i.Version, - &i.Status, - &i.CreatedAt, - &i.UpdatedAt, - &i.Filter, - &i.Inputs, - &i.RepoParam, - &i.OrgID, - &i.WorkspaceID, - ); err != nil { - return nil, err - } - items = append(items, i) - } - if err := rows.Err(); err != nil { - return nil, err - } - return items, nil -} - const captureRefusalSummary = `-- name: CaptureRefusalSummary :many WITH r AS ( SELECT source, count(*) AS refused, array_agg(DISTINCT addr ORDER BY addr)::text[] AS addrs diff --git a/internal/infrastructure/postgres/queries/edastore.sql b/internal/infrastructure/postgres/queries/edastore.sql index e6c884532..59ff9e133 100644 --- a/internal/infrastructure/postgres/queries/edastore.sql +++ b/internal/infrastructure/postgres/queries/edastore.sql @@ -115,10 +115,6 @@ FROM bindings WHERE id = sqlc.arg(id) AND (sqlc.narg(scope_org)::text IS NULL OR SELECT id, name, source, mapping, workflow, owner, repo, version, status, created_at, updated_at, filter, inputs, repo_param, org_id, workspace_id FROM bindings WHERE (sqlc.narg(scope_org)::text IS NULL OR org_id = sqlc.narg(scope_org)) ORDER BY created_at DESC; --- name: ArmedBindingsForSource :many -SELECT id, name, source, mapping, workflow, owner, repo, version, status, created_at, updated_at, filter, inputs, repo_param, org_id, workspace_id -FROM bindings WHERE source = sqlc.arg(source) AND status = 'armed' AND (sqlc.narg(scope_org)::text IS NULL OR org_id = sqlc.narg(scope_org)) ORDER BY created_at DESC; - -- name: UpdateBinding :execrows UPDATE bindings SET name = sqlc.arg(name), source = sqlc.arg(source), mapping = sqlc.arg(mapping), filter = sqlc.arg(filter), diff --git a/internal/infrastructure/staterpc/bindings.go b/internal/infrastructure/staterpc/bindings.go index 68b4904ec..db4936d0f 100644 --- a/internal/infrastructure/staterpc/bindings.go +++ b/internal/infrastructure/staterpc/bindings.go @@ -121,17 +121,6 @@ func (s *bindingServer) ApproveBinding(ctx context.Context, r *pb.ApproveBinding // Source -func (s *bindingServer) ArmedBindingsForSource(ctx context.Context, r *pb.ArmedBindingsForSourceRequest) (*pb.ArmedBindingsForSourceResponse, error) { - if s.deps.BindingDispatcher == nil { - return nil, errBindingDispatchUnavailable - } - bindings, err := s.deps.BindingDispatcher.ArmedBindingsForSource(ctx, r.Source) - if err != nil { - return nil, s.logErr("ArmedBindingsForSource", err) - } - return &pb.ArmedBindingsForSourceResponse{Bindings: mapValues(bindings, bindingProto)}, nil -} - func bindingProtoPtr(b *binding.Binding) *pb.Binding { if b == nil { return nil @@ -193,11 +182,3 @@ func (c *Client) ApproveBinding(ctx context.Context, id string) error { } // Source - -func (c *Client) ArmedBindingsForSource(ctx context.Context, source string) ([]binding.Binding, error) { - r, err := c.binding.ArmedBindingsForSource(ctx, &pb.ArmedBindingsForSourceRequest{Source: source}) - if err != nil { - return nil, unmapError(err) - } - return mapValues(r.Bindings, bindingValue), nil -} diff --git a/proto/state/v1/binding.proto b/proto/state/v1/binding.proto index 0e2b3019f..cba131ffc 100644 --- a/proto/state/v1/binding.proto +++ b/proto/state/v1/binding.proto @@ -13,7 +13,6 @@ service BindingService { rpc ApproveBinding(ApproveBindingRequest) returns (ApproveBindingResponse); rpc PauseBinding(PauseBindingRequest) returns (PauseBindingResponse); rpc ResumeBinding(ResumeBindingRequest) returns (ResumeBindingResponse); - rpc ArmedBindingsForSource(ArmedBindingsForSourceRequest) returns (ArmedBindingsForSourceResponse); } // BindingMatcher mirrors internal/domain/binding.Matcher. @@ -65,5 +64,3 @@ message PauseBindingRequest { string id = 1; } message PauseBindingResponse {} message ResumeBindingRequest { string id = 1; } message ResumeBindingResponse {} -message ArmedBindingsForSourceRequest { string source = 1; } -message ArmedBindingsForSourceResponse { repeated Binding bindings = 1; }