Page MenuHomePhabricator
Differential D3988

[services] Lib - Tunnelbroker - Use scripts
ClosedPublic
Actions

Authored by • karol on May 10 2022, 4:26 AM.
Tags
None
Referenced Files
F5899702: D3988.diff
Thu, Apr 17, 12:10 PM
F5887368: D3988.id12490.diff
Thu, Apr 17, 4:31 AM
Unknown Object (File)
Wed, Apr 16, 10:01 PM
Unknown Object (File)
Wed, Apr 16, 8:32 PM
Unknown Object (File)
Wed, Apr 16, 4:21 AM
Unknown Object (File)
Wed, Apr 16, 2:21 AM
Unknown Object (File)
Mon, Apr 14, 1:41 PM
Unknown Object (File)
Mon, Apr 14, 3:13 AM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul
tomek

Details

Reviewers
tomek
• max
Commits
rCOMM8b584c4c981e: [services] Lib - Tunnelbroker - Use scripts
Summary

Depends on D3987

Removing as many scripts as possible from the tunnelbroker directory and using the ones from the "lib" directory instead.

Test Plan

You should be able to build tunnelbroker properly

cd services
yarn run-tunnelbroker-service

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

• karol created this revision.May 10 2022, 4:26 AM
Herald added subscribers: • abosh, atul, • adrian and 2 others. · View Herald TranscriptMay 10 2022, 4:26 AM
Harbormaster completed remote builds in B8980: Diff 12490.May 10 2022, 4:36 AM
• karol requested review of this revision.May 10 2022, 4:36 AM
• karol edited the summary of this revision. (Show Details)May 10 2022, 4:40 AM
• karol edited the test plan for this revision. (Show Details)
• karol added reviewers: tomek, • max.
• karol added a parent revision: D3987: [services] Lib - Tunnelbroker - Use cmake components.
• karol added a child revision: D3989: [services] Lib - Tunnelbroker - Use sources.May 10 2022, 4:42 AM
• karol added 1 blocking reviewer(s): • max.May 10 2022, 6:49 AM
• max added a comment.May 10 2022, 10:53 PM

That makes sense to me to make the directory structure more clear. Thanks @karol-bisztyga !

• max accepted this revision.May 10 2022, 10:53 PM
This revision is now accepted and ready to land.May 10 2022, 10:53 PM
Closed by commit rCOMM8b584c4c981e: [services] Lib - Tunnelbroker - Use scripts (authored by • karol). · Explain WhyMay 12 2022, 1:57 AM
This revision was automatically updated to reflect the committed changes.
• karol added a commit: rCOMM8b584c4c981e: [services] Lib - Tunnelbroker - Use scripts.
ashoat added inline comments.May 12 2022, 11:24 AM
services/tunnelbroker/Dockerfile
31

This seems like a mistake – it is running run_service.sh in both conditions. Either we should get rid of the conditional, or (most likely) it is supposed to call run_tests.sh in the other case

PS – we prefer [[ ]] to [ ], would be great to update this

• karol mentioned this in D4052: [services] Tunnelbroker - Fix scripts in Dockerfiles.May 16 2022, 2:58 AM
• karol added inline comments.May 16 2022, 3:03 AM
services/tunnelbroker/Dockerfile
31

Nice catch.

D4052

[[ ]] doesn't work

Revision Contents
Changeset List

PathSize
services/
tunnelbroker/
7 lines
docker/

Diff 12569

View Options

services/tunnelbroker/Dockerfile

Show First 20 Lines • Show All 76 Lines • ▼ Show 20 Lines device_key_upload: Some(DeviceKeyUpload {
prekey: generate_random_olm_key(), prekey: generate_random_olm_key(),
prekey_signature: "notif_prekey_sig".to_string(), prekey_signature: "notif_prekey_sig".to_string(),
}), }),
one_time_content_prekeys: Vec::new(), one_time_content_prekeys: Vec::new(),
one_time_notif_prekeys: Vec::new(), one_time_notif_prekeys: Vec::new(),
device_type: device_type.into(), device_type: device_type.into(),
}), }),
farcaster_id: None, farcaster_id: None,
initial_device_list: "".to_string(),
}; };
let mut identity_client = get_unauthenticated_client( let mut identity_client = get_unauthenticated_client(
&service_addr::IDENTITY_GRPC.to_string(), &service_addr::IDENTITY_GRPC.to_string(),
PLACEHOLDER_CODE_VERSION, PLACEHOLDER_CODE_VERSION,
DEVICE_TYPE.to_string(), DEVICE_TYPE.to_string(),
) )
.await .await
▲ Show 20 Lines • Show All 136 Lines • Show Last 20 Lines
View Options

