Minor cleanup in the config tests #188
Merged
Conversation
This file contains 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
hawkw
approved these changes
Feb 8, 2019
| @@ -62,7 +62,7 @@ impl Controller { | |||
| let dst = pb::GetDestination { | |||
| scheme: "k8s".into(), | |||
| path, | |||
| proxy_id: "foo.deployment.default.linkerd-managed.linkerd.svc.cluster.local".into(), | |||
| proxy_id: String::new(), | |||
There was a problem hiding this comment.
TIOLI:
Suggested change
| proxy_id: String::new(), | |
| ..Default::default() |
to use the default initializer for all other fields. This means the code will still compile if the proto adds fields later.
There was a problem hiding this comment.
I'd be inclined to leave it. I'm not yet familiar with rust style or idioms but String::new() feels more explicit to me than Default::default(). And I feel like compilation failing when we add proto fields is a good thing as it forces us to decide what we want to do about those fields.
There was a problem hiding this comment.
That's fair. String::new is definitely more idiomatic in general, I've just been bitten in the past by proto changes breaking a bunch of tests when those fields aren't actually required by the test...
There was a problem hiding this comment.
i think the default approach is fine for protobuf structs, especially in tests. but i don't feel strongly.
| @@ -98,7 +98,7 @@ impl Controller { | |||
| let dst = pb::GetDestination { | |||
| scheme: "k8s".into(), | |||
| path, | |||
| proxy_id: "foo.deployment.default.linkerd-managed.linkerd.svc.cluster.local".into(), | |||
| proxy_id: String::new(), | |||
There was a problem hiding this comment.
Same as above,
Suggested change
| proxy_id: String::new(), | |
| ..Default::default() |
olix0r
approved these changes
Feb 15, 2019
Signed-off-by: Alex Leong <alex@buoyant.io>
Signed-off-by: Alex Leong <alex@buoyant.io>
adleong
force-pushed
the
alex/183-followup
branch
from
9c41a9e
to
797eda7
Compare
ihcsim
pushed a commit
to linkerd/linkerd2
that referenced
this pull request
Feb 27, 2019
This picks up the following commits: * 0fe8063 replace with (#2370) (linkerd/linkerd2-proxy#201) * 1ea7559 Minor cleanup in the config tests (linkerd/linkerd2-proxy#188) * d0ef56b Update *ring* to 0.14.6 (linkerd/linkerd2-proxy#197) * c54377f fs-watch: Use a properly sized buffer for inotify events (linkerd/linkerd2-proxy#195) * 23e02a6 Update Router to wait for inner poll_ready before calling inner call * 2de8e9b Update metrics quickcheck to 0.8, and hyper to 0.12.24 * d1bbd4b make: Optionally include debug symbols with builds (linkerd/linkerd2-proxy#193) * 738a541 Fix compilation warnings in fs-watch (linkerd/linkerd2-proxy#192) * 6cc7558 Apply rustfmt (linkerd/linkerd2-proxy#191) Signed-off-by: Ivan Sim <ivan@buoyant.io>
ihcsim
pushed a commit
to linkerd/linkerd2
that referenced
this pull request
Feb 27, 2019
This picks up the following commits: * 0fe8063 replace `Error::cause` with `Error::source` (#2370) (linkerd/linkerd2-proxy#201) * 1ea7559 Minor cleanup in the config tests (linkerd/linkerd2-proxy#188) * d0ef56b Update *ring* to 0.14.6 (linkerd/linkerd2-proxy#197) * c54377f fs-watch: Use a properly sized buffer for inotify events (linkerd/linkerd2-proxy#195) * 23e02a6 Update Router to wait for inner poll_ready before calling inner call * 2de8e9b Update metrics quickcheck to 0.8, and hyper to 0.12.24 * d1bbd4b make: Optionally include debug symbols with builds (linkerd/linkerd2-proxy#193) * 738a541 Fix compilation warnings in fs-watch (linkerd/linkerd2-proxy#192) * 6cc7558 Apply rustfmt (linkerd/linkerd2-proxy#191) Signed-off-by: Ivan Sim <ivan@buoyant.io>
ihcsim
added a commit
to linkerd/linkerd2
that referenced
this pull request
Feb 27, 2019
This picks up the following commits: * 0fe8063 replace `Error::cause` with `Error::source` (#2370) (linkerd/linkerd2-proxy#201) * 1ea7559 Minor cleanup in the config tests (linkerd/linkerd2-proxy#188) * d0ef56b Update *ring* to 0.14.6 (linkerd/linkerd2-proxy#197) * c54377f fs-watch: Use a properly sized buffer for inotify events (linkerd/linkerd2-proxy#195) * 23e02a6 Update Router to wait for inner poll_ready before calling inner call * 2de8e9b Update metrics quickcheck to 0.8, and hyper to 0.12.24 * d1bbd4b make: Optionally include debug symbols with builds (linkerd/linkerd2-proxy#193) * 738a541 Fix compilation warnings in fs-watch (linkerd/linkerd2-proxy#192) * 6cc7558 Apply rustfmt (linkerd/linkerd2-proxy#191) Signed-off-by: Ivan Sim <ivan@buoyant.io>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.