Simplify casts in development package

authzed · Sep 11, 2024 · c8150ef · c8150ef
1 parent 31d4af3
commit c8150ef
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 58 deletions.
diff --git a/pkg/development/assertions.go b/pkg/development/assertions.go
@@ -8,7 +8,6 @@ import (
 
 	devinterface "github.com/authzed/spicedb/pkg/proto/developer/v1"
 	v1 "github.com/authzed/spicedb/pkg/proto/dispatch/v1"
-	"github.com/authzed/spicedb/pkg/spiceerrors"
 	"github.com/authzed/spicedb/pkg/tuple"
 	"github.com/authzed/spicedb/pkg/validationfile/blocks"
 )
@@ -44,14 +43,9 @@ func runAssertions(devContext *DevContext, assertions []blocks.Assertion, expect
 	for _, assertion := range assertions {
 		tpl := tuple.MustFromRelationship[*v1t.ObjectReference, *v1t.SubjectReference, *v1t.ContextualizedCaveat](assertion.Relationship)
 
-		lineNumber, err := safecast.ToUint32(assertion.SourcePosition.LineNumber)
-		if err != nil {
-			return nil, spiceerrors.MustBugf("Line number could not be cast to uint32")
-		}
-		columnPosition, err := safecast.ToUint32(assertion.SourcePosition.ColumnPosition)
-		if err != nil {
-			return nil, spiceerrors.MustBugf("Column position could not be cast to uint32")
-		}
+		// NOTE: zeroes are fine here to mean "unknown"
+		lineNumber, _ := safecast.ToUint32(assertion.SourcePosition.LineNumber)
+		columnPosition, _ := safecast.ToUint32(assertion.SourcePosition.ColumnPosition)
 
 		if tpl.Caveat != nil {
 			failures = append(failures, &devinterface.DeveloperError{

diff --git a/pkg/development/devcontext.go b/pkg/development/devcontext.go
@@ -245,14 +245,9 @@ func loadCompiled(
 
 		errWithSource, ok := spiceerrors.AsErrorWithSource(cverr)
 		if ok {
-			lineNumber, err := safecast.ToUint32(errWithSource.LineNumber)
-			if err != nil {
-				return nil, spiceerrors.MustBugf("Could not cast line number to uint32")
-			}
-			columnPosition, err := safecast.ToUint32(errWithSource.ColumnPosition)
-			if err != nil {
-				return nil, spiceerrors.MustBugf("Could not cast column position to uint32")
-			}
+			// NOTE: zeroes are fine here to mean "unknown"
+			lineNumber, _ := safecast.ToUint32(errWithSource.LineNumber)
+			columnPosition, _ := safecast.ToUint32(errWithSource.ColumnPosition)
 			errors = append(errors, &devinterface.DeveloperError{
 				Message: cverr.Error(),
 				Kind:    devinterface.DeveloperError_SCHEMA_ISSUE,
@@ -275,14 +270,9 @@ func loadCompiled(
 		ts, terr := typesystem.NewNamespaceTypeSystem(nsDef, resolver)
 		if terr != nil {
 			errWithSource, ok := spiceerrors.AsErrorWithSource(terr)
-			lineNumber, err := safecast.ToUint32(errWithSource.LineNumber)
-			if err != nil {
-				return nil, spiceerrors.MustBugf("could not cast line number to uint32")
-			}
-			columnPosition, err := safecast.ToUint32(errWithSource.ColumnPosition)
-			if err != nil {
-				return nil, spiceerrors.MustBugf("could not cast column position to uint32")
-			}
+			// NOTE: zeroes are fine here to mean "unknown"
+			lineNumber, _ := safecast.ToUint32(errWithSource.LineNumber)
+			columnPosition, _ := safecast.ToUint32(errWithSource.ColumnPosition)
 			if ok {
 				errors = append(errors, &devinterface.DeveloperError{
 					Message: terr.Error(),
@@ -314,14 +304,9 @@ func loadCompiled(
 
 		errWithSource, ok := spiceerrors.AsErrorWithSource(tverr)
 		if ok {
-			lineNumber, err := safecast.ToUint32(errWithSource.LineNumber)
-			if err != nil {
-				return nil, spiceerrors.MustBugf("could not cast line number to uint32")
-			}
-			columnPosition, err := safecast.ToUint32(errWithSource.ColumnPosition)
-			if err != nil {
-				return nil, spiceerrors.MustBugf("could not cast column position to uint32")
-			}
+			// NOTE: zeroes are fine here to mean "unknown"
+			lineNumber, _ := safecast.ToUint32(errWithSource.LineNumber)
+			columnPosition, _ := safecast.ToUint32(errWithSource.ColumnPosition)
 			errors = append(errors, &devinterface.DeveloperError{
 				Message: tverr.Error(),
 				Kind:    devinterface.DeveloperError_SCHEMA_ISSUE,

diff --git a/pkg/development/resolver.go b/pkg/development/resolver.go
@@ -13,7 +13,6 @@ import (
 	"github.com/authzed/spicedb/pkg/schemadsl/dslshape"
 	"github.com/authzed/spicedb/pkg/schemadsl/generator"
 	"github.com/authzed/spicedb/pkg/schemadsl/input"
-	"github.com/authzed/spicedb/pkg/spiceerrors"
 	"github.com/authzed/spicedb/pkg/typesystem"
 )
 
@@ -94,14 +93,9 @@ func (r *Resolver) ReferenceAtPosition(source input.Source, position input.Posit
 	}
 
 	relationReference := func(relation *core.Relation, ts *typesystem.TypeSystem) (*SchemaReference, error) {
-		lineNumber, err := safecast.ToInt(relation.SourcePosition.ZeroIndexedLineNumber)
-		if err != nil {
-			return nil, spiceerrors.MustBugf("could not cast line number to int")
-		}
-		columnPosition, err := safecast.ToInt(relation.SourcePosition.ZeroIndexedColumnPosition)
-		if err != nil {
-			return nil, spiceerrors.MustBugf("could not cast column positiion to int")
-		}
+		// NOTE: zeroes are fine here to mean "unknown"
+		lineNumber, _ := safecast.ToInt(relation.SourcePosition.ZeroIndexedLineNumber)
+		columnPosition, _ := safecast.ToInt(relation.SourcePosition.ZeroIndexedColumnPosition)
 		relationPosition := input.Position{
 			LineNumber:     lineNumber,
 			ColumnPosition: columnPosition,
@@ -151,14 +145,9 @@ func (r *Resolver) ReferenceAtPosition(source input.Source, position input.Posit
 
 		def := ts.Namespace()
 
-		lineNumber, err := safecast.ToInt(def.SourcePosition.ZeroIndexedLineNumber)
-		if err != nil {
-			return nil, spiceerrors.MustBugf("Could not cast line number to int")
-		}
-		columnPosition, err := safecast.ToInt(def.SourcePosition.ZeroIndexedColumnPosition)
-		if err != nil {
-			return nil, spiceerrors.MustBugf("Could not cast column position to int")
-		}
+		// NOTE: zeroes are fine here to mean "unknown"
+		lineNumber, _ := safecast.ToInt(relation.SourcePosition.ZeroIndexedLineNumber)
+		columnPosition, _ := safecast.ToInt(relation.SourcePosition.ZeroIndexedColumnPosition)
 
 		defPosition := input.Position{
 			LineNumber:     lineNumber,
@@ -193,14 +182,9 @@ func (r *Resolver) ReferenceAtPosition(source input.Source, position input.Posit
 
 	// Caveat Type reference.
 	if caveatDef, ok := r.caveatTypeReferenceChain(nodeChain); ok {
-		lineNumber, err := safecast.ToInt(caveatDef.SourcePosition.ZeroIndexedLineNumber)
-		if err != nil {
-			return nil, spiceerrors.MustBugf("Could not cast line number to int")
-		}
-		columnPosition, err := safecast.ToInt(caveatDef.SourcePosition.ZeroIndexedColumnPosition)
-		if err != nil {
-			return nil, spiceerrors.MustBugf("Could not cast column position to int")
-		}
+		// NOTE: zeroes are fine here to mean "unknown"
+		lineNumber, _ := safecast.ToInt(caveatDef.SourcePosition.ZeroIndexedLineNumber)
+		columnPosition, _ := safecast.ToInt(caveatDef.SourcePosition.ZeroIndexedColumnPosition)
 
 		defPosition := input.Position{
 			LineNumber:     lineNumber,