Page MenuHomePhabricator
Differential D4498

[services] Tunnelbroker - Add Corrosion to CMakeLists
ClosedPublic
Actions

Authored by • max on Jul 11 2022, 4:42 AM.
Tags
None
Referenced Files
F5534800: D4498.id.diff
Sat, Apr 12, 1:22 AM
F5534657: D4498.id14390.diff
Sat, Apr 12, 1:03 AM
F5533046: D4498.id14485.diff
Fri, Apr 11, 9:36 PM
Unknown Object (File)
Thu, Apr 10, 7:00 PM
Unknown Object (File)
Tue, Apr 8, 10:00 PM
Unknown Object (File)
Tue, Apr 8, 7:24 PM
Unknown Object (File)
Tue, Apr 8, 7:24 PM
Unknown Object (File)
Tue, Apr 8, 7:24 PM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul
• jon
• karol
tomek

Details

Reviewers
• karol
tomek
varun
• jon
Commits
rCOMM39c0e7fb4bce: [services] Tunnelbroker - Add Corrosion to CMakeLists
Summary

Add Corrosion tool for Rust and Cargo integration to CMakeLists.txt.

Linear task: ENG-1329

Test Plan

Running run-tunnelbroker-service and building the Tunnelbroker service using the CMakeLists resulted in success.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

• max created this revision.Jul 11 2022, 4:42 AM
• max held this revision as a draft.
Herald added subscribers: • abosh, • karol, atul and 3 others. · View Herald TranscriptJul 11 2022, 4:42 AM
• max added parent revisions: D4497: [services] Tunnelbroker - Install Rust and Corrosion in Dockerfile, D4496: [services] Tunnelbroker - Add Corrosion installation script.Jul 11 2022, 4:43 AM
• max mentioned this in D4496: [services] Tunnelbroker - Add Corrosion installation script.Jul 11 2022, 4:52 AM
Harbormaster completed remote builds in B10446: Diff 14390.Jul 11 2022, 4:54 AM
• max mentioned this in D4497: [services] Tunnelbroker - Install Rust and Corrosion in Dockerfile.Jul 11 2022, 4:55 AM
• max edited the summary of this revision. (Show Details)
• max edited the test plan for this revision. (Show Details)
• max added reviewers: • karol, tomek, varun.
• max published this revision for review.Jul 11 2022, 5:05 AM
ashoat added a reviewer: • jon. ashoat removed 1 blocking reviewer(s): tomek.Jul 11 2022, 6:15 AM
ashoat added a subscriber: • jon.

Adding @jonringer-comm since it's CMake/Rust-related. Also removed @palys-swm as blocking to give him a break :)

• jon accepted this revision.Jul 11 2022, 8:06 AM

LGTM

varun accepted this revision.Jul 12 2022, 12:00 PM
This revision is now accepted and ready to land.Jul 12 2022, 12:00 PM
• max mentioned this in rCOMM2d4977700846: [services] Tunnelbroker - Add Corrosion installation script.Jul 14 2022, 6:23 AM
Closed by commit rCOMM39c0e7fb4bce: [services] Tunnelbroker - Add Corrosion to CMakeLists (authored by • max). · Explain WhyJul 14 2022, 6:25 AM
This revision was automatically updated to reflect the committed changes.
• max mentioned this in rCOMM6271350404db: [services] Tunnelbroker - Install Rust and Corrosion in Dockerfile.
• max added a commit: rCOMM39c0e7fb4bce: [services] Tunnelbroker - Add Corrosion to CMakeLists.

Revision Contents
Changeset List

PathSize
services/
tunnelbroker/
1 line

Diff 14485

View Options

services/tunnelbroker/CMakeLists.txt