services/tunnelbroker/docker/build_server.sh

Show First 20 Lines • Show All 76 Lines • ▼ Show 20 Lines device_key_upload: Some(DeviceKeyUpload {
prekey: generate_random_olm_key(), prekey: generate_random_olm_key(),
prekey_signature: "notif_prekey_sig".to_string(), prekey_signature: "notif_prekey_sig".to_string(),
}), }),
one_time_content_prekeys: Vec::new(), one_time_content_prekeys: Vec::new(),
one_time_notif_prekeys: Vec::new(), one_time_notif_prekeys: Vec::new(),
device_type: device_type.into(), device_type: device_type.into(),
}), }),
farcaster_id: None, farcaster_id: None,
initial_device_list: "".to_string(),
}; };
let mut identity_client = get_unauthenticated_client( let mut identity_client = get_unauthenticated_client(
&service_addr::IDENTITY_GRPC.to_string(), &service_addr::IDENTITY_GRPC.to_string(),
PLACEHOLDER_CODE_VERSION, PLACEHOLDER_CODE_VERSION,
DEVICE_TYPE.to_string(), DEVICE_TYPE.to_string(),
) )
.await .await
▲ Show 20 Lines • Show All 136 Lines • Show Last 20 Lines
View Options

services/tunnelbroker/docker/install_folly.sh

Show First 20 Lines • Show All 76 Lines • ▼ Show 20 Lines device_key_upload: Some(DeviceKeyUpload {
prekey: generate_random_olm_key(), prekey: generate_random_olm_key(),
prekey_signature: "notif_prekey_sig".to_string(), prekey_signature: "notif_prekey_sig".to_string(),
}), }),
one_time_content_prekeys: Vec::new(), one_time_content_prekeys: Vec::new(),
one_time_notif_prekeys: Vec::new(), one_time_notif_prekeys: Vec::new(),
device_type: device_type.into(), device_type: device_type.into(),
}), }),
farcaster_id: None, farcaster_id: None,
initial_device_list: "".to_string(),
}; };
let mut identity_client = get_unauthenticated_client( let mut identity_client = get_unauthenticated_client(
&service_addr::IDENTITY_GRPC.to_string(), &service_addr::IDENTITY_GRPC.to_string(),
PLACEHOLDER_CODE_VERSION, PLACEHOLDER_CODE_VERSION,
DEVICE_TYPE.to_string(), DEVICE_TYPE.to_string(),
) )
.await .await
▲ Show 20 Lines • Show All 136 Lines • Show Last 20 Lines
View Options

services/tunnelbroker/docker/run_server.sh

Show First 20 Lines • Show All 76 Lines • ▼ Show 20 Lines device_key_upload: Some(DeviceKeyUpload {
prekey: generate_random_olm_key(), prekey: generate_random_olm_key(),
prekey_signature: "notif_prekey_sig".to_string(), prekey_signature: "notif_prekey_sig".to_string(),
}), }),
one_time_content_prekeys: Vec::new(), one_time_content_prekeys: Vec::new(),
one_time_notif_prekeys: Vec::new(), one_time_notif_prekeys: Vec::new(),
device_type: device_type.into(), device_type: device_type.into(),
}), }),
farcaster_id: None, farcaster_id: None,
initial_device_list: "".to_string(),
}; };
let mut identity_client = get_unauthenticated_client( let mut identity_client = get_unauthenticated_client(
&service_addr::IDENTITY_GRPC.to_string(), &service_addr::IDENTITY_GRPC.to_string(),
PLACEHOLDER_CODE_VERSION, PLACEHOLDER_CODE_VERSION,
DEVICE_TYPE.to_string(), DEVICE_TYPE.to_string(),
) )
.await .await
▲ Show 20 Lines • Show All 136 Lines • Show Last 20 Lines
View Options

services/tunnelbroker/docker/run_tests.sh

Loading...