Page MenuHomePhabricator

[services] Tunnelbroker - Moving the config file to the `~/.config` directory and removing the sandbox config
ClosedPublic

Authored by max on Dec 1 2022, 8:35 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Nov 11, 12:51 AM
Unknown Object (File)
Wed, Nov 6, 7:07 PM
Unknown Object (File)
Wed, Nov 6, 7:07 PM
Unknown Object (File)
Tue, Nov 5, 7:21 AM
Unknown Object (File)
Tue, Nov 5, 7:21 AM
Unknown Object (File)
Mon, Nov 4, 3:57 PM
Unknown Object (File)
Mon, Nov 4, 3:57 PM
Unknown Object (File)
Sun, Oct 27, 6:28 PM
Subscribers

Details

Summary

Moving the config file for Tunnelbroker to the ~/.config directory to unify services configuration. Removing using the "sandbox" config file. Updating services documentation about the new path and removing the sandbox config.

Linear task and full context: ENG-1680

Test Plan
  1. Tunnelbroker service is successfully built.
  2. Config file is successfully read from the new path.

Diff Detail

Repository
rCOMM Comm
Branch
move-config-file
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

max held this revision as a draft.
max published this revision for review.Dec 1 2022, 11:48 AM
max edited the summary of this revision. (Show Details)
max edited the test plan for this revision. (Show Details)
max added reviewers: varun, bartek. max added 1 blocking reviewer(s): jon.

Should also remove the corresponding comm::network::tools::isSandbox() method if it's going to exist within the config file.

This revision is now accepted and ready to land.Dec 2 2022, 9:15 AM

AFAIK the comm::network::tools::isSandbox() is still used in a few other places

In D5790#173107, @jon wrote:

Should also remove the corresponding comm::network::tools::isSandbox() method if it's going to exist within the config file.

It's more complex and used in other C++ services. The task of removing isSandbox is tracked by the ENG-2296.

This revision now requires review to proceed.Dec 2 2022, 10:11 AM
tomek requested changes to this revision.Dec 5 2022, 4:42 AM
tomek added a reviewer: ashoat.

Adding @ashoat because the documentation is changed.

docs/dev_services.md
42–43

Is it a good practice to use this directory? Is it possible that we will have some conflicts with other tools which might decide to use the same directory name?

59

This doesn't read well. Is this sentence inverted in some way?

81

Is it a good idea to just delete this part? Is it no longer relevant, or should be just updated?

This revision now requires changes to proceed.Dec 5 2022, 4:42 AM
ashoat added a reviewer: Restricted Owners Package.Dec 5 2022, 6:23 AM
ashoat added inline comments.
docs/dev_services.md
59

Yeah this needs to be fixed up

ashoat requested changes to this revision.Dec 5 2022, 6:23 AM
max marked an inline comment as done.
max marked 3 inline comments as done.

Fix configuration file template sentence in a doc.

docs/dev_services.md
42–43

Is it a good practice to use this directory? Is it possible that we will have some conflicts with other tools which might decide to use the same directory name?

We have a discussion with @jon about the flexibility of services configuration and ~/.config/$service.ini seems a good way to go on. Not seeing any conflicts here.

59

This doesn't read well. Is this sentence inverted in some way?

Hope it reads better now.

81

Is it a good idea to just delete this part? Is it no longer relevant, or should be just updated?

We didn't remove the sandbox yet. We've removed usage of the tunnelbroker-dev config file and use a single config file. That's why I've removed only the part.

Is it possible for anybody else to rewrite @max's English before I take a pass? Please re-add me once it's ready to go

Is it possible for anybody else to rewrite @max's English before I take a pass? Please re-add me once it's ready to go

I think @varun can take a quick look.

tomek added 1 blocking reviewer(s): varun.
varun requested changes to this revision.Dec 6 2022, 7:27 PM
varun added inline comments.
docs/dev_services.md
59 ↗(On Diff #19171)

Did you mean services/tunnelbroker/tunnelbroker-sandbox.ini? Also I don't think we need to mention this at all since the user is probably just going to copy-paste the above config, right?

This revision now requires changes to proceed.Dec 6 2022, 7:27 PM

Removing a sentence with the config file.

max added inline comments.
docs/dev_services.md
59 ↗(On Diff #19171)

Did you mean services/tunnelbroker/tunnelbroker-sandbox.ini?

Yes. tunnelbroker-sandbox.ini moved to tunnelbroker.ini.

Also I don't think we need to mention this at all since the user is probably just going to copy-paste the above config, right?

I think you're right. We can just remove it as the config will be copy pasted from the doc or created from the scratch for production.

I've removed it.

This revision is now accepted and ready to land.Dec 7 2022, 6:27 AM
This revision now requires review to proceed.Dec 7 2022, 7:21 AM

Looks great, thanks!!

This revision is now accepted and ready to land.Dec 8 2022, 8:47 AM