Merge pull request #1752 from ecordell/phase-spanner-change

spanner: allow spicedb to run with head or head-1 migration
authzed · Feb 21, 2024 · 40d6692 · 40d6692
2 parents 380da03 + aeba01d
commit 40d6692
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 2 deletions.
diff --git a/internal/datastore/spanner/spanner.go b/internal/datastore/spanner/spanner.go
@@ -259,8 +259,8 @@ func (sd spannerDatastore) ReadyState(ctx context.Context) (datastore.ReadyState
 		return datastore.ReadyState{}, err
 	}
 
-	// TODO(jschorr): Remove register-tuple-change-stream once the multi-phase is done.
-	if version == headMigration || version == "register-tuple-change-stream" {
+	// TODO: once phased migration is complete, remove the extra allowed version
+	if version == headMigration || version == "register-combined-change-stream" {
 		return datastore.ReadyState{IsReady: true}, nil
 	}