Show First 20 Lines • Show All 368 Lines • ▼ Show 20 Lines currentUser: {
subscription: { subscription: {
pushNotifs: false, pushNotifs: false,
home: false, home: false,
}, },
unread: false, unread: false,
}, },
repliesCount: 0, repliesCount: 0,
sourceMessageID, sourceMessageID,
pinnedCount: 0,
}; };
const userInfos = {}; const userInfos = {};
for (const member of members) { for (const member of members) {
const { id, username } = member; const { id, username } = member;
userInfos[id] = { id, username }; userInfos[id] = { id, username };
} }
▲ Show 20 Lines • Show All 307 Lines • ▼ Show 20 Lines
type RawThreadInfoOptions = { type RawThreadInfoOptions = {
+includeVisibilityRules?: ?boolean, +includeVisibilityRules?: ?boolean,
+filterMemberList?: ?boolean, +filterMemberList?: ?boolean,
+hideThreadStructure?: ?boolean, +hideThreadStructure?: ?boolean,
+shimThreadTypes?: ?{ +shimThreadTypes?: ?{
+[inType: ThreadType]: ThreadType, +[inType: ThreadType]: ThreadType,
}, },
+filterDetailedThreadEditPermissions?: boolean, +filterDetailedThreadEditPermissions?: boolean,
+excludePinnedCount?: boolean,
}; };
function rawThreadInfoFromServerThreadInfo( function rawThreadInfoFromServerThreadInfo(
serverThreadInfo: ServerThreadInfo, serverThreadInfo: ServerThreadInfo,
viewerID: string, viewerID: string,
options?: RawThreadInfoOptions, options?: RawThreadInfoOptions,
): ?RawThreadInfo { ): ?RawThreadInfo {
const includeVisibilityRules = options?.includeVisibilityRules; const includeVisibilityRules = options?.includeVisibilityRules;
const filterMemberList = options?.filterMemberList; const filterMemberList = options?.filterMemberList;
const hideThreadStructure = options?.hideThreadStructure; const hideThreadStructure = options?.hideThreadStructure;
const shimThreadTypes = options?.shimThreadTypes; const shimThreadTypes = options?.shimThreadTypes;
const filterDetailedThreadEditPermissions = const filterDetailedThreadEditPermissions =
options?.filterDetailedThreadEditPermissions; options?.filterDetailedThreadEditPermissions;
const excludePinnedCount = options?.excludePinnedCount;
const members = []; const members = [];
let currentUser; let currentUser;
for (const serverMember of serverThreadInfo.members) { for (const serverMember of serverThreadInfo.members) {
if ( if (
filterMemberList && filterMemberList &&
serverMember.id !== viewerID && serverMember.id !== viewerID &&
!serverMember.role && !serverMember.role &&
▲ Show 20 Lines • Show All 87 Lines • ▼ Show 20 Lines if (serverThreadInfo.avatar) {
rawThreadInfo = { ...rawThreadInfo, avatar: serverThreadInfo.avatar }; rawThreadInfo = { ...rawThreadInfo, avatar: serverThreadInfo.avatar };
} }
if (includeVisibilityRules) { if (includeVisibilityRules) {
return { return {
...rawThreadInfo, ...rawThreadInfo,
visibilityRules: rawThreadInfo.type, visibilityRules: rawThreadInfo.type,
}; };
} }
if (!excludePinnedCount) {
return {
...rawThreadInfo,
pinnedCount: serverThreadInfo.pinnedCount,
};
}
return rawThreadInfo; return rawThreadInfo;
} }
function filterThreadEditDetailedPermissions( function filterThreadEditDetailedPermissions(
permissions: ThreadPermissionsInfo, permissions: ThreadPermissionsInfo,
shouldFilter: ?boolean, shouldFilter: ?boolean,
): ThreadPermissionsInfo { ): ThreadPermissionsInfo {
if (!shouldFilter) { if (!shouldFilter) {
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Lines let threadInfo: ThreadInfo = {
roles: rawThreadInfo.roles, roles: rawThreadInfo.roles,
currentUser: getCurrentUser(rawThreadInfo, viewerID, userInfos), currentUser: getCurrentUser(rawThreadInfo, viewerID, userInfos),
repliesCount: rawThreadInfo.repliesCount, repliesCount: rawThreadInfo.repliesCount,
}; };
threadInfo = { threadInfo = {
...threadInfo, ...threadInfo,
uiName: threadUIName(threadInfo), uiName: threadUIName(threadInfo),
}; };
const { sourceMessageID, avatar } = rawThreadInfo; const { sourceMessageID, avatar, pinnedCount } = rawThreadInfo;
if (sourceMessageID) { if (sourceMessageID) {
threadInfo = { ...threadInfo, sourceMessageID }; threadInfo = { ...threadInfo, sourceMessageID };
} }
if (avatar) { if (avatar) {
threadInfo = { ...threadInfo, avatar }; threadInfo = { ...threadInfo, avatar };
} else if ( } else if (
rawThreadInfo.type === threadTypes.PERSONAL || rawThreadInfo.type === threadTypes.PERSONAL ||
rawThreadInfo.type === threadTypes.PRIVATE rawThreadInfo.type === threadTypes.PRIVATE
) { ) {
threadInfo = { threadInfo = {
...threadInfo, ...threadInfo,
avatar: getUserAvatarForThread(rawThreadInfo, viewerID, userInfos), avatar: getUserAvatarForThread(rawThreadInfo, viewerID, userInfos),
}; };
} }
if (pinnedCount) {
threadInfo = { ...threadInfo, pinnedCount };
}
return threadInfo; return threadInfo;
} }
function getCurrentUser( function getCurrentUser(
threadInfo: RawThreadInfo | ThreadInfo, threadInfo: RawThreadInfo | ThreadInfo,
viewerID: ?string, viewerID: ?string,
userInfos: UserInfos, userInfos: UserInfos,
): ThreadCurrentUserInfo { ): ThreadCurrentUserInfo {
▲ Show 20 Lines • Show All 712 Lines • Show Last 20 Lines