From d5b59bfb0bb5be5f623a1f9de1b8076149f20ac2 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 27 Jul 2021 16:50:09 +0100 Subject: [PATCH] Linting --- userapi/internal/api.go | 2 +- userapi/storage/accounts/postgres/key_backup_table.go | 5 +++-- .../storage/accounts/postgres/key_backup_version_table.go | 1 + userapi/storage/accounts/postgres/storage.go | 2 +- userapi/storage/accounts/sqlite3/key_backup_table.go | 5 +++-- userapi/storage/accounts/sqlite3/key_backup_version_table.go | 1 + userapi/storage/accounts/sqlite3/storage.go | 1 + 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/userapi/internal/api.go b/userapi/internal/api.go index fd0e3923e..27e179636 100644 --- a/userapi/internal/api.go +++ b/userapi/internal/api.go @@ -490,7 +490,7 @@ func (a *UserInternalAPI) uploadBackupKeys(ctx context.Context, req *api.Perform return } if deleted { - res.Error = fmt.Sprintf("backup was deleted") + res.Error = "backup was deleted" return } res.Exists = true diff --git a/userapi/storage/accounts/postgres/key_backup_table.go b/userapi/storage/accounts/postgres/key_backup_table.go index 154da7a62..0dc5879b6 100644 --- a/userapi/storage/accounts/postgres/key_backup_table.go +++ b/userapi/storage/accounts/postgres/key_backup_table.go @@ -44,7 +44,7 @@ const insertBackupKeySQL = "" + const updateBackupKeySQL = "" + "UPDATE account_e2e_room_keys SET first_message_index=$1, forwarded_count=$2, is_verified=$3, session_data=$4 " + - "WHERE user_id=$5 AND room_id=$6 AND session_id=$7" + "WHERE user_id=$5 AND room_id=$6 AND session_id=$7 AND version=$8" const countKeysSQL = "" + "SELECT COUNT(*) FROM account_e2e_room_keys WHERE user_id = $1 AND version = $2" @@ -60,6 +60,7 @@ type keyBackupStatements struct { selectKeysStmt *sql.Stmt } +// nolint:unused func (s *keyBackupStatements) prepare(db *sql.DB) (err error) { _, err = db.Exec(keyBackupTableSchema) if err != nil { @@ -100,7 +101,7 @@ func (s *keyBackupStatements) updateBackupKey( ctx context.Context, txn *sql.Tx, userID, version string, key api.InternalKeyBackupSession, ) (err error) { _, err = txn.Stmt(s.updateBackupKeyStmt).ExecContext( - ctx, key.FirstMessageIndex, key.ForwardedCount, key.IsVerified, string(key.SessionData), userID, key.RoomID, key.SessionID, + ctx, key.FirstMessageIndex, key.ForwardedCount, key.IsVerified, string(key.SessionData), userID, key.RoomID, key.SessionID, version, ) return } diff --git a/userapi/storage/accounts/postgres/key_backup_version_table.go b/userapi/storage/accounts/postgres/key_backup_version_table.go index aca575df2..323a842df 100644 --- a/userapi/storage/accounts/postgres/key_backup_version_table.go +++ b/userapi/storage/accounts/postgres/key_backup_version_table.go @@ -67,6 +67,7 @@ type keyBackupVersionStatements struct { updateKeyBackupETagStmt *sql.Stmt } +// nolint:unused func (s *keyBackupVersionStatements) prepare(db *sql.DB) (err error) { _, err = db.Exec(keyBackupVersionTableSchema) if err != nil { diff --git a/userapi/storage/accounts/postgres/storage.go b/userapi/storage/accounts/postgres/storage.go index 9cf4bf1e7..b07218b29 100644 --- a/userapi/storage/accounts/postgres/storage.go +++ b/userapi/storage/accounts/postgres/storage.go @@ -418,6 +418,7 @@ func (d *Database) GetKeyBackup( return } +// nolint:nakedret func (d *Database) UpsertBackupKeys( ctx context.Context, version, userID string, uploads []api.InternalKeyBackupSession, ) (count int64, etag string, err error) { @@ -484,7 +485,6 @@ func (d *Database) UpsertBackupKeys( } else { etag = oldETag } - return nil }) return diff --git a/userapi/storage/accounts/sqlite3/key_backup_table.go b/userapi/storage/accounts/sqlite3/key_backup_table.go index 3bdcd82d8..268bda936 100644 --- a/userapi/storage/accounts/sqlite3/key_backup_table.go +++ b/userapi/storage/accounts/sqlite3/key_backup_table.go @@ -44,7 +44,7 @@ const insertBackupKeySQL = "" + const updateBackupKeySQL = "" + "UPDATE account_e2e_room_keys SET first_message_index=$1, forwarded_count=$2, is_verified=$3, session_data=$4 " + - "WHERE user_id=$5 AND room_id=$6 AND session_id=$7" + "WHERE user_id=$5 AND room_id=$6 AND session_id=$7 AND version=$8" const countKeysSQL = "" + "SELECT COUNT(*) FROM account_e2e_room_keys WHERE user_id = $1 AND version = $2" @@ -60,6 +60,7 @@ type keyBackupStatements struct { selectKeysStmt *sql.Stmt } +// nolint:unused func (s *keyBackupStatements) prepare(db *sql.DB) (err error) { _, err = db.Exec(keyBackupTableSchema) if err != nil { @@ -100,7 +101,7 @@ func (s *keyBackupStatements) updateBackupKey( ctx context.Context, txn *sql.Tx, userID, version string, key api.InternalKeyBackupSession, ) (err error) { _, err = txn.Stmt(s.updateBackupKeyStmt).ExecContext( - ctx, key.FirstMessageIndex, key.ForwardedCount, key.IsVerified, string(key.SessionData), userID, key.RoomID, key.SessionID, + ctx, key.FirstMessageIndex, key.ForwardedCount, key.IsVerified, string(key.SessionData), userID, key.RoomID, key.SessionID, version, ) return } diff --git a/userapi/storage/accounts/sqlite3/key_backup_version_table.go b/userapi/storage/accounts/sqlite3/key_backup_version_table.go index 9a58fee75..72e9b132e 100644 --- a/userapi/storage/accounts/sqlite3/key_backup_version_table.go +++ b/userapi/storage/accounts/sqlite3/key_backup_version_table.go @@ -65,6 +65,7 @@ type keyBackupVersionStatements struct { updateKeyBackupETagStmt *sql.Stmt } +// nolint:unused func (s *keyBackupVersionStatements) prepare(db *sql.DB) (err error) { _, err = db.Exec(keyBackupVersionTableSchema) if err != nil { diff --git a/userapi/storage/accounts/sqlite3/storage.go b/userapi/storage/accounts/sqlite3/storage.go index 80e38f003..4fae621fa 100644 --- a/userapi/storage/accounts/sqlite3/storage.go +++ b/userapi/storage/accounts/sqlite3/storage.go @@ -459,6 +459,7 @@ func (d *Database) GetKeyBackup( return } +// nolint:nakedret func (d *Database) UpsertBackupKeys( ctx context.Context, version, userID string, uploads []api.InternalKeyBackupSession, ) (count int64, etag string, err error) {