Page MenuHomePhabricator
Differential D13807

[backup-service] use `username` instead of `userID` when downloading backup
ClosedPublic
Actions

Authored by kamil on Oct 29 2024, 9:07 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 30, 11:32 PM
Unknown Object (File)
Sun, Mar 23, 1:02 PM
Unknown Object (File)
Sun, Mar 23, 1:01 PM
Unknown Object (File)
Sun, Mar 23, 1:00 PM
Unknown Object (File)
Mar 7 2025, 2:11 PM
Unknown Object (File)
Mar 7 2025, 2:11 PM
Unknown Object (File)
Mar 7 2025, 2:11 PM
Unknown Object (File)
Mar 7 2025, 2:11 PM
View All 83 Files
Subscribers
ashoat
tomek

Details

Reviewers
varun
bartek
Commits
rCOMMf10da684e155: [backup-service] use `username` instead of `userID` when downloading backup
Summary

ENG-6145.

Updating places where we had hardcoded userID

Depends on D13817

Test Plan

run commtest

Diff Detail

Repository
rCOMM Comm
Branch
backup-work
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

kamil created this revision.Oct 29 2024, 9:07 AM
kamil held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptOct 29 2024, 9:07 AM
kamil added a child revision: D13808: [backup-service][backup-client] rename `username` -> `user_identifier`.Oct 29 2024, 9:19 AM
Harbormaster failed remote builds in B32406: Diff 45428!Oct 29 2024, 9:44 AM
kamil updated this revision to Diff 45453.Oct 30 2024, 2:27 AM

CI

Harbormaster failed remote builds in B32426: Diff 45453!Oct 30 2024, 2:52 AM
kamil updated this revision to Diff 45454.Oct 30 2024, 2:59 AM

CI v2

Harbormaster completed remote builds in B32427: Diff 45454.Oct 30 2024, 3:16 AM
kamil updated this revision to Diff 45456.Oct 30 2024, 3:28 AM
kamil added a child revision: D13817: [docker-compose] configure Identity endpoint for backup in commtest.

rebase

kamil edited the summary of this revision. (Show Details)Oct 30 2024, 3:30 AM
kamil removed a child revision: D13817: [docker-compose] configure Identity endpoint for backup in commtest.
kamil edited parent revisions, added: D13817: [docker-compose] configure Identity endpoint for backup in commtest; removed: D13806: [backup-service] implement calling `FindUserID` RPC from Backup.
kamil edited the summary of this revision. (Show Details)
Harbormaster completed remote builds in B32429: Diff 45456.Oct 30 2024, 3:47 AM
kamil published this revision for review.Oct 30 2024, 9:28 AM
varun accepted this revision.Nov 1 2024, 2:14 PM
varun added inline comments.
services/commtest/tests/backup_integration_test.rs
78 ↗(On Diff #45456)
80 ↗(On Diff #45456)
83 ↗(On Diff #45456)
services/commtest/tests/backup_performance_test.rs
91 ↗(On Diff #45456)

just curious, what do we use this descriptor for?

This revision is now accepted and ready to land.Nov 1 2024, 2:14 PM
bartek accepted this revision.Nov 4 2024, 4:59 AM
bartek added inline comments.
services/commtest/tests/backup_performance_test.rs
91 ↗(On Diff #45456)

we use it to determine what kind of backup we want to perform action on. It can be either:

  • Latest backup for given user
  • Backup with specific ID
kamil updated this revision to Diff 45603.Nov 5 2024, 4:14 AM

fix typo

Harbormaster completed remote builds in B32535: Diff 45603.Nov 5 2024, 4:34 AM
Closed by commit rCOMMf10da684e155: [backup-service] use `username` instead of `userID` when downloading backup (authored by kamil). · Explain WhyNov 7 2024, 4:07 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMf10da684e155: [backup-service] use `username` instead of `userID` when downloading backup.

Revision Contents
Changeset List

PathSize
services/
backup/
src/
http/
handlers/
7 lines
commtest/
tests/
24 lines
19 lines

Diff 45428

View Options

services/backup/src/http/handlers/backup.rs

Show All 18 Linesjsi::Array KeyserverStore::parseDBDataStore(
std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const { std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const {
size_t numKeyservers = keyserversVectorPtr->size(); size_t numKeyservers = keyserversVectorPtr->size();
jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers); jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers);
size_t writeIdx = 0; size_t writeIdx = 0;
for (const KeyserverInfo &keyserver : *keyserversVectorPtr) { for (const KeyserverInfo &keyserver : *keyserversVectorPtr) {
jsi::Object jsiKeyserver = jsi::Object(rt); jsi::Object jsiKeyserver = jsi::Object(rt);
jsiKeyserver.setProperty(rt, "id", keyserver.id); jsiKeyserver.setProperty(rt, "id", keyserver.id);
jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info); jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info);
jsiKeyserver.setProperty(
rt, "syncedKeyserverInfo", keyserver.synced_keyserver_info);
jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver); jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver);
} }
return jsiKeyservers; return jsiKeyservers;
} }
std::vector<std::unique_ptr<KeyserverStoreOperationBase>> std::vector<std::unique_ptr<KeyserverStoreOperationBase>>
KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations) KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations)
const { const {
Show All 20 Lines for (size_t idx = 0; idx < operations.size(rt); idx++) {
} else if (opType == REMOVE_ALL_OPERATION) { } else if (opType == REMOVE_ALL_OPERATION) {
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<RemoveAllKeyserversOperation>()); std::make_unique<RemoveAllKeyserversOperation>());
} else if (opType == REPLACE_OPERATION) { } else if (opType == REPLACE_OPERATION) {
jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt); jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt);
std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt); std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt);
std::string keyserver_info = std::string keyserver_info =
payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt); payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt);
std::string synced_keyserver_info =
payloadObj.getProperty(rt, "syncedKeyserverInfo")
.asString(rt)
.utf8(rt);
KeyserverInfo keyserver{id, keyserver_info}; KeyserverInfo keyserver{id, keyserver_info, synced_keyserver_info};
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver))); std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver)));
} else { } else {
throw std::runtime_error("unsupported operation: " + opType); throw std::runtime_error("unsupported operation: " + opType);
} }
}; };
return keyserverStoreOps; return keyserverStoreOps;
} }
} // namespace comm } // namespace comm
View Options

services/commtest/tests/backup_integration_test.rs

Show All 18 Linesjsi::Array KeyserverStore::parseDBDataStore(
std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const { std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const {
size_t numKeyservers = keyserversVectorPtr->size(); size_t numKeyservers = keyserversVectorPtr->size();
jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers); jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers);
size_t writeIdx = 0; size_t writeIdx = 0;
for (const KeyserverInfo &keyserver : *keyserversVectorPtr) { for (const KeyserverInfo &keyserver : *keyserversVectorPtr) {
jsi::Object jsiKeyserver = jsi::Object(rt); jsi::Object jsiKeyserver = jsi::Object(rt);
jsiKeyserver.setProperty(rt, "id", keyserver.id); jsiKeyserver.setProperty(rt, "id", keyserver.id);
jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info); jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info);
jsiKeyserver.setProperty(
rt, "syncedKeyserverInfo", keyserver.synced_keyserver_info);
jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver); jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver);
} }
return jsiKeyservers; return jsiKeyservers;
} }
std::vector<std::unique_ptr<KeyserverStoreOperationBase>> std::vector<std::unique_ptr<KeyserverStoreOperationBase>>
KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations) KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations)
const { const {
Show All 20 Lines for (size_t idx = 0; idx < operations.size(rt); idx++) {
} else if (opType == REMOVE_ALL_OPERATION) { } else if (opType == REMOVE_ALL_OPERATION) {
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<RemoveAllKeyserversOperation>()); std::make_unique<RemoveAllKeyserversOperation>());
} else if (opType == REPLACE_OPERATION) { } else if (opType == REPLACE_OPERATION) {
jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt); jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt);
std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt); std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt);
std::string keyserver_info = std::string keyserver_info =
payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt); payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt);
std::string synced_keyserver_info =
payloadObj.getProperty(rt, "syncedKeyserverInfo")
.asString(rt)
.utf8(rt);
KeyserverInfo keyserver{id, keyserver_info}; KeyserverInfo keyserver{id, keyserver_info, synced_keyserver_info};
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver))); std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver)));
} else { } else {
throw std::runtime_error("unsupported operation: " + opType); throw std::runtime_error("unsupported operation: " + opType);
} }
}; };
return keyserverStoreOps; return keyserverStoreOps;
} }
} // namespace comm } // namespace comm
View Options

services/commtest/tests/backup_performance_test.rs

Show All 18 Linesjsi::Array KeyserverStore::parseDBDataStore(
std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const { std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const {
size_t numKeyservers = keyserversVectorPtr->size(); size_t numKeyservers = keyserversVectorPtr->size();
jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers); jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers);
size_t writeIdx = 0; size_t writeIdx = 0;
for (const KeyserverInfo &keyserver : *keyserversVectorPtr) { for (const KeyserverInfo &keyserver : *keyserversVectorPtr) {
jsi::Object jsiKeyserver = jsi::Object(rt); jsi::Object jsiKeyserver = jsi::Object(rt);
jsiKeyserver.setProperty(rt, "id", keyserver.id); jsiKeyserver.setProperty(rt, "id", keyserver.id);
jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info); jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info);
jsiKeyserver.setProperty(
rt, "syncedKeyserverInfo", keyserver.synced_keyserver_info);
jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver); jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver);
} }
return jsiKeyservers; return jsiKeyservers;
} }
std::vector<std::unique_ptr<KeyserverStoreOperationBase>> std::vector<std::unique_ptr<KeyserverStoreOperationBase>>
KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations) KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations)
const { const {
Show All 20 Lines for (size_t idx = 0; idx < operations.size(rt); idx++) {
} else if (opType == REMOVE_ALL_OPERATION) { } else if (opType == REMOVE_ALL_OPERATION) {
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<RemoveAllKeyserversOperation>()); std::make_unique<RemoveAllKeyserversOperation>());
} else if (opType == REPLACE_OPERATION) { } else if (opType == REPLACE_OPERATION) {
jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt); jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt);
std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt); std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt);
std::string keyserver_info = std::string keyserver_info =
payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt); payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt);
std::string synced_keyserver_info =
payloadObj.getProperty(rt, "syncedKeyserverInfo")
.asString(rt)
.utf8(rt);
KeyserverInfo keyserver{id, keyserver_info}; KeyserverInfo keyserver{id, keyserver_info, synced_keyserver_info};
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver))); std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver)));
} else { } else {
throw std::runtime_error("unsupported operation: " + opType); throw std::runtime_error("unsupported operation: " + opType);
} }
}; };
return keyserverStoreOps; return keyserverStoreOps;
} }
} // namespace comm } // namespace comm