~mastier1/charm-ubuntu-advantage:master

Branch merges

Propose for merging

On hold for merging into charm-ubuntu-advantage:master

Tom Haddon: Needs Fixing on 2021-12-13

Canonical IS Reviewers: Pending requested 2021-12-03

Diff: 159 lines (+36/-24)

1 file modified

src/charm.py (+36/-24)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

670a954... by Bartosz Woronicz on 2021-12-03

Add support for proxy settings from the model

Closes-Bug: 1944591

a0f3abf... by Tom Haddon on 2021-11-02

Update readme to use charmhub location

Reviewed-on: https://code.launchpad.net/~mthaddon/charm-ubuntu-advantage/+git/charm-ubuntu-advantage/+merge/411170
Reviewed-by: Colin Misare <email address hidden>

f423771... by Tom Haddon on 2021-11-02

Update readme to use charmhub location

5d93cdb... by Colin Misare on 2021-05-06

Bug fix and improved logging

- Pinning to ops==1.1.0 until until https://github.com/canonical/operator/pull/520 is published to allow the charm to run on xenial
- Adding a bit more logging
- Fixing an issue with open() in 'r+' mode where truncate() wasn't being called which led to extra content at the end of the file

Reviewed-on: https://code.launchpad.net/~cmisare/charm-ubuntu-advantage/+git/charm-ubuntu-advantage/+merge/402298
Reviewed-by: Haw Loeung <email address hidden>

1a08cb2... by Colin Misare on 2021-05-06

bug fix and improved logging

5078ac0... by Colin Misare on 2021-04-13

Lots of fixes and refactoring:

- Fix command in README to use the correctly named 'token' configuration value
- Switch contract_url to be a juju default config value instead of code default value
- Cleaner file read/write behavior for uaclient.conf
- Fixed subscription flow to behave correctly with default values and changed config values
- Update tests to create mocks in setUp so every test will have default mocks instead of accidentally making real subprocess or open calls
- Cleaned up tests to only verify what that test cares about, and rely on other tests to correctly verify their own behavior
- Minor formatting updates around double and single quotes

Reviewed-on: https://code.launchpad.net/~cmisare/charm-ubuntu-advantage/+git/charm-ubuntu-advantage/+merge/400942
Reviewed-by: Tom Haddon <email address hidden>

df6a08b... by Colin Misare on 2021-04-13

few more small changes based on feedback

45397d3... by Colin Misare on 2021-04-12

large refactor

fab645f... by Domas Monkus on 2021-04-08

Add a contract_url charm configuration option to the ubuntu-advantage charm.

Reviewed-on: https://code.launchpad.net/~tasdomas/charm-ubuntu-advantage/+git/charm-ubuntu-advantage/+merge/400568
Reviewed-by: Colin Misare <email address hidden>

71531df... by Domas Monkus on 2021-04-06

Address review comments.