fixup! Add TimeoutWithinContext to mongoutil

Author: prestonvasquez

internal/mongoutil/mongoutil.go

@@ -89,17 +89,13 @@ func HostsFromURI(uri string) ([]string, error) {
 // TimeoutWithinContext will return true if the provided timeout is nil or if
 // it is less than the context deadline. If the context does not have a
 // deadline, it will return true.
-func TimeoutWithinContext(ctx context.Context, timeout *time.Duration) bool {
-	if timeout == nil {
-		return true
-	}
-
+func TimeoutWithinContext(ctx context.Context, timeout time.Duration) bool {
 	deadline, ok := ctx.Deadline()
 	if !ok {
 		return true
 	}
 
 	ctxTimeout := time.Until(deadline)
 
-	return ctxTimeout <= 0 || *timeout < ctxTimeout
+	return ctxTimeout <= 0 || timeout < ctxTimeout
 }

internal/mongoutil/mongoutil_test.go

@@ -41,7 +41,7 @@ func TestValidChangeStreamTimeouts(t *testing.T) {
 	tests := []struct {
 		name        string
 		ctxTimeout  *time.Duration
-		timeout     *time.Duration
+		timeout     time.Duration
 		wantTimeout time.Duration
 		want        bool
 	}{
@@ -54,43 +54,43 @@ func TestValidChangeStreamTimeouts(t *testing.T) {
 		{
 			name:       "Timeout shorter than context deadline",
 			ctxTimeout: ptrutil.Ptr(10 * time.Second),
-			timeout:    ptrutil.Ptr(1 * time.Second),
+			timeout:    1 * time.Second,
 			want:       true,
 		},
 		{
 			name:       "Timeout equal to context deadline",
 			ctxTimeout: ptrutil.Ptr(1 * time.Second),
-			timeout:    ptrutil.Ptr(1 * time.Second),
+			timeout:    1 * time.Second,
 			want:       false,
 		},
 		{
 			name:       "Timeout greater than context deadline",
 			ctxTimeout: ptrutil.Ptr(1 * time.Second),
-			timeout:    ptrutil.Ptr(10 * time.Second),
+			timeout:    10 * time.Second,
 			want:       false,
 		},
 		{
 			name:       "Context deadline already expired",
 			ctxTimeout: ptrutil.Ptr(-1 * time.Second),
-			timeout:    ptrutil.Ptr(1 * time.Second),
+			timeout:    1 * time.Second,
 			want:       true, // *timeout <= 0 branch in code
 		},
 		{
 			name:       "Timeout is zero, context deadline in future",
 			ctxTimeout: ptrutil.Ptr(10 * time.Second),
-			timeout:    ptrutil.Ptr(0 * time.Second),
+			timeout:    0 * time.Second,
 			want:       true,
 		},
 		{
 			name:       "Timeout is negative, context deadline in future",
 			ctxTimeout: ptrutil.Ptr(10 * time.Second),
-			timeout:    ptrutil.Ptr(-1 * time.Second),
+			timeout:    -1 * time.Second,
 			want:       true,
 		},
 		{
 			name:       "Timeout provided, context has no deadline",
 			ctxTimeout: nil,
-			timeout:    ptrutil.Ptr(1 * time.Second),
+			timeout:    1 * time.Second,
 			want:       true,
 		},
 	}