Page MenuHomePhabricator
Differential D5067

[services] Tunnelbroker - Changes to handle empty `message_id` inside the Rust `send_by_fcm_client` function
AbandonedPublic
Actions

Authored by • max on Sep 6 2022, 6:51 AM.
Tags
None
Referenced Files
F5107239: D5067.id16366.diff
Tue, Apr 1, 10:37 AM
F5107238: D5067.diff
Tue, Apr 1, 10:37 AM
Unknown Object (File)
Sun, Mar 30, 8:27 AM
Unknown Object (File)
Sat, Mar 29, 3:12 AM
Unknown Object (File)
Sat, Mar 29, 3:12 AM
Unknown Object (File)
Wed, Mar 26, 1:30 AM
Unknown Object (File)
Wed, Mar 26, 1:30 AM
Unknown Object (File)
Fri, Mar 21, 2:10 PM
View All Files
Subscribers
• abosh
ashoat
atul
• karol
tomek

Details

Reviewers
• jon
• karol
tomek
varun
Summary

This diff introduces following changes to the Rust send_by_fcm_client function:

  • As we don't use message_id anywhere at the upper level we should not return it;
  • Properly handling errors by checking the results vector instead of the upper level only.

Related Linear task: ENG-1740

Test Plan
  1. Successfully built using Docker.
  2. Successfully call the function from C++:
#include "cxxbridge_code/src/lib.rs.h"
#include "rust/cxx.h
...
const std::string server_key = argv[1];
const std::string device_token = argv[2];
const std::string message_title = argv[3];
const std::string message_body = argv[4];
sendNotifToFCM(server_key, device_token, message_title, message_body);

Diff Detail

Repository
rCOMM Comm
Branch
void-for-fcm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

• max created this revision.Sep 6 2022, 6:51 AM
• max held this revision as a draft.
Herald added a reviewer: • jon. · View Herald TranscriptSep 6 2022, 6:51 AM
Herald added subscribers: • abosh, • karol, atul and 2 others. · View Herald Transcript
• max added a parent revision: D5066: [services] Tunnelbroker - Changes to handle HTTP code inside the Rust `send_notif_to_apns` function.Sep 6 2022, 6:51 AM
• max published this revision for review.Sep 6 2022, 6:57 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.
Harbormaster completed remote builds in B11920: Diff 16366.Sep 6 2022, 7:01 AM
• jon added a comment.Sep 6 2022, 5:03 PM

We really need to get a test suite going, these test plans should just be a CI check

• max added a child revision: D5081: [services] Tunnelbroker - Add `topic` to APNs.Sep 8 2022, 7:40 AM
• max planned changes to this revision.Sep 12 2022, 2:45 AM
• max abandoned this revision.Sep 15 2022, 5:29 AM

Abandon due to ENG-1764: Distinguish common and wrong/expired device token errors in Rust notification library.

• max removed a child revision: D5081: [services] Tunnelbroker - Add `topic` to APNs.Sep 22 2022, 7:08 AM

Revision Contents
Changeset List

PathSize
services/
tunnelbroker/
rust-notifications/
src/
19 lines
4 lines

Diff 16366

View Options

services/tunnelbroker/rust-notifications/src/fcm.rs

