Lint fixes part 10 (#2655)

Co-authored-by: James Thomas <james9074@gmail.com>

Author: tstirrat15

pkg/datastore/test/revisions.go

@@ -2,6 +2,7 @@ package test
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"sync"
 	"testing"
@@ -300,18 +301,33 @@ func ConcurrentRevisionsTest(t *testing.T, tester DatastoreTester) {
 	startingRev, err := ds.HeadRevision(ctx)
 	require.NoError(err)
 
+	errCh := make(chan error, 10*5)
+
 	for i := 0; i < 10; i++ {
 		go func() {
 			defer wg.Done()
 
 			for i := 0; i < 5; i++ {
 				head, err := ds.HeadRevision(ctx)
-				require.NoError(err)
-				require.NoError(ds.CheckRevision(ctx, head), "expected head revision to be valid in GC Window")
-				require.True(head.GreaterThan(startingRev) || head.Equal(startingRev))
+				if err != nil {
+					errCh <- fmt.Errorf("HeadRevision error: %w", err)
+					continue
+				}
+				if err := ds.CheckRevision(ctx, head); err != nil {
+					errCh <- fmt.Errorf("CheckRevision error: %w", err)
+					continue
+				}
+				if !head.GreaterThan(startingRev) && !head.Equal(startingRev) {
+					errCh <- errors.New("head revision is not greater than or equal to startingRev")
+				}
 			}
 		}()
 	}
 
 	wg.Wait()
+	close(errCh)
+
+	for err := range errCh {
+		require.NoError(err)
+	}
 }

pkg/development/wasm/operations_test.go

@@ -6,10 +6,10 @@ package main
 import (
 	"testing"
 
-	"github.com/authzed/spicedb/internal/sharederrors"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/types/known/structpb"
 
+	"github.com/authzed/spicedb/internal/sharederrors"
 	corev1 "github.com/authzed/spicedb/pkg/proto/core/v1"
 	devinterface "github.com/authzed/spicedb/pkg/proto/developer/v1"
 	"github.com/authzed/spicedb/pkg/testutil"

pkg/releases/releases_test.go

@@ -24,8 +24,9 @@ func TestGetLatestRelease(t *testing.T) {
 	})
 
 	t.Run("successful release fetch", func(t *testing.T) {
+		var receivedPath string
 		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			require.Equal(t, "/repos/authzed/spicedb/releases/latest", r.URL.Path)
+			receivedPath = r.URL.Path
 			w.Header().Set("Content-Type", "application/json")
 			fmt.Fprintf(w, `{
 				"name": "v1.5.6",
@@ -44,6 +45,7 @@ func TestGetLatestRelease(t *testing.T) {
 		release, err := getLatestReleaseWithClient(t.Context(), httpClient)
 		require.NoError(t, err)
 		require.NotNil(t, release)
+		require.Equal(t, "/repos/authzed/spicedb/releases/latest", receivedPath)
 		require.Equal(t, "v1.5.6", release.Version)
 		require.Equal(t, "https://github.com/authzed/spicedb/releases/tag/v1.5.6", release.ViewURL)
 		require.True(t, release.PublishedAt.Equal(time.Date(2023, 1, 1, 12, 0, 0, 0, time.UTC)))

pkg/schema/typesystem_test.go

@@ -39,19 +39,28 @@ func TestTypeSystemConcurrency(t *testing.T) {
 	ctx := t.Context()
 	ts := NewTypeSystem(ResolverForPredefinedDefinitions(*setup))
 	require := require.New(t)
+
+	// 10 outer iterations, 20 inner iterations, three namespaces
+	errs := make(chan error, 600)
+
 	for range 10 {
 		wg.Add(1)
 		go func() {
 			for range 20 {
 				for _, n := range []string{"document", "user", "team"} {
 					_, err := ts.GetValidatedDefinition(ctx, n)
-					require.NoError(err)
+					errs <- err
 				}
 			}
 			wg.Done()
 		}()
 	}
 	wg.Wait()
+	close(errs)
+
+	for err := range errs {
+		require.NoError(err, "expected no errors in concurrent GetValidatedDefinition calls")
+	}
 }
 
 func TestApplyExpirationFilter(t *testing.T) {

pkg/schemadsl/compiler/compiler_test.go

@@ -52,7 +52,7 @@ func TestCompile(t *testing.T) {
 			"nested parse error",
 			withTenantPrefix,
 			`definition foo {
-				relation something: rela | relb + relc	
+				relation something: rela | relb + relc
 			}`,
 			"parse error in `nested parse error`, line 2, column 37: Expected end of statement or definition, found: TokenTypePlus",
 			[]SchemaDefinition{},
@@ -695,7 +695,7 @@ func TestCompile(t *testing.T) {
 						"thirdParam":   caveattypes.Default.MustListType(caveattypes.Default.IntType),
 					},
 				), "sometenant/foo",
-					`someParam == 42 && someParam != 43 && someParam < 12 && someParam > 56 
+					`someParam == 42 && someParam != 43 && someParam < 12 && someParam > 56
 					&& anotherParam == "hi there" && 42 in thirdParam`),
 			},
 		},
@@ -995,7 +995,7 @@ func TestCompile(t *testing.T) {
 			"relation with expiration trait",
 			withTenantPrefix,
 			`use expiration
-			
+
 			definition simple {
 				relation viewer: user with expiration
 			}`,
@@ -1044,7 +1044,7 @@ func TestCompile(t *testing.T) {
 			"relation with expiration trait and caveat",
 			withTenantPrefix,
 			`use expiration
-			
+
 			definition simple {
 				relation viewer: user with somecaveat and expiration
 			}`,
@@ -1117,24 +1117,23 @@ func TestCompile(t *testing.T) {
 
 func filterSourcePositions(m protoreflect.Message) {
 	m.Range(func(fd protoreflect.FieldDescriptor, v protoreflect.Value) bool {
-		if fd.Kind() == protoreflect.MessageKind {
-			if fd.IsList() {
-				l := v.List()
-				for i := 0; i < l.Len(); i++ {
-					filterSourcePositions(l.Get(i).Message())
-				}
-			} else if fd.IsMap() {
-				m := v.Map()
-				m.Range(func(k protoreflect.MapKey, v protoreflect.Value) bool {
-					filterSourcePositions(v.Message())
-					return true
-				})
+		switch {
+		case fd.Kind() == protoreflect.MessageKind && fd.IsList():
+			l := v.List()
+			for i := 0; i < l.Len(); i++ {
+				filterSourcePositions(l.Get(i).Message())
+			}
+		case fd.Kind() == protoreflect.MessageKind && fd.IsMap():
+			m := v.Map()
+			m.Range(func(k protoreflect.MapKey, v protoreflect.Value) bool {
+				filterSourcePositions(v.Message())
+				return true
+			})
+		case fd.Kind() == protoreflect.MessageKind:
+			if string(fd.Message().Name()) == "SourcePosition" {
+				m.Clear(fd)
 			} else {
-				if string(fd.Message().Name()) == "SourcePosition" {
-					m.Clear(fd)
-				} else {
-					filterSourcePositions(v.Message())
-				}
+				filterSourcePositions(v.Message())
 			}
 		}
 		return true

pkg/spiceerrors/testutil.go

@@ -17,7 +17,7 @@ func RequireReason(t testing.TB, reason v1.ErrorReason, err error, expectedMetad
 	require.Error(t, err)
 	withStatus, ok := status.FromError(err)
 	require.True(t, ok)
-	require.Positive(t, len(withStatus.Details()))
+	require.NotEmpty(t, withStatus.Details())
 
 	info := withStatus.Details()[0].(*errdetails.ErrorInfo)
 	require.Equal(t, v1.ErrorReason_name[int32(reason)], info.GetReason())

pkg/testutil/proto_test.go

@@ -99,7 +99,7 @@ func TestAreProtoEqual(t *testing.T) {
 		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			err := AreProtoEqual(tc.first, tc.second, "something went wrong")
-			require.Equal(t, (err == nil), (tc.expectedEqual))
+			require.Equal(t, tc.expectedEqual, err == nil)
 		})
 	}
 }
@@ -224,7 +224,7 @@ func TestAreProtoSlicesEqual(t *testing.T) {
 			err := AreProtoSlicesEqual(tc.first, tc.second, func(first, second *core.ObjectAndRelation) int {
 				return strings.Compare(first.ObjectId, second.ObjectId)
 			}, "something went wrong")
-			require.Equal(t, (err == nil), (tc.expectedEqual))
+			require.Equal(t, tc.expectedEqual, err == nil)
 		})
 	}
 }

pkg/testutil/require.go

@@ -36,7 +36,7 @@ func RequireEqualEmptyNil(t *testing.T, expected, actual any, msgAndArgs ...any)
 	}
 
 	msgAndArgs = append(msgAndArgs, cmp.Diff(expected, actual, opts...))
-	require.Truef(t, cmp.Equal(expected, actual, opts...), "Should be equal", msgAndArgs...)
+	require.Truef(t, cmp.Equal(expected, actual, opts...), "Should be equal: %v", msgAndArgs...)
 }
 
 // RequireWithin requires that the runner complete its execution within the specified duration.

pkg/validationfile/fileformat_test.go

@@ -91,11 +91,11 @@ validation:
 				require.NoError(t, err)
 
 				require.NotNil(t, decoded)
-				require.Equal(t, tt.expectedRelCount, len(decoded.Relationships.Relationships))
+				require.Len(t, decoded.Relationships.Relationships, tt.expectedRelCount)
 
-				require.Equal(t, tt.expectedAssertTrueCount, len(decoded.Assertions.AssertTrue))
-				require.Equal(t, tt.expectedAssertFalseCount, len(decoded.Assertions.AssertFalse))
-				require.Equal(t, tt.expectedValidationCount, len(decoded.ExpectedRelations.ValidationMap))
+				require.Len(t, decoded.Assertions.AssertTrue, tt.expectedAssertTrueCount)
+				require.Len(t, decoded.Assertions.AssertFalse, tt.expectedAssertFalseCount)
+				require.Len(t, decoded.ExpectedRelations.ValidationMap, tt.expectedValidationCount)
 			}
 		})
 	}