juju / 1.25-upgrade

Tools to upgrade and move a 1.25 environment to a 2.2.4+ controller
4 stars 7 forks source link

Compile fixes after juju-2.2.2 update #5

Closed babbageclunk closed 7 years ago

babbageclunk commented 7 years ago

Follows on from #4.

Update dependencies needed by 2.2.2. This included juju/description, so there are then changes needed to the juju1 export code to match. juju/txn isn't compatible between juju1 and juju2, so I tweaked the juju2 code to work with the juju1-compatible version.

Updates baseClientCommand to use modelcmd.WrapCommand on advice from @rogpeppe.

Now builds and upgrade-agents is working again with macaroons from the target controller. verify-source is broken (new validation in juju/description that the juju1 export fails) but I'll fix that in a separate PR.