Show First 20 Lines • Show All 130 Lines • ▼ Show 20 Lines SQL`
CREATE TABLE sessions ( CREATE TABLE sessions (
id bigint(20) NOT NULL, id bigint(20) NOT NULL,
user bigint(20) NOT NULL, user bigint(20) NOT NULL,
cookie bigint(20) NOT NULL, cookie bigint(20) NOT NULL,
query json NOT NULL, query json NOT NULL,
creation_time bigint(20) NOT NULL, creation_time bigint(20) NOT NULL,
last_update bigint(20) NOT NULL, last_update bigint(20) NOT NULL,
last_validated bigint(20) NOT NULL last_validated bigint(20) NOT NULL,
public_key char(116) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1; ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE threads ( CREATE TABLE threads (
id bigint(20) NOT NULL, id bigint(20) NOT NULL,
type tinyint(3) NOT NULL, type tinyint(3) NOT NULL,
name varchar(191) COLLATE utf8mb4_bin DEFAULT NULL, name varchar(191) COLLATE utf8mb4_bin DEFAULT NULL,
description mediumtext COLLATE utf8mb4_bin, description mediumtext COLLATE utf8mb4_bin,
parent_thread_id bigint(20) DEFAULT NULL, parent_thread_id bigint(20) DEFAULT NULL,
Show All 30 Lines SQL`
secret varchar(255) NOT NULL, secret varchar(255) NOT NULL,
creation_time bigint(20) NOT NULL, creation_time bigint(20) NOT NULL,
extra json DEFAULT NULL extra json DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE users ( CREATE TABLE users (
id bigint(20) NOT NULL, id bigint(20) NOT NULL,
username varchar(${usernameMaxLength}) COLLATE utf8mb4_bin NOT NULL, username varchar(${usernameMaxLength}) COLLATE utf8mb4_bin NOT NULL,
hash char(60) COLLATE utf8mb4_bin DEFAULT NULL, hash char(60) COLLATE utf8mb4_bin NOT NULL,
avatar varchar(191) COLLATE utf8mb4_bin DEFAULT NULL, avatar varchar(191) COLLATE utf8mb4_bin DEFAULT NULL,
creation_time bigint(20) NOT NULL creation_time bigint(20) NOT NULL,
public_key char(116) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
CREATE TABLE relationships_undirected ( CREATE TABLE relationships_undirected (
user1 bigint(20) NOT NULL, user1 bigint(20) NOT NULL,
user2 bigint(20) NOT NULL, user2 bigint(20) NOT NULL,
status tinyint(1) UNSIGNED NOT NULL status tinyint(1) UNSIGNED NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1; ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Lines SQL`
ADD KEY entry (entry); ADD KEY entry (entry);
ALTER TABLE roles ALTER TABLE roles
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD KEY thread (thread); ADD KEY thread (thread);
ALTER TABLE sessions ALTER TABLE sessions
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD KEY user (user); ADD KEY user (user),
ADD UNIQUE INDEX public_key (public_key);
ALTER TABLE threads ALTER TABLE threads
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD INDEX parent_thread_id (parent_thread_id), ADD INDEX parent_thread_id (parent_thread_id),
ADD INDEX containing_thread_id (containing_thread_id), ADD INDEX containing_thread_id (containing_thread_id),
ADD INDEX community (community); ADD INDEX community (community);
ALTER TABLE updates ALTER TABLE updates
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD INDEX user_time (user,time), ADD INDEX user_time (user,time),
ADD INDEX target_time (target, time), ADD INDEX target_time (target, time),
ADD INDEX user_key_target_type_time (user, \`key\`, target, type, time), ADD INDEX user_key_target_type_time (user, \`key\`, target, type, time),
ADD INDEX user_key_type_time (user, \`key\`, type, time), ADD INDEX user_key_type_time (user, \`key\`, type, time),
ADD INDEX user_key_time (user, \`key\`, time); ADD INDEX user_key_time (user, \`key\`, time);
ALTER TABLE uploads ALTER TABLE uploads
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD INDEX container (container); ADD INDEX container (container);
ALTER TABLE users ALTER TABLE users
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD UNIQUE KEY username (username); ADD UNIQUE KEY username (username),
ADD UNIQUE INDEX public_key (public_key);
ALTER TABLE relationships_undirected ALTER TABLE relationships_undirected
ADD UNIQUE KEY user1_user2 (user1,user2), ADD UNIQUE KEY user1_user2 (user1,user2),
ADD UNIQUE KEY user2_user1 (user2,user1); ADD UNIQUE KEY user2_user1 (user2,user1);
ALTER TABLE relationships_directed ALTER TABLE relationships_directed
ADD UNIQUE KEY user1_user2 (user1,user2), ADD UNIQUE KEY user1_user2 (user1,user2),
ADD UNIQUE KEY user2_user1 (user2,user1); ADD UNIQUE KEY user2_user1 (user2,user1);
▲ Show 20 Lines • Show All 87 Lines • Show Last 20 Lines
View Options

services/tunnelbroker/rust-notifications/src/lib.rs

Show First 20 Lines • Show All 130 Lines • ▼ Show 20 Lines SQL`
CREATE TABLE sessions ( CREATE TABLE sessions (
id bigint(20) NOT NULL, id bigint(20) NOT NULL,
user bigint(20) NOT NULL, user bigint(20) NOT NULL,
cookie bigint(20) NOT NULL, cookie bigint(20) NOT NULL,
query json NOT NULL, query json NOT NULL,
creation_time bigint(20) NOT NULL, creation_time bigint(20) NOT NULL,
last_update bigint(20) NOT NULL, last_update bigint(20) NOT NULL,
last_validated bigint(20) NOT NULL last_validated bigint(20) NOT NULL,
public_key char(116) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1; ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE threads ( CREATE TABLE threads (
id bigint(20) NOT NULL, id bigint(20) NOT NULL,
type tinyint(3) NOT NULL, type tinyint(3) NOT NULL,
name varchar(191) COLLATE utf8mb4_bin DEFAULT NULL, name varchar(191) COLLATE utf8mb4_bin DEFAULT NULL,
description mediumtext COLLATE utf8mb4_bin, description mediumtext COLLATE utf8mb4_bin,
parent_thread_id bigint(20) DEFAULT NULL, parent_thread_id bigint(20) DEFAULT NULL,
Show All 30 Lines SQL`
secret varchar(255) NOT NULL, secret varchar(255) NOT NULL,
creation_time bigint(20) NOT NULL, creation_time bigint(20) NOT NULL,
extra json DEFAULT NULL extra json DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE users ( CREATE TABLE users (
id bigint(20) NOT NULL, id bigint(20) NOT NULL,
username varchar(${usernameMaxLength}) COLLATE utf8mb4_bin NOT NULL, username varchar(${usernameMaxLength}) COLLATE utf8mb4_bin NOT NULL,
hash char(60) COLLATE utf8mb4_bin DEFAULT NULL, hash char(60) COLLATE utf8mb4_bin NOT NULL,
avatar varchar(191) COLLATE utf8mb4_bin DEFAULT NULL, avatar varchar(191) COLLATE utf8mb4_bin DEFAULT NULL,
creation_time bigint(20) NOT NULL creation_time bigint(20) NOT NULL,
public_key char(116) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
CREATE TABLE relationships_undirected ( CREATE TABLE relationships_undirected (
user1 bigint(20) NOT NULL, user1 bigint(20) NOT NULL,
user2 bigint(20) NOT NULL, user2 bigint(20) NOT NULL,
status tinyint(1) UNSIGNED NOT NULL status tinyint(1) UNSIGNED NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1; ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Lines SQL`
ADD KEY entry (entry); ADD KEY entry (entry);
ALTER TABLE roles ALTER TABLE roles
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD KEY thread (thread); ADD KEY thread (thread);
ALTER TABLE sessions ALTER TABLE sessions
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD KEY user (user); ADD KEY user (user),
ADD UNIQUE INDEX public_key (public_key);
ALTER TABLE threads ALTER TABLE threads
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD INDEX parent_thread_id (parent_thread_id), ADD INDEX parent_thread_id (parent_thread_id),
ADD INDEX containing_thread_id (containing_thread_id), ADD INDEX containing_thread_id (containing_thread_id),
ADD INDEX community (community); ADD INDEX community (community);
ALTER TABLE updates ALTER TABLE updates
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD INDEX user_time (user,time), ADD INDEX user_time (user,time),
ADD INDEX target_time (target, time), ADD INDEX target_time (target, time),
ADD INDEX user_key_target_type_time (user, \`key\`, target, type, time), ADD INDEX user_key_target_type_time (user, \`key\`, target, type, time),
ADD INDEX user_key_type_time (user, \`key\`, type, time), ADD INDEX user_key_type_time (user, \`key\`, type, time),
ADD INDEX user_key_time (user, \`key\`, time); ADD INDEX user_key_time (user, \`key\`, time);
ALTER TABLE uploads ALTER TABLE uploads
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD INDEX container (container); ADD INDEX container (container);
ALTER TABLE users ALTER TABLE users
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD UNIQUE KEY username (username); ADD UNIQUE KEY username (username),
ADD UNIQUE INDEX public_key (public_key);
ALTER TABLE relationships_undirected ALTER TABLE relationships_undirected
ADD UNIQUE KEY user1_user2 (user1,user2), ADD UNIQUE KEY user1_user2 (user1,user2),
ADD UNIQUE KEY user2_user1 (user2,user1); ADD UNIQUE KEY user2_user1 (user2,user1);
ALTER TABLE relationships_directed ALTER TABLE relationships_directed
ADD UNIQUE KEY user1_user2 (user1,user2), ADD UNIQUE KEY user1_user2 (user1,user2),
ADD UNIQUE KEY user2_user1 (user2,user1); ADD UNIQUE KEY user2_user1 (user2,user1);
▲ Show 20 Lines • Show All 87 Lines • Show Last 20 Lines