Page MenuHomePhabricator
Differential D14069

[terraform] deploy tunnelbroker 0.18.2 to production
ClosedPublic
Actions

Authored by kamil on Dec 2 2024, 2:56 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 23, 4:15 PM
Unknown Object (File)
Wed, Apr 23, 9:19 AM
Unknown Object (File)
Wed, Apr 23, 3:32 AM
Unknown Object (File)
Wed, Apr 23, 2:33 AM
Unknown Object (File)
Mon, Apr 21, 11:37 PM
Unknown Object (File)
Thu, Apr 17, 12:47 AM
Unknown Object (File)
Sat, Apr 12, 7:38 PM
Unknown Object (File)
Mar 13 2025, 4:24 PM
View All 53 Files
Subscribers
ashoat

Details

Reviewers
bartek
tomek
Commits
rCOMM98f0d29d70bc: [terraform] deploy tunnelbroker 0.18.2 to production
Summary

Deploying the following changes:

Tunnelbroker images are here

tunnelbroker-v0.18.2

Depends on D14039

Test Plan

terraform plan

Diff Detail

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

Revision Contents
Changeset List

PathSize
services/
terraform/
remote/
2 lines

Diff 46158

View Options

services/terraform/remote/service_tunnelbroker.tf

Show First 20 Lines • Show All 401 Lines • ▼ Show 20 Lines for (const [versionKey, devices] of webVersionsToTokens) {
}; };
const preparePromise: Promise<$ReadOnlyArray<PreparePushResult>> = const preparePromise: Promise<$ReadOnlyArray<PreparePushResult>> =
(async () => { (async () => {
const targetedNotifications = await prepareWebNotification( const targetedNotifications = await prepareWebNotification(
{ {
notifTexts, notifTexts,
threadID: threadInfo.id, threadID: threadInfo.id,
keyserverID,
unreadCount, unreadCount,
platformDetails, platformDetails,
}, },
devices, devices,
); );
return targetedNotifications.map(notification => ({ return targetedNotifications.map(notification => ({
notification, notification,
▲ Show 20 Lines • Show All 63 Lines • ▼ Show 20 Lines for (const [versionKey, devices] of windowsVersionsToTokens) {
majorDesktopVersion, majorDesktopVersion,
}; };
const preparePromise: Promise<$ReadOnlyArray<PreparePushResult>> = const preparePromise: Promise<$ReadOnlyArray<PreparePushResult>> =
(async () => { (async () => {
const targetedNotifications = await prepareWNSNotification(devices, { const targetedNotifications = await prepareWNSNotification(devices, {
notifTexts, notifTexts,
threadID: threadInfo.id, threadID: threadInfo.id,
keyserverID,
unreadCount, unreadCount,
platformDetails, platformDetails,
}); });
return targetedNotifications.map(notification => ({ return targetedNotifications.map(notification => ({
notification, notification,
platform: 'windows', platform: 'windows',
notificationInfo: { notificationInfo: {
▲ Show 20 Lines • Show All 475 Lines • ▼ Show 20 Lines if (!badgeOnly && platformDetails.platform !== 'macos') {
notification.body = merged; notification.body = merged;
notification.sound = 'default'; notification.sound = 'default';
} }
notification.payload = { notification.payload = {
...notification.payload, ...notification.payload,
...rest, ...rest,
}; };
if (platformDetails.platform !== 'macos') {
notification.payload.keyserverID = keyserverID;
}
notification.badge = unreadCount; notification.badge = unreadCount;
notification.threadId = threadID; notification.threadId = threadID;
notification.id = uniqueID; notification.id = uniqueID;
notification.pushType = 'alert'; notification.pushType = 'alert';
notification.payload.id = uniqueID; notification.payload.id = uniqueID;
notification.payload.threadID = threadID; notification.payload.threadID = threadID;
notification.payload.keyserverID = keyserverID;
if (platformDetails.codeVersion && platformDetails.codeVersion > 198) { if (platformDetails.codeVersion && platformDetails.codeVersion > 198) {
notification.mutableContent = true; notification.mutableContent = true;
} }
if (collapseKey && (canDecryptAllIOSNotifs || canDecryptMacOSNotifs)) { if (collapseKey && (canDecryptAllIOSNotifs || canDecryptMacOSNotifs)) {
notification.payload.collapseID = collapseKey; notification.payload.collapseID = collapseKey;
} else if (collapseKey) { } else if (collapseKey) {
notification.collapseId = collapseKey; notification.collapseId = collapseKey;
▲ Show 20 Lines • Show All 243 Lines • ▼ Show 20 Lines return [
...targetedNotifsWithMessageInfos, ...targetedNotifsWithMessageInfos,
...targetedNotifsWithoutMessageInfos, ...targetedNotifsWithoutMessageInfos,
]; ];
} }
type WebNotifInputData = { type WebNotifInputData = {
+notifTexts: ResolvedNotifTexts, +notifTexts: ResolvedNotifTexts,
+threadID: string, +threadID: string,
+keyserverID: string,
+unreadCount: number, +unreadCount: number,
+platformDetails: PlatformDetails, +platformDetails: PlatformDetails,
}; };
const webNotifInputDataValidator = tShape<WebNotifInputData>({ const webNotifInputDataValidator = tShape<WebNotifInputData>({
notifTexts: resolvedNotifTextsValidator, notifTexts: resolvedNotifTextsValidator,
threadID: tID, threadID: tID,
keyserverID: t.String,
unreadCount: t.Number, unreadCount: t.Number,
platformDetails: tPlatformDetails, platformDetails: tPlatformDetails,
}); });
async function prepareWebNotification( async function prepareWebNotification(
inputData: WebNotifInputData, inputData: WebNotifInputData,
devices: $ReadOnlyArray<NotificationTargetDevice>, devices: $ReadOnlyArray<NotificationTargetDevice>,
): Promise<$ReadOnlyArray<TargetedWebNotification>> { ): Promise<$ReadOnlyArray<TargetedWebNotification>> {
const convertedData = await validateOutput( const convertedData = await validateOutput(
inputData.platformDetails, inputData.platformDetails,
webNotifInputDataValidator, webNotifInputDataValidator,
inputData, inputData,
); );
const { notifTexts, threadID, unreadCount } = convertedData; const { notifTexts, threadID, unreadCount, keyserverID } = convertedData;
const id = uuidv4(); const id = uuidv4();
const { merged, ...rest } = notifTexts; const { merged, ...rest } = notifTexts;
const notification = { const notification = {
...rest, ...rest,
unreadCount, unreadCount,
id, id,
threadID, threadID,
keyserverID,
}; };
const shouldBeEncrypted = hasMinCodeVersion(convertedData.platformDetails, { const shouldBeEncrypted = hasMinCodeVersion(convertedData.platformDetails, {
web: 43, web: 43,
}); });
if (!shouldBeEncrypted) { if (!shouldBeEncrypted) {
return devices.map(({ deviceToken }) => ({ deviceToken, notification })); return devices.map(({ deviceToken }) => ({ deviceToken, notification }));
} }
return prepareEncryptedWebNotifications(devices, notification); return prepareEncryptedWebNotifications(devices, notification);
} }
type WNSNotifInputData = { type WNSNotifInputData = {
+notifTexts: ResolvedNotifTexts, +notifTexts: ResolvedNotifTexts,
+threadID: string, +threadID: string,
+keyserverID: string,
+unreadCount: number, +unreadCount: number,
+platformDetails: PlatformDetails, +platformDetails: PlatformDetails,
}; };
const wnsNotifInputDataValidator = tShape<WNSNotifInputData>({ const wnsNotifInputDataValidator = tShape<WNSNotifInputData>({
notifTexts: resolvedNotifTextsValidator, notifTexts: resolvedNotifTextsValidator,
threadID: tID, threadID: tID,
keyserverID: t.String,
unreadCount: t.Number, unreadCount: t.Number,
platformDetails: tPlatformDetails, platformDetails: tPlatformDetails,
}); });
async function prepareWNSNotification( async function prepareWNSNotification(
devices: $ReadOnlyArray<NotificationTargetDevice>, devices: $ReadOnlyArray<NotificationTargetDevice>,
inputData: WNSNotifInputData, inputData: WNSNotifInputData,
): Promise<$ReadOnlyArray<TargetedWNSNotification>> { ): Promise<$ReadOnlyArray<TargetedWNSNotification>> {
const convertedData = await validateOutput( const convertedData = await validateOutput(
inputData.platformDetails, inputData.platformDetails,
wnsNotifInputDataValidator, wnsNotifInputDataValidator,
inputData, inputData,
); );
const { notifTexts, threadID, unreadCount } = convertedData; const { notifTexts, threadID, unreadCount, keyserverID } = convertedData;
const { merged, ...rest } = notifTexts; const { merged, ...rest } = notifTexts;
const notification = { const notification = {
...rest, ...rest,
unreadCount, unreadCount,
threadID, threadID,
keyserverID,
}; };
if ( if (
Buffer.byteLength(JSON.stringify(notification)) > Buffer.byteLength(JSON.stringify(notification)) >
wnsMaxNotificationPayloadByteSize wnsMaxNotificationPayloadByteSize
) { ) {
console.warn('WNS notification exceeds size limit'); console.warn('WNS notification exceeds size limit');
} }
▲ Show 20 Lines • Show All 452 Lines • ▼ Show 20 Lines for (const [versionKey, deviceInfos] of macosVersionsToTokens) {
notification.topic = getAPNsNotificationTopic({ notification.topic = getAPNsNotificationTopic({
platform: 'macos', platform: 'macos',
codeVersion, codeVersion,
stateVersion, stateVersion,
majorDesktopVersion, majorDesktopVersion,
}); });
notification.badge = unreadCount; notification.badge = unreadCount;
notification.pushType = 'alert'; notification.pushType = 'alert';
notification.payload.keyserverID = keyserverID;
const preparePromise: Promise<PreparePushResult[]> = (async () => { const preparePromise: Promise<PreparePushResult[]> = (async () => {
const shouldBeEncrypted = hasMinCodeVersion(viewer.platformDetails, { const shouldBeEncrypted = hasMinCodeVersion(viewer.platformDetails, {
web: 47, web: 47,
majorDesktop: 9, majorDesktop: 9,
}); });
let targetedNotifications: $ReadOnlyArray<TargetedAPNsNotification>; let targetedNotifications: $ReadOnlyArray<TargetedAPNsNotification>;
if (shouldBeEncrypted) { if (shouldBeEncrypted) {
const notificationsArray = await prepareEncryptedAPNsNotifications( const notificationsArray = await prepareEncryptedAPNsNotifications(
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines