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.

Sign up for GitHub

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

Jump to bottom

cmd/snap: snap refresh --time with new and legacy schedules #4487

Merged
merged 18 commits into from Jan 30, 2018
Merged

cmd/snap: snap refresh --time with new and legacy schedules #4487

merged 18 commits into from Jan 30, 2018

Commits on Jan 12, 2018

  1. cmd/snap: snap refresh --timer, hide --time 

    Add --timer command line switch to `snap refresh` command. The switch replaces
--time (now hidden). Passing --time switch, the legacy format of the output is
preserved. When using --timer instead, the output clearly indicates that what is
returned is the new time schedule.

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    @bboozzoo
    bboozzoo committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    fb2477d View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2018

  1. cmd/snap: simplify --time[r] & channel/mode error handling 

    Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    @bboozzoo
    bboozzoo committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    df3c49a View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2018

  1. Merge remote-tracking branch 'origin/master' into bboozzoo/cli-snap-r… 

    …efresh-timer-wip
    @bboozzoo
    bboozzoo committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    a287fad View commit details
    Browse the repository at this point in the history

  2. overlord/snapstate: indicate whether the refresh schedule is in legac… 

    …y format

Let the callers know whether the refresh schedule was defined using a legacy
format.

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    @bboozzoo
    bboozzoo committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    c6640ab View commit details
    Browse the repository at this point in the history

  3. client: update RefreshInfo to carry both the new and the legacy sched… 

    …ules

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    @bboozzoo
    bboozzoo committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    e15d52e View commit details
    Browse the repository at this point in the history

  4. daemon: use either timer or schedule in refresh info 

    Adjust refresh info returned in sysinfo endpoint depending on the use of the
modern 'refresh.timer' or the legacy 'refresh.schedule' settings. When the new
refresh.timer setting is used only the 'timer' field will be sent. Similarly,
when the legacy setting is in effect, the 'timer' field will not be sent and
'schedule' will be send instead.

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    @bboozzoo
    bboozzoo committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    f639f2c View commit details
    Browse the repository at this point in the history

  5. cmd/snap: drop --timer, adjust the prefix based on contents of refres… 

    …h info

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    @bboozzoo
    bboozzoo committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    cd5e439 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/master' into bboozzoo/cli-snap-r… 

    …efresh-timer-wip
    @bboozzoo
    bboozzoo committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    4207b13 View commit details
    Browse the repository at this point in the history

  7. cmd/snap: simplify timer/schedule check 

    Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    @bboozzoo
    bboozzoo committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    37f9fdb View commit details
    Browse the repository at this point in the history

  8. daemon: extend api tests to cover new and legacy schedules both set 

    Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    @bboozzoo
    bboozzoo committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    48f33d5 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2018

  1. overlord/snapstate: 'managed' is set on a legacy refresh.schedule con… 

    …figuration setting

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    @bboozzoo
    bboozzoo committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    6944163 View commit details
    Browse the repository at this point in the history

  2. overlord/snapstate: use named return args in RefreshSchedule() 

    Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    @bboozzoo
    bboozzoo committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    a80b9f2 View commit details
    Browse the repository at this point in the history

  3. client: reshuffle Timer and Schedule fields in RefreshInfo 

    Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    @bboozzoo
    bboozzoo committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    79c5f26 View commit details
    Browse the repository at this point in the history

  4. cmd/snap: raise internal error in refresh --time if both timer and … 

    …schedule are empty

Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    @bboozzoo
    bboozzoo committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    174ddef View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2018

  1. Merge remote-tracking branch 'origin/master' into bboozzoo/cli-snap-r… 

    …efresh-timer-wip
    @bboozzoo
    bboozzoo committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    1013951 View commit details
    Browse the repository at this point in the history

  2. client: refine comments on RefreshInfo fields 

    Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    @bboozzoo
    bboozzoo committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    b33c38a View commit details
    Browse the repository at this point in the history

  3. cmd/snap: fine tune internal error messages 

    Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    @bboozzoo
    bboozzoo committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    c1fc08c View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2018

  1. overlord/snapstate: fix typo in the comments 

    Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
    @bboozzoo
    bboozzoo committed Jan 29, 2018
    Configuration menu
    Copy the full SHA
    8d6b922 View commit details
    Browse the repository at this point in the history