chore: clean up all unused parameters (#2931)

Author: mishto

.golangci.yaml

@@ -40,6 +40,7 @@ linters:
     - "tagalign"
     - "testifylint"
     - "tparallel"
+    - "unparam"
     - "unconvert"
     - "usetesting"
     - "wastedassign"
@@ -95,6 +96,9 @@ linters:
       - linters:
           - "perfsprint"
         path: '(.+)_test\.go'
+      - linters:
+          - "unparam"
+        text: "result .* is always|result .* is never used|always receives"
     paths:
       - "third_party$"
       - "builtin$"

internal/caveats/run.go

@@ -82,8 +82,7 @@ func (cr *CaveatRunner) RunCaveatExpression(
 		return nil, err
 	}
 
-	env := caveats.NewEnvironmentWithTypeSet(cr.caveatTypeSet)
-	return cr.runExpressionWithCaveats(ctx, env, expr, context, debugOption)
+	return cr.runExpressionWithCaveats(ctx, expr, context, debugOption)
 }
 
 // PopulateCaveatDefinitionsForExpr populates the CaveatRunner's cache with the definitions
@@ -167,7 +166,6 @@ func collectCaveatNames(expr *core.CaveatExpression, caveatNames *mapz.Set[strin
 
 func (cr *CaveatRunner) runExpressionWithCaveats(
 	ctx context.Context,
-	env *caveats.Environment,
 	expr *core.CaveatExpression,
 	context map[string]any,
 	debugOption RunCaveatExpressionDebugOption,
@@ -320,7 +318,7 @@ func (cr *CaveatRunner) runExpressionWithCaveats(
 	}
 
 	for _, child := range cop.Children {
-		childResult, err := cr.runExpressionWithCaveats(ctx, env, child, context, debugOption)
+		childResult, err := cr.runExpressionWithCaveats(ctx, child, context, debugOption)
 		if err != nil {
 			return nil, err
 		}

internal/dispatch/caching/cachingdispatch_test.go

@@ -184,9 +184,9 @@ func TestConcurrentDebugInfoAccess(t *testing.T) {
 	errors := make(chan error, numGoroutines)
 
 	var wg sync.WaitGroup
-	for i := range numGoroutines {
+	for range numGoroutines {
 		wg.Add(1)
-		go func(goroutineID int) {
+		go func() {
 			defer wg.Done()
 
 			request := &v1.DispatchCheckRequest{
@@ -211,7 +211,7 @@ func TestConcurrentDebugInfoAccess(t *testing.T) {
 			// we mutate the response to prove that it's not shared across goroutines
 			resp.GetMetadata().GetDebugInfo().GetCheck().GetRequest().Subject.Relation = "modified"
 			resp.GetMetadata().GetDebugInfo().GetCheck().GetRequest().ResourceIds = []string{"modified"}
-		}(i)
+		}()
 	}
 
 	wg.Wait()

internal/dispatch/graph/check_test.go

@@ -2072,7 +2072,7 @@ func TestCheckHintsPartialApplicationOverArrow(t *testing.T) {
 	require.Equal(v1.ResourceCheckResult_MEMBER, resp.ResultsByResourceId["anotherdoc"].Membership)
 }
 
-func newLocalDispatcherWithConcurrencyLimit(t testing.TB, concurrencyLimit uint16) (context.Context, dispatch.Dispatcher, datastore.Revision) {
+func newLocalDispatcher(t testing.TB) (context.Context, dispatch.Dispatcher, datastore.Revision) {
 	rawDS, err := dsfortesting.NewMemDBDatastoreForTesting(t, 0, 0, memdb.DisableGC)
 	require.NoError(t, err)
 
@@ -2097,10 +2097,6 @@ func newLocalDispatcherWithConcurrencyLimit(t testing.TB, concurrencyLimit uint1
 	return ctx, cachingDispatcher, revision
 }
 
-func newLocalDispatcher(t testing.TB) (context.Context, dispatch.Dispatcher, datastore.Revision) {
-	return newLocalDispatcherWithConcurrencyLimit(t, 10)
-}
-
 func newLocalDispatcherWithSchemaAndRels(t testing.TB, schema string, rels []tuple.Relationship) (context.Context, dispatch.Dispatcher, datastore.Revision) {
 	rawDS, err := dsfortesting.NewMemDBDatastoreForTesting(t, 0, 0, memdb.DisableGC)
 	require.NoError(t, err)

internal/dispatch/remote/primarysleeper_test.go

@@ -260,14 +260,14 @@ func TestPrimarySleeper_SleepConcurrently(t *testing.T) {
 
 	synctest.Test(t, func(t *testing.T) {
 		ctx := t.Context()
-		for i := range 3 {
+		for range 3 {
 			wg.Add(1)
-			go func(idx int) {
+			go func() {
 				defer wg.Done()
 				start := time.Now()
 				sleeper.sleep(ctx)
 				results <- time.Since(start)
-			}(i)
+			}()
 		}
 
 		wg.Wait()

internal/graph/check.go

@@ -882,7 +882,7 @@ func checkIntersectionTupleToUserset(
 		}
 
 		resultsByDispatchedSubject[result.relationType].UnionWith(result.Resp.ResultsByResourceId)
-		combinedMetadata = combineResponseMetadata(ctx, combinedMetadata, result.Resp.Metadata)
+		combinedMetadata = combineResponseMetadata(combinedMetadata, result.Resp.Metadata)
 	}
 
 	// For each resource ID, check that there exist some sort of permission for *each* subject. If not, then the
@@ -1022,11 +1022,11 @@ func checkTupleToUserset[T relation](
 	), hintsToReturn)
 }
 
-func withDistinctMetadata(ctx context.Context, result CheckResult) CheckResult {
+func withDistinctMetadata(result CheckResult) CheckResult {
 	// NOTE: This is necessary to ensure unique debug information on the request and that debug
 	// information from the child metadata is *not* copied over.
 	clonedResp := result.Resp.CloneVT()
-	clonedResp.Metadata = combineResponseMetadata(ctx, emptyMetadata, clonedResp.Metadata)
+	clonedResp.Metadata = combineResponseMetadata(emptyMetadata, clonedResp.Metadata)
 	return CheckResult{
 		Resp: clonedResp,
 		Err:  result.Err,
@@ -1082,7 +1082,7 @@ func union[T any](
 	}
 
 	if len(children) == 1 {
-		return withDistinctMetadata(ctx, handler(ctx, crc, children[0]))
+		return withDistinctMetadata(handler(ctx, crc, children[0]))
 	}
 
 	resultChan := make(chan CheckResult, len(children))
@@ -1097,7 +1097,7 @@ func union[T any](
 		select {
 		case result := <-resultChan:
 			log.Ctx(ctx).Trace().Object("anyResult", result.Resp).Send()
-			responseMetadata = combineResponseMetadata(ctx, responseMetadata, result.Resp.Metadata)
+			responseMetadata = combineResponseMetadata(responseMetadata, result.Resp.Metadata)
 			if result.Err != nil {
 				return checkResultError(result.Err, responseMetadata)
 			}
@@ -1129,7 +1129,7 @@ func all[T any](
 	}
 
 	if len(children) == 1 {
-		return withDistinctMetadata(ctx, handler(ctx, crc, children[0]))
+		return withDistinctMetadata(handler(ctx, crc, children[0]))
 	}
 
 	responseMetadata := emptyMetadata
@@ -1148,7 +1148,7 @@ func all[T any](
 	for range children {
 		select {
 		case result := <-resultChan:
-			responseMetadata = combineResponseMetadata(ctx, responseMetadata, result.Resp.Metadata)
+			responseMetadata = combineResponseMetadata(responseMetadata, result.Resp.Metadata)
 			if result.Err != nil {
 				return checkResultError(result.Err, responseMetadata)
 			}
@@ -1215,7 +1215,7 @@ func difference[T any](
 	// Wait for the base set to return.
 	select {
 	case base := <-baseChan:
-		responseMetadata = combineResponseMetadata(ctx, responseMetadata, base.Resp.Metadata)
+		responseMetadata = combineResponseMetadata(responseMetadata, base.Resp.Metadata)
 
 		if base.Err != nil {
 			return checkResultError(base.Err, responseMetadata)
@@ -1234,7 +1234,7 @@ func difference[T any](
 	for i := 1; i < len(children); i++ {
 		select {
 		case sub := <-othersChan:
-			responseMetadata = combineResponseMetadata(ctx, responseMetadata, sub.Resp.Metadata)
+			responseMetadata = combineResponseMetadata(responseMetadata, sub.Resp.Metadata)
 
 			if sub.Err != nil {
 				return checkResultError(sub.Err, responseMetadata)
@@ -1333,7 +1333,7 @@ func combineResultWithFoundResources(result CheckResult, foundResources *Members
 	}
 }
 
-func combineResponseMetadata(ctx context.Context, existing *v1.ResponseMeta, responseMetadata *v1.ResponseMeta) *v1.ResponseMeta {
+func combineResponseMetadata(existing *v1.ResponseMeta, responseMetadata *v1.ResponseMeta) *v1.ResponseMeta {
 	combined := &v1.ResponseMeta{
 		DispatchCount:       existing.DispatchCount + responseMetadata.DispatchCount,
 		DepthRequired:       max(existing.DepthRequired, responseMetadata.DepthRequired),

internal/graph/expand.go

@@ -353,7 +353,7 @@ func expandSetOperation(
 	for _, resultChan := range resultChans {
 		select {
 		case result := <-resultChan:
-			responseMetadata = combineResponseMetadata(ctx, responseMetadata, result.Resp.Metadata)
+			responseMetadata = combineResponseMetadata(responseMetadata, result.Resp.Metadata)
 			if result.Err != nil {
 				return expandResultError(result.Err, responseMetadata)
 			}

internal/graph/lookupsubjects.go

@@ -195,7 +195,6 @@ func (cl *ConcurrentLookupSubjects) lookupViaComputed(
 	ctx context.Context,
 	parentRequest ValidatedLookupSubjectsRequest,
 	parentStream dispatch.LookupSubjectsStream,
-	ts *schema.TypeSystem,
 	cu *core.ComputedUserset,
 ) error {
 	dl := datalayer.MustFromContext(ctx).SnapshotReader(parentRequest.Revision)
@@ -368,7 +367,7 @@ func lookupViaIntersectionTupleToUserset(
 			results := datasets.NewSubjectSet()
 			collectedMetadata := emptyMetadata
 			for _, result := range collectingStream.Results() {
-				collectedMetadata = combineResponseMetadata(ctx, collectedMetadata, result.Metadata)
+				collectedMetadata = combineResponseMetadata(collectedMetadata, result.Metadata)
 				for _, foundSubjects := range result.FoundSubjectsByResourceId {
 					if err := results.UnionWith(foundSubjects.FoundSubjects); err != nil {
 						return fmt.Errorf("failed to UnionWith under lookupSubjectsIntersection: %w", err)
@@ -379,7 +378,7 @@ func lookupViaIntersectionTupleToUserset(
 			dispatchInfoForResource.lock.Lock()
 			defer dispatchInfoForResource.lock.Unlock()
 
-			dispatchInfoForResource.metadata = combineResponseMetadata(ctx, dispatchInfoForResource.metadata, collectedMetadata)
+			dispatchInfoForResource.metadata = combineResponseMetadata(dispatchInfoForResource.metadata, collectedMetadata)
 
 			// If the first update for the resource, set the subjects set to the results.
 			if dispatchInfoForResource.isFirstUpdate {
@@ -417,7 +416,7 @@ func lookupViaIntersectionTupleToUserset(
 		currentSubjects = currentSubjects.WithParentCaveatExpression(ttuCaveat)
 		currentSubjectsByResourceID[incomingResourceID] = currentSubjects.AsFoundSubjects()
 
-		metadata = combineResponseMetadata(ctx, metadata, tracker.metadata)
+		metadata = combineResponseMetadata(metadata, tracker.metadata)
 	}
 
 	return parentStream.Publish(&v1.DispatchLookupSubjectsResponse{
@@ -538,7 +537,7 @@ func (cl *ConcurrentLookupSubjects) lookupSetOperation(
 
 		case *core.SetOperation_Child_ComputedUserset:
 			g.Go(func() error {
-				return cl.lookupViaComputed(subCtx, req, stream, ts, child.ComputedUserset)
+				return cl.lookupViaComputed(subCtx, req, stream, child.ComputedUserset)
 			})
 
 		case *core.SetOperation_Child_UsersetRewrite:
@@ -763,7 +762,7 @@ func (lsu *lookupSubjectsUnion) CompletedChildOperations(ctx context.Context) er
 		}
 
 		for _, result := range collector.Results() {
-			metadata = combineResponseMetadata(ctx, metadata, result.Metadata)
+			metadata = combineResponseMetadata(metadata, result.Metadata)
 			if err := foundSubjects.UnionWith(result.FoundSubjectsByResourceId); err != nil {
 				return fmt.Errorf("failed to UnionWith under lookupSubjectsUnion: %w", err)
 			}
@@ -811,7 +810,7 @@ func (lsi *lookupSubjectsIntersection) CompletedChildOperations(ctx context.Cont
 
 		results := datasets.NewSubjectSetByResourceID()
 		for _, result := range collector.Results() {
-			metadata = combineResponseMetadata(ctx, metadata, result.Metadata)
+			metadata = combineResponseMetadata(metadata, result.Metadata)
 			if err := results.UnionWith(result.FoundSubjectsByResourceId); err != nil {
 				return fmt.Errorf("failed to UnionWith under lookupSubjectsIntersection: %w", err)
 			}
@@ -864,7 +863,7 @@ func (lse *lookupSubjectsExclusion) CompletedChildOperations(ctx context.Context
 		collector := lse.collectors[index]
 		results := datasets.NewSubjectSetByResourceID()
 		for _, result := range collector.Results() {
-			metadata = combineResponseMetadata(ctx, metadata, result.Metadata)
+			metadata = combineResponseMetadata(metadata, result.Metadata)
 			if err := results.UnionWith(result.FoundSubjectsByResourceId); err != nil {
 				return fmt.Errorf("failed to UnionWith under lookupSubjectsExclusion: %w", err)
 			}

internal/graph/lr2streams.go

@@ -227,7 +227,7 @@ func (rdc *checkAndDispatchRunner) runDispatch(
 			return err
 		}
 
-		if err := publishResultToParentStream(ctx, result, rdc.ci, responsePartialCursor, adjustedResources, nil, isFirstPublishCall, checkMetadata, rdc.parentStream); err != nil {
+		if err := publishResultToParentStream(result, rdc.ci, responsePartialCursor, adjustedResources, nil, isFirstPublishCall, checkMetadata, rdc.parentStream); err != nil {
 			return err
 		}
 		isFirstPublishCall = false
@@ -268,7 +268,7 @@ func unfilteredLookupResourcesDispatchStreamForEntrypoint(
 		default:
 		}
 
-		if err := publishResultToParentStream(ctx, result, ci, ci.responsePartialCursor(), foundResources, nil, isFirstPublishCall, emptyMetadata, parentStream); err != nil {
+		if err := publishResultToParentStream(result, ci, ci.responsePartialCursor(), foundResources, nil, isFirstPublishCall, emptyMetadata, parentStream); err != nil {
 			return err
 		}
 		isFirstPublishCall = false
@@ -281,7 +281,6 @@ func unfilteredLookupResourcesDispatchStreamForEntrypoint(
 // publishResultToParentStream publishes the result of a lookup resources call to the parent stream,
 // mapped via foundResources.
 func publishResultToParentStream(
-	ctx context.Context,
 	result *v1.DispatchLookupResources2Response,
 	ci cursorInformation,
 	responseCursor *v1.Cursor,
@@ -314,7 +313,7 @@ func publishResultToParentStream(
 	metadata := result.Metadata
 	if isFirstPublishCall {
 		metadata = addCallToResponseMetadata(metadata)
-		metadata = combineResponseMetadata(ctx, metadata, additionalMetadata)
+		metadata = combineResponseMetadata(metadata, additionalMetadata)
 	} else {
 		metadata = addAdditionalDepthRequired(metadata)
 	}

pkg/datalayer/impl.go

@@ -143,7 +143,7 @@ func (t *readWriteTransaction) BulkLoad(ctx context.Context, iter datastore.Bulk
 }
 
 func (t *readWriteTransaction) WriteSchema(ctx context.Context, definitions []datastore.SchemaDefinition, schemaString string, caveatTypeSet *caveattypes.TypeSet) error {
-	return writeSchemaViaLegacy(ctx, t.rwt, t.rwt, definitions, schemaString, caveatTypeSet)
+	return writeSchemaViaLegacy(ctx, t.rwt, t.rwt, definitions)
 }
 
 func (t *readWriteTransaction) LegacySchemaWriter() LegacySchemaWriter {