Fix missing transaction ...again.

letsencrypt · Aug 12, 2024 · 6be762c · 6be762c
1 parent 2f611a4
commit 6be762c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/ratelimits/gcra.go b/ratelimits/gcra.go
@@ -79,11 +79,12 @@ func maybeRefund(clk clock.Clock, txn Transaction, tat time.Time) *Decision {
 	if nowUnix > tatUnix {
 		// The TAT is in the past, therefore the bucket is full.
 		return &Decision{
-			allowed:   false,
-			remaining: txn.limit.Burst,
-			retryIn:   time.Duration(0),
-			resetIn:   time.Duration(0),
-			newTAT:    tat,
+			allowed:     false,
+			remaining:   txn.limit.Burst,
+			retryIn:     time.Duration(0),
+			resetIn:     time.Duration(0),
+			newTAT:      tat,
+			transaction: txn,
 		}
 	}
 

diff --git a/ratelimits/gcra_test.go b/ratelimits/gcra_test.go
@@ -206,6 +206,8 @@ func TestMaybeRefund(t *testing.T) {
 	test.AssertEquals(t, d.remaining, int64(10))
 	test.AssertEquals(t, d.retryIn, time.Duration(0))
 	test.AssertEquals(t, d.resetIn, time.Duration(0))
+	// Transaction is set when our TAT is in the past.
+	test.AssertEquals(t, d.transaction, Transaction{"test", limit, 1, true, true})
 
 	// Spend 5 of our 10 requests, then refund 1.
 	d = maybeSpend(clk, Transaction{"test", limit, 5, true, true}, d.newTAT)