Finalize import

cmds/core-service/main.go

@@ -65,7 +65,7 @@ const (
 	codeRetryable = stacktrace.ErrorCode(1)
 )
 
-func getDBStats(ctx context.Context, db *cockroach.DB, databaseName string) {
+func getDBStats(ctx context.Context, db *datastore.Datastore, databaseName string) {
 	logger := logging.WithValuesFromContext(ctx, logging.Logger)
 	statsPtr := db.Pool.Stat()
 	stats := make(map[string]string)
@@ -109,7 +109,7 @@ func createKeyResolver() (auth.KeyResolver, error) {
 func createRIDServers(ctx context.Context, locality string, logger *zap.Logger) (*rid_v1.Server, *rid_v2.Server, error) {
 	connectParameters := flags.ConnectParameters()
 	connectParameters.DBName = "rid"
-	ridCrdb, err := cockroach.Dial(ctx, connectParameters)
+	ridCrdb, err := datastore.Dial(ctx, connectParameters)
 	if err != nil {
 		// TODO: More robustly detect failure to create RID server is due to a problem that may be temporary
 		if strings.Contains(err.Error(), "connect: connection refused") {
@@ -123,7 +123,7 @@ func createRIDServers(ctx context.Context, locality string, logger *zap.Logger)
 		// try DBName of defaultdb for older versions.
 		ridCrdb.Pool.Close()
 		connectParameters.DBName = "defaultdb"
-		ridCrdb, err := cockroach.Dial(ctx, connectParameters)
+		ridCrdb, err := datastore.Dial(ctx, connectParameters)
 		if err != nil {
 			return nil, nil, stacktrace.Propagate(err, "Failed to connect to remote ID database for older version <defaultdb>; verify your database configuration is current with https://github.com/interuss/dss/tree/master/build#upgrading-database-schemas")
 		}
@@ -176,7 +176,7 @@ func createRIDServers(ctx context.Context, locality string, logger *zap.Logger)
 func createSCDServer(ctx context.Context, logger *zap.Logger) (*scd.Server, error) {
 	connectParameters := flags.ConnectParameters()
 	connectParameters.DBName = scdc.DatabaseName
-	scdCrdb, err := cockroach.Dial(ctx, connectParameters)
+	scdCrdb, err := datastore.Dial(ctx, connectParameters)
 	if err != nil {
 		return nil, stacktrace.Propagate(err, "Failed to connect to strategic conflict detection database; verify your database configuration is current with https://github.com/interuss/dss/tree/master/build#upgrading-database-schemas")
 	}

cmds/db-manager/cleanup/evict.go

@@ -102,7 +102,7 @@ func getSCDStore(ctx context.Context) (*scdc.Store, error) {
 	connectParameters := crdbflags.ConnectParameters()
 	connectParameters.ApplicationName = "db-manager"
 	connectParameters.DBName = scdc.DatabaseName
-	scdCrdb, err := cockroach.Dial(ctx, connectParameters)
+	scdCrdb, err := datastore.Dial(ctx, connectParameters)
 	if err != nil {
 		logParams := connectParameters
 		logParams.Credentials.Password = "[REDACTED]"

pkg/rid/store/cockroach/store.go

@@ -50,7 +50,7 @@ type repo struct {
 // TODO: Add the SCD interfaces here, and collapse this store with the
 // outer pkg/cockroach
 type Store struct {
-	db      *cockroach.DB
+	db      *datastore.Datastore
 	logger  *zap.Logger
 	clock   clockwork.Clock
 	version *semver.Version
@@ -60,8 +60,8 @@ type Store struct {
 }
 
 // NewStore returns a Store instance connected to a cockroach instance via db.
-func NewStore(ctx context.Context, db *cockroach.DB, dbName string, logger *zap.Logger) (*Store, error) {
-	vs, err := db.GetVersion(ctx, dbName)
+func NewStore(ctx context.Context, db *datastore.Datastore, dbName string, logger *zap.Logger) (*Store, error) {
+	vs, err := db.GetSchemaVersion(ctx, dbName)
 	if err != nil {
 		return nil, stacktrace.Propagate(err, "Failed to get database schema version for remote ID for db : %s", dbName)
 	}
@@ -87,7 +87,7 @@ func (s *Store) CheckCurrentMajorSchemaVersion(ctx context.Context) error {
 	if err != nil {
 		return stacktrace.Propagate(err, "Failed to get database schema version for remote ID")
 	}
-	if vs == cockroach.UnknownVersion {
+	if vs == datastore.UnknownVersion {
 		return stacktrace.NewError("Remote ID database has not been bootstrapped with Schema Manager, Please check https://github.com/interuss/dss/tree/master/build#updgrading-database-schemas")
 	}
 
@@ -169,7 +169,7 @@ func (s *Store) CleanUp(ctx context.Context) error {
 // If the DB was is not bootstrapped using the schema manager we throw and error
 func (s *Store) GetVersion(ctx context.Context) (*semver.Version, error) {
 	if s.version == nil {
-		vs, err := s.db.GetVersion(ctx, s.DatabaseName)
+		vs, err := s.db.GetSchemaVersion(ctx, s.DatabaseName)
 		if err != nil {
 			return nil, stacktrace.Propagate(err, "Failed to get database schema version for remote ID")
 		}

pkg/scd/store/cockroach/store.go

@@ -38,12 +38,12 @@ type repo struct {
 // Store is an implementation of an scd.Store using
 // a CockroachDB database.
 type Store struct {
-	db    *cockroach.DB
+	db    *datastore.Datastore
 	clock clockwork.Clock
 }
 
 // NewStore returns a Store instance connected to a cockroach instance via db.
-func NewStore(ctx context.Context, db *cockroach.DB) (*Store, error) {
+func NewStore(ctx context.Context, db *datastore.Datastore) (*Store, error) {
 	store := &Store{
 		db:    db,
 		clock: DefaultClock,
@@ -62,7 +62,7 @@ func (s *Store) CheckCurrentMajorSchemaVersion(ctx context.Context) error {
 	if err != nil {
 		return stacktrace.Propagate(err, "Failed to get database schema version for strategic conflict detection")
 	}
-	if vs == cockroach.UnknownVersion {
+	if vs == datastore.UnknownVersion {
 		return stacktrace.NewError("Strategic conflict detection database has not been bootstrapped with Schema Manager, Please check https://github.com/interuss/dss/tree/master/build#upgrading-database-schemas")
 	}
 
@@ -101,5 +101,5 @@ func (s *Store) Close() error {
 // GetVersion returns the Version string for the Database.
 // If the DB was is not bootstrapped using the schema manager we throw and error
 func (s *Store) GetVersion(ctx context.Context) (*semver.Version, error) {
-	return s.db.GetVersion(ctx, DatabaseName)
+	return s.db.GetSchemaVersion(ctx, DatabaseName)
 }