-
Notifications
You must be signed in to change notification settings - Fork 102
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[JUJU-3999] Avoid parsing endpoint for overlay offers #887
Merged
jujubot
merged 10 commits into
juju:master
from
cderici:avoid-parsing-endpoint-for-overlay-offers
Jun 26, 2023
Merged
[JUJU-3999] Avoid parsing endpoint for overlay offers #887
jujubot
merged 10 commits into
juju:master
from
cderici:avoid-parsing-endpoint-for-overlay-offers
Jun 26, 2023
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
This reverts commit 7352368.
2 tasks
sed-i
approved these changes
Jun 23, 2023
SimonRichardson
approved these changes
Jun 26, 2023
/merge |
jujubot
added a commit
that referenced
this pull request
Jul 20, 2023
#920 ## What's Changed * Update readme and add some docstrings for functions by @cderici in #873 * Forward port subordinate utils by @cderici in #880 * [JUJU-3952] Revisit access control levels by @cderici in #882 * [JUJU-3999] Avoid parsing endpoint for overlay offers by @cderici in #887 * Forward port upgrade resource fixes in app refresh by @cderici in #889 * [JUJU-4076] Rename `wait_for_units` and make semantics clearer by @cderici in #890 * Stabilize sphinx build on RTD by @cderici in #899 * Move test utils into a separate module by @cderici in #903 * Remove title prefixes from issue templates by @cderici in #904 * [JUJU-4048] Use GetChangesMapArgs for bundle changes by @jack-w-shaw in #907 * Forward ports from 2.9 to 3.x by @cderici in #910 * Remove ceiling on pyyaml version by @cderici in #918 [JUJU-3952]: https://warthogs.atlassian.net/browse/JUJU-3952?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-3999]: https://warthogs.atlassian.net/browse/JUJU-3999?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-4076]: https://warthogs.atlassian.net/browse/JUJU-4076?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [JUJU-4048]: https://warthogs.atlassian.net/browse/JUJU-4048?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
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.
Description
This is an addendum PR on #817, that attempts to fix #816.
So the main thing here is that we don't accept endpoints that are not in
"<application-name>:<endpoint-name>[,...]"
format, like:$ j offer grafana ERROR endpoints must conform to format "<application-name>:<endpoint-name>[,...]"
unless, it's coming from a bundle overlay, such as:
Pylibjuju already has the necessary mechanism that passes along the application name and offer name etc from a bundle/overlay (here), this PR is a small change that adjusts the
controller.create_offer
(that actually calls theApplicationOffersFacade.Offer
) to not parse the endpoint to get theoffer_name
andapplication_name
(that the function parameters are overriding anyways).Fixes #816
QA Steps
#817 already adds a test that demonstrates the error, this PR extends that to also check for the offer in the model. So the following should pass: