Direct-delivery: Fix slices in direct notifier

There was a bug in direct notifier that caused only subset of notification was sent to client. The first iteration over notification replaced original notification slice with just first "page". This caused that only one "page" was sent and rest was ignored. This commit fixes amqp and stomp direct notification delivery. Signed-off-by: Ales Raszka <[email protected]>
quay · Nov 19, 2020 · ea564d4 · ea564d4
1 parent f4169c4
commit ea564d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/notifier/amqp/directdeliverer.go b/notifier/amqp/directdeliverer.go
@@ -85,6 +85,7 @@ func (d *DirectDeliverer) Deliver(ctx context.Context, _ uuid.UUID) error {
 
 	var buf bytes.Buffer
 	enc := json.NewEncoder(&buf)
+	var currentBlock []notifier.Notification
 	for bs, be := 0, rollup; bs < len(d.n); bs, be = be, be+rollup {
 		buf.Reset()
 		// if block-end exceeds array bounds, slice block underflow.
@@ -93,8 +94,8 @@ func (d *DirectDeliverer) Deliver(ctx context.Context, _ uuid.UUID) error {
 			be = len(d.n)
 		}
 
-		d.n = d.n[bs:be]
-		err := enc.Encode(&d.n)
+		currentBlock = d.n[bs:be]
+		err := enc.Encode(&currentBlock)
 		if err != nil {
 			ch.TxRollback()
 			return &clairerror.ErrDeliveryFailed{err}

diff --git a/notifier/stomp/directdeliverer.go b/notifier/stomp/directdeliverer.go
@@ -75,6 +75,7 @@ func (d *DirectDeliverer) Deliver(ctx context.Context, nID uuid.UUID) error {
 
 	var buf bytes.Buffer
 	enc := json.NewEncoder(&buf)
+	var currentBlock []notifier.Notification
 	for bs, be := 0, rollup; bs < len(d.n); bs, be = be, be+rollup {
 		buf.Reset()
 		// if block-end exceeds array bounds, slice block underflow.
@@ -83,8 +84,8 @@ func (d *DirectDeliverer) Deliver(ctx context.Context, nID uuid.UUID) error {
 			be = len(d.n)
 		}
 
-		d.n = d.n[bs:be]
-		err := enc.Encode(&d.n)
+		currentBlock = d.n[bs:be]
+		err := enc.Encode(&currentBlock)
 		if err != nil {
 			tx.Abort()
 			return &clairerror.ErrDeliveryFailed{err}