Fix JcloudsLocation config usage #710
Merged
Conversation
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
It now combines the config().getBag() with the config passed in.
Use `setup` (which combines location’s config and args passed to obtain(), such as from entity’s `provisioning.properties`).
…pecial Just rely on any `sshToolClass` config being passed in the ConfigBag arg (rather than also looking up jcloudsLocation.config()). The passed in ConfigBag should be a merger of the location’s config and any additional config that has been passed in.
aledsage
force-pushed
the
fix-JcloudsLocation-config-usage
branch
from
b414712 to
49543d0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Ensure we use the
ConfigBagthat we pass into the methods (rather thanlocation.config().get(...)) because the ConfigBag will contain the union of the location's config along with any overrides/additions that were passed in to methods likeobtain()(e.g. via an entity'sprovisioning.properties).See individual commits for details.
Much longer term, all this config usage is a bit worrying! For an entity, there is special config lookup so that it correctly handles inherited config etc. For locations, we don't have runtime-management inheritance (which is a relief!) so things are a lot simpler. But the big code differences between Location and Entity are worrying.