[JUJU-1823] Bug 1990182 refresh cs to ch #14628
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
In case an OS for the Series is not provided in the Platform, determine the OS if a series is specified. Helps to ensure that charmhub requests are valid.
In case an OS for the Series is not provided in the Platform, determine the OS if a series is specified. Helps to ensure that charmhub requests are valid. Validate the origin has a platform.
cderici
approved these changes
Sep 19, 2022
Represent changes to DeduceOrigin and Resolve charm where an OS is added to the origin if a series is present.
benhoyt
approved these changes
Sep 21, 2022
|
/merge |
2 similar comments
|
/merge |
|
/merge |
jujubot
added a commit
that referenced
this pull request
Sep 26, 2022
#14661 Merge 2.9 #14637 #14638 #14641 #14612 #14646 #14647 #14649 #14628 #14654 Conflicts ``` # Conflicts: # apiserver/facades/client/application/deploy.go # apiserver/facades/client/charmhub/charmhub_test.go # apiserver/facades/client/charmhub/convert.go # apiserver/facades/client/charms/conversions.go # apiserver/facades/client/machinemanager/machinemanager.go # apiserver/facades/client/machinemanager/machinemanager_test.go # apiserver/facades/client/machinemanager/register.go # apiserver/facades/client/resources/repository.go # apiserver/facades/schema.json # cmd/juju/application/deploy_test.go # cmd/juju/application/deployer/bundlehandler.go # cmd/juju/machine/add.go # core/charm/strategies.go # core/charm/strategies_test.go # core/series/supportedseries.go # core/series/supportedseries_test.go # environs/manual/winrmprovisioner/provisioner_test.go # rpc/params/applications.go # rpc/params/params.go # state/charm.go # tests/includes/storage.sh ``` ## Checklist - [X] Code style: imports ordered, good names, simple structure, etc - [X] Comments saying why design decisions were made - [X] Go unit tests, with comments saying what you're testing - ~[ ] [Integration tests](https://github.com/juju/juju/tree/develop/tests), with comments saying what you're testing~ - ~[ ] [doc.go](https://discourse.charmhub.io/t/readme-in-packages/451) added or updated in changed packages~ ## QA steps See PRs
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.
The charm origin for charmstore charms does not contain an os, but does contain a series. This creates a problem when refreshing an application using the switch flag to go from a charmstore version of the charm to a charmhub version of the charm. The refresh request made to charmhub is containing an Series while missing the OS and fails.
No upgrade step is necessary due to the validation and fixing done by these changes in this PR. If a series is correct, juju can always determine an OS for it. Do so if DeduceOrigin or ResolveCharm only have a series in the arguments. This is helps protect against bad requests from non juju clients as well when ResolveCharm is called.
Drive by change to not require mongo in testing when it's not used included
QA steps
Bug reference
This PR fixes part of the bug. To fix the remainer, an
apt update,apt upgradeof the controller machines is required. The/usr/share/distro-info/ubuntu.csvfile is out of date. Jujud on the controller(s) must be restarted after the file is updated.https://bugs.launchpad.net/juju/+bug/1990182