From 4a1c4c9c856a09d90e059988c4b94172681c5d41 Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Mon, 6 Jun 2016 12:53:34 -0700 Subject: [PATCH] Export rethinkdb table definitions Signed-off-by: Riyaz Faizullabhoy --- server/storage/rethinkdb.go | 4 ++-- server/storage/rethinkdb_models.go | 6 ++++-- signer/keydbstore/rethink_keydbstore.go | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/server/storage/rethinkdb.go b/server/storage/rethinkdb.go index 1d240d0c10..68c006820b 100644 --- a/server/storage/rethinkdb.go +++ b/server/storage/rethinkdb.go @@ -269,8 +269,8 @@ func (rdb RethinkDB) deleteByTSChecksum(tsChecksum string) error { // Bootstrap sets up the database and tables, also creating the notary server user with appropriate db permission func (rdb RethinkDB) Bootstrap() error { if err := rethinkdb.SetupDB(rdb.sess, rdb.dbName, []rethinkdb.Table{ - tufFiles, - keys, + TufFilesRethinkTable, + PubKeysRethinkTable, }); err != nil { return err } diff --git a/server/storage/rethinkdb_models.go b/server/storage/rethinkdb_models.go index 2bb9b7761e..18df08c127 100644 --- a/server/storage/rethinkdb_models.go +++ b/server/storage/rethinkdb_models.go @@ -12,7 +12,8 @@ const ( ) var ( - tufFiles = rethinkdb.Table{ + // TufFilesRethinkTable is the table definition of notary server's TUF metadata files + TufFilesRethinkTable = rethinkdb.Table{ Name: RDBTUFFile{}.TableName(), PrimaryKey: "gun_role_version", SecondaryIndexes: map[string][]string{ @@ -28,7 +29,8 @@ var ( }, } - keys = rethinkdb.Table{ + // PubKeysRethinkTable is the table definition of notary server's public key information for TUF roles + PubKeysRethinkTable = rethinkdb.Table{ Name: RDBKey{}.TableName(), PrimaryKey: "id", SecondaryIndexes: map[string][]string{ diff --git a/signer/keydbstore/rethink_keydbstore.go b/signer/keydbstore/rethink_keydbstore.go index ee32823c18..2c69fc69fe 100644 --- a/signer/keydbstore/rethink_keydbstore.go +++ b/signer/keydbstore/rethink_keydbstore.go @@ -39,7 +39,8 @@ type RDBPrivateKey struct { Private string `gorethink:"private"` } -var privateKeys = rethinkdb.Table{ +// PrivateKeysRethinkTable is the table definition for notary signer's key information +var PrivateKeysRethinkTable = rethinkdb.Table{ Name: RDBPrivateKey{}.TableName(), PrimaryKey: RDBPrivateKey{}.KeyID, } @@ -243,7 +244,7 @@ func (rdb RethinkDBKeyStore) ExportKey(keyID string) ([]byte, error) { // Bootstrap sets up the database and tables, also creating the notary signer user with appropriate db permission func (rdb RethinkDBKeyStore) Bootstrap() error { if err := rethinkdb.SetupDB(rdb.sess, rdb.dbName, []rethinkdb.Table{ - privateKeys, + PrivateKeysRethinkTable, }); err != nil { return err }