mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-01 10:09:41 -06:00
Code Issues Packages Projects Releases 139 Wiki Activity

Disable the ability to create a database on push

Browse Source 
Also add two tests for branch deletion
This commit is contained in:
Neil Macneale IV
2023-12-19 15:06:17 -08:00
parent cdda728693
commit b19a00136f
4 changed files with 105 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go/libraries/doltcore/remotesrv/server.go
View File

@@ -69,6 +69,10 @@ type ServerArgs struct {
// listeners. The scheme used in the URLs returned from the gRPC server
// will be https.
TLSConfig *tls.Config
// In the cluster context, we want to create the databases automatically when pushed to. Other contexts we want to
// error when the user pushes to a database that doesn't exist.
CreateUnknownDatabases bool
}
func NewServer(args ServerArgs) (*Server, error) {

1
go/libraries/doltcore/sqle/cluster/controller.go
View File

@@ -688,6 +688,7 @@ func (c *Controller) RemoteSrvServerArgs(ctxFactory func(context.Context) (*sql.
if err != nil {
return remotesrv.ServerArgs{}, err
}
args.CreateUnknownDatabases = true
args.DBCache = remotesrvStoreCache{args.DBCache, c}
c.remoteSrvDBCache = args.DBCache

5
go/libraries/doltcore/sqle/remotesrv.go
View File

@@ -28,6 +28,7 @@ import (
type remotesrvStore struct {
ctxFactory func(context.Context) (*sql.Context, error)
readonly bool
createDBs bool
}
var _ remotesrv.DBCache = remotesrvStore{}
@@ -40,7 +41,7 @@ func (s remotesrvStore) Get(ctx context.Context, path, nbfVerStr string) (remote
sess := dsess.DSessFromSess(sqlCtx.Session)
db, err := sess.Provider().Database(sqlCtx, path)
if err != nil {
if !s.readonly && sql.ErrDatabaseNotFound.Is(err) {
if !s.readonly && sql.ErrDatabaseNotFound.Is(err) && s.createDBs {
err = sess.Provider().CreateDatabase(sqlCtx, path)
if err != nil {
return nil, err
@@ -74,7 +75,7 @@ func RemoteSrvServerArgs(ctxFactory func(context.Context) (*sql.Context, error),
}
sess := dsess.DSessFromSess(sqlCtx.Session)
args.FS = sess.Provider().FileSystem()
args.DBCache = remotesrvStore{ctxFactory, args.ReadOnly}
args.DBCache = remotesrvStore{ctxFactory, args.ReadOnly, args.CreateUnknownDatabases}
return args, nil
}

97
integration-tests/bats/sql-server-remotesrv.bats
View File

@@ -535,3 +535,100 @@ GRANT CLONE_ADMIN ON *.* TO clone_admin_user@'localhost';
[[ "$status" -ne 0 ]] || false
[[ "$output" =~ "this server only provides read-only access" ]] || false
}
@test "sql-server-remotesrv: delete remote branch from remotesapi port as super user" {
mkdir remote
cd remote
dolt init
dolt sql -q 'create table names (name varchar(10) primary key);'
dolt sql -q 'insert into names (name) values ("abe"), ("betsy"), ("calvin");'
dolt add names
dolt commit -m 'initial names.'
dolt branch new_branch HEAD
APIPORT=$( definePORT )
export DOLT_REMOTE_PASSWORD="rootpass"
export SQL_USER="root"
start_sql_server_with_args -u "$SQL_USER" -p "$DOLT_REMOTE_PASSWORD" --remotesapi-port $APIPORT
cd ../
dolt clone http://localhost:$APIPORT/remote cloned_db -u $SQL_USER
cd cloned_db
run dolt push origin --user $SQL_USER :new_branch
[[ "$status" -eq 0 ]] || false
# TODO - verify output. Currently we always print "new branch"
# To https://doltremoteapi.dolthub.com/dolthub/macneale-remote-test
# * [new branch] HEAD -> main
# [[ "$output" =~ "[deleted] new_branch" ]] || false
cd ../remote
run dolt branch -a
! [[ "$output" =~ "new_branch" ]] || false
[[ "$output" =~ "main" ]] || false
}
@test "sql-server-remotesrv: delete remote dirty branch from remotesapi requires force" {
mkdir remote
cd remote
dolt init
dolt sql -q 'create table names (name varchar(10) primary key);'
dolt sql -q 'insert into names (name) values ("abe"), ("betsy"), ("calvin");'
dolt add names
dolt commit -m 'initial names.'
dolt checkout -b new_branch HEAD
dolt sql -q 'insert into names (name) values ("zeek");' # dirty the workspace
dolt checkout main
APIPORT=$(definePORT)
export DOLT_REMOTE_PASSWORD="rootpass"
export SQL_USER="root"
start_sql_server_with_args -u "$SQL_USER" -p "$DOLT_REMOTE_PASSWORD" --remotesapi-port $APIPORT
cd ../
dolt clone http://localhost:$APIPORT/remote cloned_db -u $SQL_USER
cd cloned_db
run dolt push origin --force --user $SQL_USER :new_branch
[[ "$status" -eq 0 ]] || false
# TODO - verify output. Currently we always print "new branch"
# To https://doltremoteapi.dolthub.com/dolthub/macneale-remote-test
# * [new branch] HEAD -> main
# [[ "$output" =~ "[deleted] new_branch" ]] || false
cd ../remote
run dolt branch -a
! [[ "$output" =~ "new_branch" ]] || false
[[ "$output" =~ "main" ]] || false
}
@test "sql-server-remotesrv: push to non-existent database fails" {
mkdir remote
cd remote
dolt init
dolt sql -q 'create table names (name varchar(10) primary key);'
dolt sql -q 'insert into names (name) values ("abe"), ("betsy"), ("calvin");'
dolt add names
dolt commit -m 'initial names.'
APIPORT=$(definePORT)
export DOLT_REMOTE_PASSWORD="rootpass"
export SQL_USER="root"
start_sql_server_with_args -u "$SQL_USER" -p "$DOLT_REMOTE_PASSWORD" --remotesapi-port $APIPORT
cd ../
dolt clone http://localhost:$APIPORT/remote cloned_db -u $SQL_USER
cd cloned_db
dolt remote add nodb http://localhost:$APIPORT/nodb
run dolt push nodb --user $SQL_USER main:new_branch
[[ "$status" -ne 0 ]] || false
[[ "$output" =~ "database not found: nodb" ]] || false # NM4
run dolt push --force nodb --user $SQL_USER main:new_branch
[[ "$status" -ne 0 ]] || false
[[ "$output" =~ "database not found: nodb" ]] || false # NM4
}