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

[dev] Fix panic when deploying bundles where maps have nil values #10565

Merged

Conversation

achilleasa
Copy link
Contributor

@achilleasa achilleasa commented Aug 27, 2019

Description of change

The charm.v6 code that checks base bundles for the presence of overlay-specific options had a bug where the validation code would crash if the base bundle provided map entries (e.g. in options) with nil values.

This PR simply bumps the charm.v6 version to bring in the fix from juju/charm#290

Note: this bug only affects dev releases and does not need to be back-ported to 2.6 as 2.6 does not use the same code path.

QA steps

Try to deploy the following bundle with the latest edge snap (with --dry-run)
to verify it crashes. Then deploy the same with a juju binary built from
this PR to verify that it does not crash (you will get unknown option errors as
the options are bogus)

# ssl_ca is left uninitialized so it resolves to nil
ssl_ca: &ssl_ca

applications:
  apache2:
    charm: apache2
    options:
      foo: bar
      ssl_ca: *ssl_ca
series: bionic

Bug reference

https://bugs.launchpad.net/juju/+bug/1841105

The new version contains a fix for correctly handling nil values in
bundle options while checking base bundles for the presence of
overlay-specific fields.
Copy link
Member

@manadart manadart left a comment

Choose a reason for hiding this comment

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

QA all good.

@achilleasa
Copy link
Contributor Author

$$merge$$

@jujubot jujubot merged commit 92afe44 into juju:develop Aug 27, 2019
@achilleasa achilleasa deleted the dev-fix-panic-for-nil-options-in-bundles branch August 27, 2019 12:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants