Lint fixes part 12 (#2668)

tstirrat15 · James9074 · web-flow · commit ce17b29426ad · 2025-10-30T22:11:18.000Z
Co-authored-by: James Thomas &lt;james9074@gmail.com&gt;
diff --git a/internal/datastore/postgres/xid8.go b/internal/datastore/postgres/xid8.go
@@ -71,8 +71,7 @@ func (Uint64Codec) PlanEncode(_ *pgtype.Map, _ uint32, format int16, value any)
 			return encodePlanUint64CodecBinaryUint64Valuer{}
 		}
 	case pgtype.TextFormatCode:
-		switch value.(type) { //nolint:gocritic
-		case uint64:
+		if _, ok := value.(uint64); ok {
 			return encodePlanUint64CodecTextUint64{}
 		}
 	}
diff --git a/pkg/cmd/datastore/datastore.go b/pkg/cmd/datastore/datastore.go
@@ -70,14 +70,14 @@ func DefaultReadConnPool() *ConnPoolConfig {
 
 func DefaultWriteConnPool() *ConnPoolConfig {
 	cfg := DefaultReadConnPool()
-	cfg.MaxOpenConns = cfg.MaxOpenConns / 2
-	cfg.MinOpenConns = cfg.MinOpenConns / 2
+	cfg.MaxOpenConns /= 2
+	cfg.MinOpenConns /= 2
 	return cfg
 }
 
 func RegisterConnPoolFlagsWithPrefix(flagSet *pflag.FlagSet, prefix string, defaults, opts *ConnPoolConfig) {
 	if prefix != "" {
-		prefix = prefix + "-"
+		prefix += "-"
 	}
 	flagName := func(flag string) string {
 		return prefix + flag
@@ -199,7 +199,7 @@ func RegisterDatastoreFlags(flagset *pflag.FlagSet, opts *Config) error {
 // prefix argument. If left empty, the datastore flags are not prefixed.
 func RegisterDatastoreFlagsWithPrefix(flagSet *pflag.FlagSet, prefix string, opts *Config) error {
 	if prefix != "" {
-		prefix = prefix + "-"
+		prefix += "-"
 	}
 	flagName := func(flag string) string {
 		return prefix + flag
diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go
@@ -540,11 +540,12 @@ func (c *Config) Complete(ctx context.Context) (RunnableServer, error) {
 	var telemetryRegistry *prometheus.Registry
 
 	reporter := telemetry.DisabledReporter
-	if c.SilentlyDisableTelemetry {
+	switch {
+	case c.SilentlyDisableTelemetry:
 		reporter = telemetry.SilentlyDisabledReporter
-	} else if c.TelemetryEndpoint != "" && c.DatastoreConfig.DisableStats {
+	case c.TelemetryEndpoint != "" && c.DatastoreConfig.DisableStats:
 		reporter = telemetry.DisabledReporter
-	} else if c.TelemetryEndpoint != "" {
+	case c.TelemetryEndpoint != "":
 		log.Ctx(ctx).Debug().Msg("initializing telemetry collector")
 		registry, err := telemetry.RegisterTelemetryCollector(c.DatastoreConfig.Engine, ds)
 		if err != nil {
diff --git a/pkg/cmd/server/server_test.go b/pkg/cmd/server/server_test.go
@@ -113,8 +113,9 @@ func TestOTelReporting(t *testing.T) {
 
 	schemaSrv := v1.NewSchemaServiceClient(conn)
 
+	runErrCh := make(chan error, 1)
 	go func() {
-		require.NoError(t, srv.Run(ctx))
+		runErrCh <- srv.Run(ctx)
 	}()
 
 	// test unary OTel middleware
@@ -140,6 +141,7 @@ func TestOTelReporting(t *testing.T) {
 	require.Error(t, err)
 
 	requireSpanExists(t, spanrecorder, "authzed.api.v1.PermissionsService/LookupResources")
+	require.NoError(t, <-runErrCh)
 }
 
 func TestDisableHealthCheckTracing(t *testing.T) {
diff --git a/pkg/composableschemadsl/compiler/compiler_test.go b/pkg/composableschemadsl/compiler/compiler_test.go
@@ -1353,24 +1353,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
diff --git a/pkg/composableschemadsl/compiler/translator.go b/pkg/composableschemadsl/compiler/translator.go
@@ -514,9 +514,9 @@ func translateExpressionDirect(tctx *translationContext, expressionNode *dslNode
 		if err != nil {
 			return nil, err
 		}
-		leftOps := collapseOps(leftOperation, lookup)
-		rightOps := collapseOps(rightOperation, lookup)
-		ops := append(leftOps, rightOps...)
+		var ops []*core.SetOperation_Child
+		ops = append(ops, collapseOps(leftOperation, lookup)...)
+		ops = append(ops, collapseOps(rightOperation, lookup)...)
 		return builder(ops[0], ops[1:]...), nil
 	}
 
diff --git a/pkg/composableschemadsl/lexer/lex_def.go b/pkg/composableschemadsl/lexer/lex_def.go
@@ -267,15 +267,16 @@ func lexStringLiteral(l *Lexer) stateFn {
 	allowNewlines := false
 	terminator := ""
 
-	if l.acceptString(`"""`) {
+	switch {
+	case l.acceptString(`"""`):
 		terminator = `"""`
 		allowNewlines = true
-	} else if l.acceptString(`'''`) {
+	case l.acceptString(`'''`):
 		terminator = `"""`
 		allowNewlines = true
-	} else if l.acceptString(`"`) {
+	case l.acceptString(`"`):
 		terminator = `"`
-	} else if l.acceptString(`'`) {
+	case l.acceptString(`'`):
 		terminator = `'`
 	}
 
diff --git a/pkg/schema/type_check.go b/pkg/schema/type_check.go
@@ -63,9 +63,10 @@ func (ts *TypeSystem) getTypesForRelationInternal(ctx context.Context, defName s
 func (ts *TypeSystem) getTypesForInfo(ctx context.Context, rel *corev1.TypeInformation, seen *mapz.Set[string], nonTerminals *mapz.Set[string]) (*mapz.Set[string], error) {
 	out := mapz.NewSet[string]()
 	for _, dr := range rel.GetAllowedDirectRelations() {
-		if dr.GetRelation() == ellipsesRelation {
+		switch {
+		case dr.GetRelation() == ellipsesRelation:
 			out.Add(dr.GetNamespace())
-		} else if dr.GetRelation() != "" {
+		case dr.GetRelation() != "":
 			if nonTerminals != nil {
 				nonTerminals.Add(fmt.Sprintf("%s#%s", dr.GetNamespace(), dr.GetRelation()))
 			}
@@ -77,7 +78,7 @@ func (ts *TypeSystem) getTypesForInfo(ctx context.Context, rel *corev1.TypeInfor
 				continue
 			}
 			out.Merge(rest)
-		} else {
+		default:
 			// It's a wildcard, so all things of that type count
 			out.Add(dr.GetNamespace())
 		}
diff --git a/pkg/schemadsl/compiler/translator.go b/pkg/schemadsl/compiler/translator.go
@@ -503,9 +503,9 @@ func translateExpressionDirect(tctx *translationContext, expressionNode *dslNode
 		if err != nil {
 			return nil, err
 		}
-		leftOps := collapseOps(leftOperation, lookup)
-		rightOps := collapseOps(rightOperation, lookup)
-		ops := append(leftOps, rightOps...)
+		var ops []*core.SetOperation_Child
+		ops = append(ops, collapseOps(leftOperation, lookup)...)
+		ops = append(ops, collapseOps(rightOperation, lookup)...)
 		return builder(ops[0], ops[1:]...), nil
 	}
 
diff --git a/pkg/schemadsl/generator/generator_impl.go b/pkg/schemadsl/generator/generator_impl.go
@@ -29,12 +29,12 @@ func (sg *sourceGenerator) ensureBlankLineOrNewScope() {
 
 // indent increases the current indentation.
 func (sg *sourceGenerator) indent() {
-	sg.indentationLevel = sg.indentationLevel + 1
+	sg.indentationLevel++
 }
 
 // dedent decreases the current indentation.
 func (sg *sourceGenerator) dedent() {
-	sg.indentationLevel = sg.indentationLevel - 1
+	sg.indentationLevel--
 }
 
 // appendIssue adds an issue found in generation.
diff --git a/pkg/schemadsl/lexer/lex_def.go b/pkg/schemadsl/lexer/lex_def.go
@@ -251,15 +251,16 @@ func lexStringLiteral(l *Lexer) stateFn {
 	allowNewlines := false
 	terminator := ""
 
-	if l.acceptString(`"""`) {
+	switch {
+	case l.acceptString(`"""`):
 		terminator = `"""`
 		allowNewlines = true
-	} else if l.acceptString(`'''`) {
+	case l.acceptString(`'''`):
 		terminator = `"""`
 		allowNewlines = true
-	} else if l.acceptString(`"`) {
+	case l.acceptString(`"`):
 		terminator = `"`
-	} else if l.acceptString(`'`) {
+	case l.acceptString(`'`):
 		terminator = `'`
 	}
 
diff --git a/pkg/secrets/secrets_test.go b/pkg/secrets/secrets_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 var tests = []uint8{
@@ -14,7 +15,7 @@ func TestTokenBytes(t *testing.T) {
 	assert := assert.New(t)
 	for _, nbytes := range tests {
 		res, err := TokenBytes(nbytes)
-		assert.NoError(err)
+		require.NoError(t, err)
 		assert.Len(res, int(nbytes))
 	}
 }
@@ -23,7 +24,7 @@ func TestTokenHex(t *testing.T) {
 	assert := assert.New(t)
 	for _, nbytes := range tests {
 		res, err := TokenHex(nbytes)
-		assert.NoError(err)
+		require.NoError(t, err)
 		assert.Len(res, int(nbytes)*2)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,7 @@ func (Uint64Codec) PlanEncode(_ *pgtype.Map, _ uint32, format int16, value any)`
`71`	`71`	`return encodePlanUint64CodecBinaryUint64Valuer{}`
`72`	`72`	`}`
`73`	`73`	`case pgtype.TextFormatCode:`
`74`		`- switch value.(type) { //nolint:gocritic`
`75`		`- case uint64:`
	`74`	`+ if _, ok := value.(uint64); ok {`
`76`	`75`	`return encodePlanUint64CodecTextUint64{}`
`77`	`76`	`}`
`78`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -514,9 +514,9 @@ func translateExpressionDirect(tctx translationContext, expressionNode dslNode`
`514`	`514`	`if err != nil {`
`515`	`515`	`return nil, err`
`516`	`516`	`}`
`517`		`- leftOps := collapseOps(leftOperation, lookup)`
`518`		`- rightOps := collapseOps(rightOperation, lookup)`
`519`		`- ops := append(leftOps, rightOps...)`
	`517`	`+ var ops []*core.SetOperation_Child`
	`518`	`+ ops = append(ops, collapseOps(leftOperation, lookup)...)`
	`519`	`+ ops = append(ops, collapseOps(rightOperation, lookup)...)`
`520`	`520`	`return builder(ops[0], ops[1:]...), nil`
`521`	`521`	`}`
`522`	`522`
Original file line number	Diff line number	Diff line change
`@@ -503,9 +503,9 @@ func translateExpressionDirect(tctx translationContext, expressionNode dslNode`
`503`	`503`	`if err != nil {`
`504`	`504`	`return nil, err`
`505`	`505`	`}`
`506`		`- leftOps := collapseOps(leftOperation, lookup)`
`507`		`- rightOps := collapseOps(rightOperation, lookup)`
`508`		`- ops := append(leftOps, rightOps...)`
	`506`	`+ var ops []*core.SetOperation_Child`
	`507`	`+ ops = append(ops, collapseOps(leftOperation, lookup)...)`
	`508`	`+ ops = append(ops, collapseOps(rightOperation, lookup)...)`
`509`	`509`	`return builder(ops[0], ops[1:]...), nil`
`510`	`510`	`}`
`511`	`511`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,12 @@ func (sg *sourceGenerator) ensureBlankLineOrNewScope() {`
`29`	`29`
`30`	`30`	`// indent increases the current indentation.`
`31`	`31`	`func (sg *sourceGenerator) indent() {`
`32`		`- sg.indentationLevel = sg.indentationLevel + 1`
	`32`	`+ sg.indentationLevel++`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`// dedent decreases the current indentation.`
`36`	`36`	`func (sg *sourceGenerator) dedent() {`
`37`		`- sg.indentationLevel = sg.indentationLevel - 1`
	`37`	`+ sg.indentationLevel--`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// appendIssue adds an issue found in generation.`