chore: add unit tests

Author: miparnisari

internal/datastore/crdb/watch.go

@@ -70,15 +70,15 @@ type changeDetails struct {
 
 func (cds *crdbDatastore) DefaultsWatchOptions() datastore.WatchOptions {
 	return datastore.WatchOptions{
-		CheckpointInterval:             1 * time.Second,
-		WatchBufferLength:              defaultWatchBufferLength,
-		WatchBufferWriteTimeout:        defaultWatchBufferWriteTimeout,
-		WatchConnectTimeout:            defaultWatchConnectTimeout,
-		MaximumBufferedChangesByteSize: 0, // 0 means no limit
+		CheckpointInterval:      1 * time.Second,
+		WatchBufferLength:       defaultWatchBufferLength,
+		WatchBufferWriteTimeout: defaultWatchBufferWriteTimeout,
+		WatchConnectTimeout:     defaultWatchConnectTimeout,
 	}
 }
 
 func (cds *crdbDatastore) Watch(ctx context.Context, afterRevision datastore.Revision, options datastore.WatchOptions) (<-chan datastore.RevisionChanges, <-chan error) {
+	fmt.Printf("%+v\n", options)
 	updates := make(chan datastore.RevisionChanges, options.WatchBufferLength)
 	errs := make(chan error, 1)
 

pkg/datastore/datastore.go

@@ -753,23 +753,22 @@ func BuildAndValidateWatchOptions(
 		MaximumBufferedChangesByteSize: watchChangeBufferMaximumSize,
 	}
 
-	// Apply datastore defaults for any zero values in server config
-	if options.CheckpointInterval == 0 {
+	if datastoreDefaults.CheckpointInterval > 0 {
 		options.CheckpointInterval = datastoreDefaults.CheckpointInterval
 	}
 	if options.CheckpointInterval < 0 {
 		return WatchOptions{}, errors.New("invalid checkpoint interval given")
 	}
-	if options.WatchBufferLength == 0 {
+	if datastoreDefaults.WatchBufferLength > 0 {
 		options.WatchBufferLength = datastoreDefaults.WatchBufferLength
 	}
-	if options.WatchBufferWriteTimeout <= 0 {
+	if datastoreDefaults.WatchBufferWriteTimeout > 0 {
 		options.WatchBufferWriteTimeout = datastoreDefaults.WatchBufferWriteTimeout
 	}
-	if options.WatchConnectTimeout <= 0 {
+	if datastoreDefaults.WatchConnectTimeout > 0 {
 		options.WatchConnectTimeout = datastoreDefaults.WatchConnectTimeout
 	}
-	if options.MaximumBufferedChangesByteSize == 0 {
+	if datastoreDefaults.MaximumBufferedChangesByteSize > 0 {
 		options.MaximumBufferedChangesByteSize = datastoreDefaults.MaximumBufferedChangesByteSize
 	}
 

pkg/datastore/datastore_test.go

@@ -3,6 +3,7 @@ package datastore
 import (
 	"context"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 
@@ -12,6 +13,37 @@ import (
 	"github.com/authzed/spicedb/pkg/tuple"
 )
 
+func TestBuildAndValidateWatchOptions(t *testing.T) {
+	t.Run("WatchBufferWriteTimeout", func(t *testing.T) {
+		c, err := BuildAndValidateWatchOptions(ServerWatchConfig{WatchBufferWriteTimeout: 1 * time.Second}, ClientWatchOptions{}, WatchOptions{WatchBufferWriteTimeout: 2 * time.Second})
+		require.NoError(t, err)
+		require.NotNil(t, c)
+		require.Equal(t, 2*time.Second, c.WatchBufferWriteTimeout)
+	})
+	t.Run("WatchConnectTimeout", func(t *testing.T) {
+		c, err := BuildAndValidateWatchOptions(ServerWatchConfig{WatchConnectTimeout: 1 * time.Second}, ClientWatchOptions{}, WatchOptions{WatchConnectTimeout: 2 * time.Second})
+		require.NoError(t, err)
+		require.NotNil(t, c)
+		require.Equal(t, 2*time.Second, c.WatchConnectTimeout)
+	})
+	t.Run("WatchBufferLength", func(t *testing.T) {
+		c, err := BuildAndValidateWatchOptions(ServerWatchConfig{WatchBufferLength: 100}, ClientWatchOptions{}, WatchOptions{WatchBufferLength: 200})
+		require.NoError(t, err)
+		require.NotNil(t, c)
+		require.Equal(t, uint16(200), c.WatchBufferLength)
+	})
+	t.Run("CheckpointInterval", func(t *testing.T) {
+		c, err := BuildAndValidateWatchOptions(ServerWatchConfig{CheckpointInterval: 1}, ClientWatchOptions{}, WatchOptions{CheckpointInterval: 2})
+		require.NoError(t, err)
+		require.NotNil(t, c)
+		require.Equal(t, time.Duration(2), c.CheckpointInterval)
+	})
+	t.Run("Invalid CheckpointInterval", func(t *testing.T) {
+		_, err := BuildAndValidateWatchOptions(ServerWatchConfig{CheckpointInterval: -1}, ClientWatchOptions{}, WatchOptions{CheckpointInterval: -1})
+		require.Error(t, err)
+	})
+}
+
 func TestRelationshipsFilterFromPublicFilter(t *testing.T) {
 	tests := []struct {
 		name          string