test: Handle Fitler flake with ctx errors

Emyrk · Emyrk · commit 6d41edceae37 · 2023-04-13T08:58:01.000-05:00
diff --git a/coderd/rbac/authz.go b/coderd/rbac/authz.go
@@ -137,6 +137,9 @@ func Filter[O Objecter](ctx context.Context, auth Authorizer, subject Subject, a
 			err := auth.Authorize(ctx, subject, action, o.RBACObject())
 			if err == nil {
 				filtered = append(filtered, o)
+			} else if ctx.Err() != nil {
+				// Exit early if the error comes from the context
+				return nil, ctx.Err()
 			}
 		}
 		return filtered, nil
@@ -155,6 +158,9 @@ func Filter[O Objecter](ctx context.Context, auth Authorizer, subject Subject, a
 		err := prepared.Authorize(ctx, rbacObj)
 		if err == nil {
 			filtered = append(filtered, object)
+		} else if ctx.Err() != nil {
+			// Exit early if the error comes from the context
+			return nil, ctx.Err()
 		}
 	}
 
diff --git a/coderd/rbac/authz_internal_test.go b/coderd/rbac/authz_internal_test.go
@@ -170,7 +170,7 @@ func TestFilter(t *testing.T) {
 			localObjects := make([]fakeObject, len(objects))
 			copy(localObjects, objects)
 
-			ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
+			ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium)
 			defer cancel()
 			auth := NewAuthorizer(prometheus.NewRegistry())
 

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,9 @@ func Filter[O Objecter](ctx context.Context, auth Authorizer, subject Subject, a`
`137`	`137`	`err := auth.Authorize(ctx, subject, action, o.RBACObject())`
`138`	`138`	`if err == nil {`
`139`	`139`	`filtered = append(filtered, o)`
	`140`	`+ } else if ctx.Err() != nil {`
	`141`	`+ // Exit early if the error comes from the context`
	`142`	`+ return nil, ctx.Err()`
`140`	`143`	`}`
`141`	`144`	`}`
`142`	`145`	`return filtered, nil`
`@@ -155,6 +158,9 @@ func Filter[O Objecter](ctx context.Context, auth Authorizer, subject Subject, a`
`155`	`158`	`err := prepared.Authorize(ctx, rbacObj)`
`156`	`159`	`if err == nil {`
`157`	`160`	`filtered = append(filtered, object)`
	`161`	`+ } else if ctx.Err() != nil {`
	`162`	`+ // Exit early if the error comes from the context`
	`163`	`+ return nil, ctx.Err()`
`158`	`164`	`}`
`159`	`165`	`}`
`160`	`166`