Skip to content

Commit b5fbd01

Browse files
aholstensonaholstenson
committed
feat(events): Change naming used in gRPC API
1 parent 99bde72 commit b5fbd01

14 files changed

Lines changed: 887 additions & 889 deletions

File tree

‎cmd/test/events/consume/main.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func main() {
5858
Name: name,
5959
Stream: "test",
6060
Subjects: []string{"test"},
61-
Pointer: &eventsv1alpha1.StreamPointer{
61+
From: &eventsv1alpha1.StreamPointer{
6262
Pointer: &eventsv1alpha1.StreamPointer_Start{
6363
Start: true,
6464
},
@@ -69,16 +69,16 @@ func main() {
6969
log.Fatal(err)
7070
}
7171

72-
stream, err := client.Consume(ctx)
72+
stream, err := client.Events(ctx)
7373
if err != nil {
7474
log.Fatal(err)
7575
}
7676

7777
// Send the initial subscription request
7878
maxProcessingEvents := uint64(*parallelism)
79-
err = stream.Send(&eventsv1alpha1.ConsumeRequest{
80-
Request: &eventsv1alpha1.ConsumeRequest_Subscribe_{
81-
Subscribe: &eventsv1alpha1.ConsumeRequest_Subscribe{
79+
err = stream.Send(&eventsv1alpha1.EventsRequest{
80+
Request: &eventsv1alpha1.EventsRequest_Subscribe_{
81+
Subscribe: &eventsv1alpha1.EventsRequest_Subscribe{
8282
Stream: "test",
8383
Consumer: c.Id,
8484
MaxProcessingEvents: &maxProcessingEvents,
@@ -95,7 +95,7 @@ func main() {
9595
log.Fatal(err)
9696
}
9797

98-
incoming := make(chan *eventsv1alpha1.ConsumeResponse)
98+
incoming := make(chan *eventsv1alpha1.EventsResponse)
9999
go func() {
100100
for {
101101
resp, err2 := stream.Recv()
@@ -151,9 +151,9 @@ func main() {
151151
time.Sleep(time.Duration(sleepInMS) * time.Millisecond)
152152

153153
// Acknowledge the event
154-
err = stream.Send(&eventsv1alpha1.ConsumeRequest{
155-
Request: &eventsv1alpha1.ConsumeRequest_Ack_{
156-
Ack: &eventsv1alpha1.ConsumeRequest_Ack{
154+
err = stream.Send(&eventsv1alpha1.EventsRequest{
155+
Request: &eventsv1alpha1.EventsRequest_Ack_{
156+
Ack: &eventsv1alpha1.EventsRequest_Ack{
157157
Ids: []uint64{event.Id},
158158
},
159159
},

internal/api/events/v1alpha1/subscriptions.go renamed to internal/api/events/v1alpha1/consumers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ func (e *EventsServiceServer) EnsureConsumer(ctx context.Context, req *eventsv1a
2424
config.Timeout = req.ProcessingTimeout.AsDuration()
2525
}
2626

27-
if req.Pointer != nil {
28-
config.Pointer = toStreamPointer(req.Pointer)
27+
if req.From != nil {
28+
config.From = toStreamPointer(req.From)
2929
}
3030

3131
consumer, err := e.events.EnsureConsumer(ctx, config)

internal/api/events/v1alpha1/subscriptions_test.go renamed to internal/api/events/v1alpha1/consumers_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
. "github.com/onsi/gomega"
99
)
1010

11-
var _ = Describe("Subscriptions", func() {
11+
var _ = Describe("Consumers", func() {
1212
var service eventsv1alpha1.EventsServiceClient
1313

1414
BeforeEach(func(ctx context.Context) {
@@ -29,7 +29,7 @@ var _ = Describe("Subscriptions", func() {
2929
})
3030

3131
Describe("Ephemeral", func() {
32-
It("can create a subscription", func(ctx context.Context) {
32+
It("can create a consumer", func(ctx context.Context) {
3333
_, err := service.EnsureConsumer(ctx, &eventsv1alpha1.EnsureConsumerRequest{
3434
Stream: "test",
3535
Subjects: []string{
@@ -41,7 +41,7 @@ var _ = Describe("Subscriptions", func() {
4141
})
4242

4343
Describe("Durable", func() {
44-
It("can update subject of subscription", func(ctx context.Context) {
44+
It("can update subject of consumer", func(ctx context.Context) {
4545
subID := "test-sub"
4646
_, err := service.EnsureConsumer(ctx, &eventsv1alpha1.EnsureConsumerRequest{
4747
Stream: "test",

internal/api/events/v1alpha1/consume.go renamed to internal/api/events/v1alpha1/events.go

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"google.golang.org/protobuf/types/known/timestamppb"
1616
)
1717

18-
func (e *EventsServiceServer) Consume(server eventsv1alpha1.EventsService_ConsumeServer) error {
18+
func (e *EventsServiceServer) Events(server eventsv1alpha1.EventsService_EventsServer) error {
1919
ctx := server.Context()
2020

2121
subscribe, err := server.Recv()
@@ -28,7 +28,7 @@ func (e *EventsServiceServer) Consume(server eventsv1alpha1.EventsService_Consum
2828
config := e.createEventConsumeConfig(sub)
2929

3030
var err2 error
31-
events, err2 = e.events.Consume(ctx, config)
31+
events, err2 = e.events.Events(ctx, config)
3232
if err2 != nil {
3333
return errors.Wrap(err2, "could not subscribe")
3434
}
@@ -38,9 +38,9 @@ func (e *EventsServiceServer) Consume(server eventsv1alpha1.EventsService_Consum
3838
defer events.Close()
3939

4040
// Send initial response
41-
err = server.Send(&eventsv1alpha1.ConsumeResponse{
42-
Response: &eventsv1alpha1.ConsumeResponse_Subscribed_{
43-
Subscribed: &eventsv1alpha1.ConsumeResponse_Subscribed{
41+
err = server.Send(&eventsv1alpha1.EventsResponse{
42+
Response: &eventsv1alpha1.EventsResponse_Subscribed_{
43+
Subscribed: &eventsv1alpha1.EventsResponse_Subscribed{
4444
ProcessingTimeout: durationpb.New(events.Timeout),
4545
},
4646
},
@@ -50,7 +50,7 @@ func (e *EventsServiceServer) Consume(server eventsv1alpha1.EventsService_Consum
5050
}
5151

5252
// Start a goroutine to read incoming messages and send them to a channel
53-
messages := make(chan *eventsv1alpha1.ConsumeRequest)
53+
messages := make(chan *eventsv1alpha1.EventsRequest)
5454
go func() {
5555
for {
5656
if ctx.Err() != nil {
@@ -90,7 +90,7 @@ func (e *EventsServiceServer) Consume(server eventsv1alpha1.EventsService_Consum
9090
return nil
9191
case <-e.globalStop:
9292
return nil
93-
case event := <-events.Events():
93+
case event := <-events.Incoming():
9494
eventMap.Add(event)
9595

9696
// Create the common headers
@@ -105,8 +105,8 @@ func (e *EventsServiceServer) Consume(server eventsv1alpha1.EventsService_Consum
105105
})
106106

107107
// Send the actual event
108-
err = server.Send(&eventsv1alpha1.ConsumeResponse{
109-
Response: &eventsv1alpha1.ConsumeResponse_Event{
108+
err = server.Send(&eventsv1alpha1.EventsResponse{
109+
Response: &eventsv1alpha1.EventsResponse_Event{
110110
Event: &eventsv1alpha1.Event{
111111
Id: event.StreamSeq,
112112
Data: event.Data,
@@ -122,19 +122,19 @@ func (e *EventsServiceServer) Consume(server eventsv1alpha1.EventsService_Consum
122122
event.DiscardData()
123123
case request := <-messages:
124124
switch r := request.Request.(type) {
125-
case *eventsv1alpha1.ConsumeRequest_Subscribe_:
125+
case *eventsv1alpha1.EventsRequest_Subscribe_:
126126
return errors.New("cannot subscribe again")
127-
case *eventsv1alpha1.ConsumeRequest_Ack_:
127+
case *eventsv1alpha1.EventsRequest_Ack_:
128128
err = e.handleAck(server, eventMap, r)
129129
if err != nil {
130130
return err
131131
}
132-
case *eventsv1alpha1.ConsumeRequest_Reject_:
132+
case *eventsv1alpha1.EventsRequest_Reject_:
133133
err = e.handleReject(server, eventMap, r)
134134
if err != nil {
135135
return err
136136
}
137-
case *eventsv1alpha1.ConsumeRequest_Ping_:
137+
case *eventsv1alpha1.EventsRequest_Ping_:
138138
err = e.handlePing(server, eventMap, r)
139139
if err != nil {
140140
return err
@@ -145,9 +145,9 @@ func (e *EventsServiceServer) Consume(server eventsv1alpha1.EventsService_Consum
145145
}
146146

147147
func (e *EventsServiceServer) handleAck(
148-
server eventsv1alpha1.EventsService_ConsumeServer,
148+
server eventsv1alpha1.EventsService_EventsServer,
149149
eventMap eventTracker,
150-
r *eventsv1alpha1.ConsumeRequest_Ack_,
150+
r *eventsv1alpha1.EventsRequest_Ack_,
151151
) error {
152152
ids := r.Ack.Ids
153153

@@ -175,9 +175,9 @@ func (e *EventsServiceServer) handleAck(
175175
}
176176
}
177177

178-
err := server.Send(&eventsv1alpha1.ConsumeResponse{
179-
Response: &eventsv1alpha1.ConsumeResponse_AckConfirmation_{
180-
AckConfirmation: &eventsv1alpha1.ConsumeResponse_AckConfirmation{
178+
err := server.Send(&eventsv1alpha1.EventsResponse{
179+
Response: &eventsv1alpha1.EventsResponse_AckConfirmation_{
180+
AckConfirmation: &eventsv1alpha1.EventsResponse_AckConfirmation{
181181
Ids: processedIds,
182182
InvalidIds: invalidIds,
183183
TemporaryFailedIds: temporaryErrors,
@@ -192,9 +192,9 @@ func (e *EventsServiceServer) handleAck(
192192
}
193193

194194
func (e *EventsServiceServer) handleReject(
195-
server eventsv1alpha1.EventsService_ConsumeServer,
195+
server eventsv1alpha1.EventsService_EventsServer,
196196
eventMap eventTracker,
197-
r *eventsv1alpha1.ConsumeRequest_Reject_,
197+
r *eventsv1alpha1.EventsRequest_Reject_,
198198
) error {
199199
ids := r.Reject.Ids
200200
permanently := r.Reject.Permanently
@@ -232,9 +232,9 @@ func (e *EventsServiceServer) handleReject(
232232
}
233233
}
234234

235-
err := server.Send(&eventsv1alpha1.ConsumeResponse{
236-
Response: &eventsv1alpha1.ConsumeResponse_RejectConfirmation_{
237-
RejectConfirmation: &eventsv1alpha1.ConsumeResponse_RejectConfirmation{
235+
err := server.Send(&eventsv1alpha1.EventsResponse{
236+
Response: &eventsv1alpha1.EventsResponse_RejectConfirmation_{
237+
RejectConfirmation: &eventsv1alpha1.EventsResponse_RejectConfirmation{
238238
Ids: processedIds,
239239
InvalidIds: invalidIds,
240240
TemporaryFailedIds: temporaryErrors,
@@ -249,9 +249,9 @@ func (e *EventsServiceServer) handleReject(
249249
}
250250

251251
func (e *EventsServiceServer) handlePing(
252-
server eventsv1alpha1.EventsService_ConsumeServer,
252+
server eventsv1alpha1.EventsService_EventsServer,
253253
eventMap eventTracker,
254-
r *eventsv1alpha1.ConsumeRequest_Ping_,
254+
r *eventsv1alpha1.EventsRequest_Ping_,
255255
) error {
256256
ids := r.Ping.Ids
257257

@@ -278,9 +278,9 @@ func (e *EventsServiceServer) handlePing(
278278
}
279279
}
280280

281-
err := server.Send(&eventsv1alpha1.ConsumeResponse{
282-
Response: &eventsv1alpha1.ConsumeResponse_PingConfirmation_{
283-
PingConfirmation: &eventsv1alpha1.ConsumeResponse_PingConfirmation{
281+
err := server.Send(&eventsv1alpha1.EventsResponse{
282+
Response: &eventsv1alpha1.EventsResponse_PingConfirmation_{
283+
PingConfirmation: &eventsv1alpha1.EventsResponse_PingConfirmation{
284284
Ids: processedIds,
285285
InvalidIds: invalidIds,
286286
TemporaryFailedIds: temporaryErrors,
@@ -294,7 +294,7 @@ func (e *EventsServiceServer) handlePing(
294294
return nil
295295
}
296296

297-
func (*EventsServiceServer) createEventConsumeConfig(sub *eventsv1alpha1.ConsumeRequest_Subscribe) *events.EventConsumeConfig {
297+
func (*EventsServiceServer) createEventConsumeConfig(sub *eventsv1alpha1.EventsRequest_Subscribe) *events.EventConsumeConfig {
298298
maxPendingEvents := uint(0)
299299
if sub.MaxProcessingEvents != nil {
300300
maxPendingEvents = uint(*sub.MaxProcessingEvents)

0 commit comments

Comments
 (0)