v1alpha1: re-expose revision hashing functions for downstream software

authzed · Oct 24, 2022 · f1bbcfd · f1bbcfd
1 parent 7b8b67a
commit f1bbcfd
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/internal/services/v1alpha1/schema.go b/internal/services/v1alpha1/schema.go
@@ -17,6 +17,7 @@ import (
 	"github.com/authzed/spicedb/internal/services/shared"
 	"github.com/authzed/spicedb/internal/sharederrors"
 	"github.com/authzed/spicedb/pkg/datastore"
+	revisions "github.com/authzed/spicedb/pkg/namespace/v1alpha1"
 	core "github.com/authzed/spicedb/pkg/proto/core/v1"
 	dispatchv1 "github.com/authzed/spicedb/pkg/proto/dispatch/v1"
 	"github.com/authzed/spicedb/pkg/schemadsl/compiler"
@@ -82,7 +83,7 @@ func (ss *schemaServiceServer) ReadSchema(ctx context.Context, in *v1alpha1.Read
 		DispatchCount: uint32(numRequested),
 	})
 
-	computedRevision, err := ComputeV1Alpha1Revision(createdRevisions)
+	computedRevision, err := revisions.ComputeV1Alpha1Revision(createdRevisions)
 	if err != nil {
 		return nil, rewriteError(ctx, err)
 	}
@@ -169,7 +170,7 @@ func (ss *schemaServiceServer) WriteSchema(ctx context.Context, in *v1alpha1.Wri
 		// If a precondition was given, decode it, and verify that none of the namespaces specified
 		// have changed in any way.
 		if in.OptionalDefinitionsRevisionPrecondition != "" {
-			decoded, err := DecodeV1Alpha1Revision(in.OptionalDefinitionsRevisionPrecondition, ds)
+			decoded, err := revisions.DecodeV1Alpha1Revision(in.OptionalDefinitionsRevisionPrecondition, ds)
 			if err != nil {
 				return err
 			}
@@ -207,14 +208,14 @@ func (ss *schemaServiceServer) WriteSchema(ctx context.Context, in *v1alpha1.Wri
 		return nil, rewriteError(ctx, err)
 	}
 
-	revisions := make(map[string]datastore.Revision, len(nsdefs))
+	revs := make(map[string]datastore.Revision, len(nsdefs))
 	names := make([]string, 0, len(nsdefs))
 	for _, nsdef := range nsdefs {
 		names = append(names, nsdef.Name)
-		revisions[nsdef.Name] = revision
+		revs[nsdef.Name] = revision
 	}
 
-	computedRevision, err := ComputeV1Alpha1Revision(revisions)
+	computedRevision, err := revisions.ComputeV1Alpha1Revision(revs)
 	if err != nil {
 		return nil, rewriteError(ctx, err)
 	}

diff --git a/internal/services/v1alpha1/schema_test.go b/internal/services/v1alpha1/schema_test.go
@@ -11,10 +11,10 @@ import (
 	"google.golang.org/grpc/codes"
 
 	"github.com/authzed/spicedb/internal/datastore/memdb"
-	revisions "github.com/authzed/spicedb/internal/services/v1alpha1"
 	"github.com/authzed/spicedb/internal/testfixtures"
 	"github.com/authzed/spicedb/internal/testserver"
 	"github.com/authzed/spicedb/pkg/datastore"
+	revisions "github.com/authzed/spicedb/pkg/namespace/v1alpha1"
 	"github.com/authzed/spicedb/pkg/spiceerrors"
 	"github.com/authzed/spicedb/pkg/tuple"
 )

diff --git a/...vices/v1alpha1/v1alpha1revision_hasher.go → ...space/v1alpha1/v1alpha1revision_hasher.go b/...vices/v1alpha1/v1alpha1revision_hasher.go → ...space/v1alpha1/v1alpha1revision_hasher.go
diff --git a/.../v1alpha1/v1alpha1revision_hasher_test.go → .../v1alpha1/v1alpha1revision_hasher_test.go b/.../v1alpha1/v1alpha1revision_hasher_test.go → .../v1alpha1/v1alpha1revision_hasher_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/shopspring/decimal"
 	"github.com/stretchr/testify/require"
 
-	rev "github.com/authzed/spicedb/internal/services/v1alpha1"
 	"github.com/authzed/spicedb/pkg/datastore"
 	"github.com/authzed/spicedb/pkg/datastore/revision"
+	rev "github.com/authzed/spicedb/pkg/namespace/v1alpha1"
 )
 
 func TestHashingSame(t *testing.T) {

diff --git a/...ervices/v1alpha1/v1alpha1revision_test.go → ...mespace/v1alpha1/v1alpha1revision_test.go b/...ervices/v1alpha1/v1alpha1revision_test.go → ...mespace/v1alpha1/v1alpha1revision_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/shopspring/decimal"
 	"github.com/stretchr/testify/require"
 
-	rev "github.com/authzed/spicedb/internal/services/v1alpha1"
 	"github.com/authzed/spicedb/pkg/datastore"
 	"github.com/authzed/spicedb/pkg/datastore/revision"
+	rev "github.com/authzed/spicedb/pkg/namespace/v1alpha1"
 )
 
 var decoder revision.DecimalDecoder

diff --git a/...rnal/services/v1alpha1/v1alpharevision.go → pkg/namespace/v1alpha1/v1alpharevision.go b/...rnal/services/v1alpha1/v1alpharevision.go → pkg/namespace/v1alpha1/v1alpharevision.go