tests: consolidate envoy Cluster defaults #1782
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
|
reviewing now ... |
davecheney
approved these changes
Oct 24, 2019
| // Cluster creates new v2.Cluster from dag.Cluster. | ||
| func Cluster(c *dag.Cluster) *v2.Cluster { | ||
| cl := cluster(c) | ||
| service := c.Upstream | ||
| cluster := clusterDefaults() |
There was a problem hiding this comment.
I love the clean up that lets cluster be a local variable. 👍
| @@ -43,18 +58,15 @@ func routeCluster(cluster string) *envoy_api_v2_route.Route_Route { | |||
| } | |||
|
|
|||
| func cluster(name, servicename, statName string) *v2.Cluster { | |||
| return &v2.Cluster{ | |||
| return DefaultCluster(&v2.Cluster{ | |||
There was a problem hiding this comment.
This is a really nice cleanup.
Many tests need to specify default fields for envoy `Cluster` structs so that struct equality tests can succeed. Specifying these defaults in many places is fragile and tends to make it harder to see the field values that actually matter to the tests. Consolidating the defaults into a handful of helpers reduces the overally clutter. We still need a couple of duplicates of the helper so that we can avoid package dependency cycles. This updates projectcontour#1375. Signed-off-by: James Peach <jpeach@vmware.com>
jpeach
force-pushed
the
consolidate-cluster-defaults
branch
from
f363090 to
a906a74
Compare
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.
Many tests need to specify default fields for envoy
Clusterstructsso that struct equality tests can succeed. Specifying these defaults
in many places is fragile and tends to make it harder to see the
field values that actually matter to the tests. Consolidating the
defaults into a handful of helpers reduces the overally clutter.
We still need a couple of duplicates of the helper so that we can
avoid package dependency cycles.
This updates #1375.
Signed-off-by: James Peach jpeach@vmware.com