Skip to content
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

Pass channel back when resolving. #91

Merged
merged 1 commit into from
Feb 22, 2021

Conversation

SimonRichardson
Copy link
Member

The following changes updates the revision getter to now pass back the
channel. Updating any code to ensure that we rename any old naming to
the new one.

Unfortunately we have to request the channel before we can check the
equality, previously we checked just the channels. This became a problem
when the existing application had been resolved even if the channel was
empty, yet the bundle was still shown to be empty. Effectively
preventing the deployment of bundles with empty channels. The new unit
tests ensure we get the correct error message based on the content of
the model and the bundle.

The following changes updates the revision getter to now pass back the
channel. Updating any code to ensure that we rename any old naming to
the new one.

Unfortunately we have to request the channel before we can check the
equality, previously we checked just the channels. This became a problem
when the existing application had been resolved even if the channel was
empty, yet the bundle was still shown to be empty. Effectively
preventing the deployment of bundles with empty channels. The new unit
tests ensure we get the correct error message based on the content of
the model and the bundle.
Copy link
Contributor

@achilleasa achilleasa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@SimonRichardson
Copy link
Member Author

$$merge$$

@jujubot jujubot merged commit a62d69d into juju:v4 Feb 22, 2021
@SimonRichardson SimonRichardson deleted the upgrade-charm-channel branch February 22, 2021 16:55
@SimonRichardson SimonRichardson mentioned this pull request Feb 24, 2021
jujubot added a commit that referenced this pull request Feb 24, 2021
#93

Merge conflict for changes_test.go - merge was resolved easily.

e3037fe (upstream/v4, origin/v4, v4) Merge pull request #92 from SimonRichardson/upgrade-charm-channel
a62d69d Merge pull request #91 from SimonRichardson/upgrade-charm-channel
889cd22 Merge pull request #90 from SimonRichardson/upgrade-charm-channel
350614c Merge pull request #89 from SimonRichardson/application-channel
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants