Merged
Conversation
hansl
reviewed
Mar 12, 2020
| .help(UserMessage::ReplicaPort.to_str()) | ||
| .long("port") | ||
| .takes_value(true) | ||
| .default_value("8080") |
Contributor
Author
There was a problem hiding this comment.
We don't want command-line argument defaults when considering the dfx configuration file. The strategy is to first check if the configuration option was provided on the command line, and if it wasn't, then check if the configuration option was specified in the dfx configuration file, otherwise resort to the default value. If you use command-line argument defaults, then you short circuit the dfx configuration file.
hansl
reviewed
Mar 12, 2020
| } | ||
|
|
||
| /// Gets the configuration options for the Internet Computer replica. | ||
| fn get_config(env: &dyn Environment, args: &ArgMatches<'_>) -> DfxResult<ReplicaConfig> { |
Contributor
There was a problem hiding this comment.
I'd like to avoid that an move to using Claps' proc macros instead. This code makes everything more obscure.
Contributor
Author
There was a problem hiding this comment.
Can you elaborate. The logic here is exactly the same as https://github.com/dfinity-lab/sdk/blob/6ba57a72ca7fc3d28741b0fae3884a3722b5bbd5/src/dfx/src/commands/bootstrap.rs#L88
hansl
approved these changes
Mar 13, 2020
Contributor
hansl
left a comment
hansl
left a comment
There was a problem hiding this comment.
Approving this after talking offline with Enzo.
dfinity-bot
added a commit
that referenced
this pull request
Oct 26, 2020
## Changelog for advisory-db: Branch: master Commits: [rustsec/advisory-db@6e48979d...0ad26bc7](rustsec/advisory-db@6e48979...0ad26bc) * [`5751a5f4`](rustsec/advisory-db@5751a5f) CI: bump rustsec-admin to v0.3.0-pre2 ([RustSec/advisory-db#438](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/438)) * [`65441901`](rustsec/advisory-db@6544190) Add unmaintained crate advisory for stdweb ([RustSec/advisory-db#439](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/439)) * [`acc73d95`](rustsec/advisory-db@acc73d9) CI: bump rustsec-admin to v0.3.0-pre3 ([RustSec/advisory-db#440](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/440)) * [`691a7504`](rustsec/advisory-db@691a750) Assigned RUSTSEC-2020-0056 to stdweb ([RustSec/advisory-db#441](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/441)) * [`8505c957`](rustsec/advisory-db@8505c95) Add unmaintained crate advisory for `block-cipher` ([RustSec/advisory-db#442](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/442)) * [`fa616899`](rustsec/advisory-db@fa61689) Assigned RUSTSEC-2020-0057 to block-cipher ([RustSec/advisory-db#443](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/443)) * [`5c9ebbfa`](rustsec/advisory-db@5c9ebbf) Add unmaintained crate advisory for `stream-cipher` ([RustSec/advisory-db#444](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/444)) * [`218de91a`](rustsec/advisory-db@218de91) Assigned RUSTSEC-2020-0058 to stream-cipher ([RustSec/advisory-db#445](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/445)) * [`681a2040`](rustsec/advisory-db@681a204) Add advisory for notable UB fix in libpulse-binding v2.6.0 ([RustSec/advisory-db#435](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/435)) * [`1e48ac39`](rustsec/advisory-db@1e48ac3) Assigned RUSTSEC-2019-0038 to libpulse-binding ([RustSec/advisory-db#446](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/446)) * [`59bee556`](rustsec/advisory-db@59bee55) Add advisory for use-after-frees fixed in libpulse-binding v1.2.1 ([RustSec/advisory-db#433](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/433)) * [`146de2d8`](rustsec/advisory-db@146de2d) Assigned RUSTSEC-2018-0021 to libpulse-binding ([RustSec/advisory-db#447](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/447)) * [`3b1f08f2`](rustsec/advisory-db@3b1f08f) Unyank RUSTSEC-2020-0011 ([RustSec/advisory-db#448](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/448)) * [`3796cc00`](rustsec/advisory-db@3796cc0) README.md: point chat badge to Zulip ([RustSec/advisory-db#449](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/449)) * [`1bf68e0d`](rustsec/advisory-db@1bf68e0) RUSTSEC-2020-0015: use wildcards in version req ([RustSec/advisory-db#450](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/450)) * [`67a2144b`](rustsec/advisory-db@67a2144) RUSTSEC-2020-0015: remove wildcards ([RustSec/advisory-db#451](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/451)) * [`0ad26bc7`](rustsec/advisory-db@0ad26bc) Bump `rustsec-admin` to v0.3.0 ([RustSec/advisory-db#452](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/452))
mergify bot
pushed a commit
that referenced
this pull request
Oct 26, 2020
## Changelog for advisory-db: Branch: master Commits: [rustsec/advisory-db@6e48979d...0ad26bc7](rustsec/advisory-db@6e48979...0ad26bc) * [`5751a5f4`](rustsec/advisory-db@5751a5f) CI: bump rustsec-admin to v0.3.0-pre2 ([RustSec/advisory-db#438](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/438)) * [`65441901`](rustsec/advisory-db@6544190) Add unmaintained crate advisory for stdweb ([RustSec/advisory-db#439](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/439)) * [`acc73d95`](rustsec/advisory-db@acc73d9) CI: bump rustsec-admin to v0.3.0-pre3 ([RustSec/advisory-db#440](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/440)) * [`691a7504`](rustsec/advisory-db@691a750) Assigned RUSTSEC-2020-0056 to stdweb ([RustSec/advisory-db#441](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/441)) * [`8505c957`](rustsec/advisory-db@8505c95) Add unmaintained crate advisory for `block-cipher` ([RustSec/advisory-db#442](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/442)) * [`fa616899`](rustsec/advisory-db@fa61689) Assigned RUSTSEC-2020-0057 to block-cipher ([RustSec/advisory-db#443](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/443)) * [`5c9ebbfa`](rustsec/advisory-db@5c9ebbf) Add unmaintained crate advisory for `stream-cipher` ([RustSec/advisory-db#444](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/444)) * [`218de91a`](rustsec/advisory-db@218de91) Assigned RUSTSEC-2020-0058 to stream-cipher ([RustSec/advisory-db#445](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/445)) * [`681a2040`](rustsec/advisory-db@681a204) Add advisory for notable UB fix in libpulse-binding v2.6.0 ([RustSec/advisory-db#435](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/435)) * [`1e48ac39`](rustsec/advisory-db@1e48ac3) Assigned RUSTSEC-2019-0038 to libpulse-binding ([RustSec/advisory-db#446](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/446)) * [`59bee556`](rustsec/advisory-db@59bee55) Add advisory for use-after-frees fixed in libpulse-binding v1.2.1 ([RustSec/advisory-db#433](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/433)) * [`146de2d8`](rustsec/advisory-db@146de2d) Assigned RUSTSEC-2018-0021 to libpulse-binding ([RustSec/advisory-db#447](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/447)) * [`3b1f08f2`](rustsec/advisory-db@3b1f08f) Unyank RUSTSEC-2020-0011 ([RustSec/advisory-db#448](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/448)) * [`3796cc00`](rustsec/advisory-db@3796cc0) README.md: point chat badge to Zulip ([RustSec/advisory-db#449](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/449)) * [`1bf68e0d`](rustsec/advisory-db@1bf68e0) RUSTSEC-2020-0015: use wildcards in version req ([RustSec/advisory-db#450](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/450)) * [`67a2144b`](rustsec/advisory-db@67a2144) RUSTSEC-2020-0015: remove wildcards ([RustSec/advisory-db#451](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/451)) * [`0ad26bc7`](rustsec/advisory-db@0ad26bc) Bump `rustsec-admin` to v0.3.0 ([RustSec/advisory-db#452](http://r.duckduckgo.com/l/?uddg=https://github.com/RustSec/advisory-db/issues/452))
dfinity-bot
added a commit
that referenced
this pull request
Aug 18, 2021
## Changelog for common: Branch: master Commits: [dfinity-lab/common@d22302d2...ff478f21](https://github.com/dfinity-lab/common/compare/d22302d2d76f0f952f81b07dd0dc7712de36c730...ff478f21adc9e44ce281f9bd376534f3477d205e) * [`ff478f21`](https://github.com/dfinity-lab/common/commit/ff478f21adc9e44ce281f9bd376534f3477d205e) Add Luka Skugor's SSH key to nix accounts ([dfinity-lab/common#452](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/452))
mergify bot
pushed a commit
that referenced
this pull request
Aug 18, 2021
## Changelog for common: Branch: master Commits: [dfinity-lab/common@d22302d2...ff478f21](https://github.com/dfinity-lab/common/compare/d22302d2d76f0f952f81b07dd0dc7712de36c730...ff478f21adc9e44ce281f9bd376534f3477d205e) * [`ff478f21`](https://github.com/dfinity-lab/common/commit/ff478f21adc9e44ce281f9bd376534f3477d205e) Add Luka Skugor's SSH key to nix accounts ([dfinity-lab/common#452](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/452))
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.