mirror of
https://github.com/token2/snapd.git
synced 2026-03-13 11:15:47 -07:00
c57901e705
* o/assertstate, o/devicestate: add more general function for fetching validation set assertions * daemon, client: add API routes for creating/removing recovery system * daemon, o/snapstate: add .snap file extension to snaps from forms The seed writer will fail to consider files as snaps if their filenames do not end in .snap. * tests: test creating a recovery system * tests: add spread test for offline creation of recovery system * tests: update offline recovery system test to reboot into new system * tests/nested/manual/recovery-system-reboot: add variants for factory-reset and install modes * tests: replace usage of default-recovery-system with default-recovery * o/devicestate: enable offline creation of recovery system entirely from pre-installed snaps * daemon, client: test that offline API works without providing snaps or validation sets * tests/nested/manual/recovery-system-offline: test offline remodel with only pre-installed snaps * tests/nested/manual/recovery-system-reboot: modify test to create system with new set of essential snaps * tests: disable shellcheck printf check * daemon: rename functions for working with form values and add one for working with booleans * daemon: acquire state lock later in postSystemActionCreateOffline * daemon: cleanup form files if we fail to make change to create a recovery system * daemon: rename parseValidationSets to assertionsFromValidationSetStrings for clarity * client, daemon, tests: add "offline" field to create recovery system JSON api * daemon: convert TODO about comma-delimited list into explanation of why we use a comma delimited list * NEWS.md: add mention of create/remove recovery systems API * tests/nested/manual/recovery-system-offline: explicitly disable network from nested vm * tests/nested/manual/recovery-system-reboot: do not use new gadget in recovery system for now * tests/lib/nested.sh: add variable NESTED_FORCE_MS_KEYS to force using microsoft keys * tests/nested/manual/recovery-system-reboot: add back gadget snap swap to test * tests/nested/manual/recovery-system-reboot: retry POST to remove since there might be an auto-refresh happening
71 lines
2.5 KiB
Go
71 lines
2.5 KiB
Go
// -*- Mode: Go; indent-tabs-mode: t -*-
|
|
|
|
/*
|
|
* Copyright (C) 2020 Canonical Ltd
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 3 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
package daemon
|
|
|
|
import (
|
|
"github.com/snapcore/snapd/gadget"
|
|
"github.com/snapcore/snapd/overlord/devicestate"
|
|
"github.com/snapcore/snapd/overlord/install"
|
|
"github.com/snapcore/snapd/overlord/state"
|
|
"github.com/snapcore/snapd/testutil"
|
|
)
|
|
|
|
func MockDeviceManagerReboot(f func(*devicestate.DeviceManager, string, string) error) (restore func()) {
|
|
old := deviceManagerReboot
|
|
deviceManagerReboot = f
|
|
return func() {
|
|
deviceManagerReboot = old
|
|
}
|
|
}
|
|
|
|
type (
|
|
SystemsResponse = systemsResponse
|
|
)
|
|
|
|
func MockDeviceManagerSystemAndGadgetAndEncryptionInfo(f func(*devicestate.DeviceManager, string) (*devicestate.System, *gadget.Info, *install.EncryptionSupportInfo, error)) (restore func()) {
|
|
restore = testutil.Backup(&deviceManagerSystemAndGadgetAndEncryptionInfo)
|
|
deviceManagerSystemAndGadgetAndEncryptionInfo = f
|
|
return restore
|
|
}
|
|
|
|
func MockDevicestateInstallFinish(f func(*state.State, string, map[string]*gadget.Volume) (*state.Change, error)) (restore func()) {
|
|
restore = testutil.Backup(&devicestateInstallFinish)
|
|
devicestateInstallFinish = f
|
|
return restore
|
|
}
|
|
|
|
func MockDevicestateInstallSetupStorageEncryption(f func(*state.State, string, map[string]*gadget.Volume) (*state.Change, error)) (restore func()) {
|
|
restore = testutil.Backup(&devicestateInstallSetupStorageEncryption)
|
|
devicestateInstallSetupStorageEncryption = f
|
|
return restore
|
|
}
|
|
|
|
func MockDevicestateCreateRecoverySystem(f func(*state.State, string, devicestate.CreateRecoverySystemOptions) (*state.Change, error)) (restore func()) {
|
|
restore = testutil.Backup(&devicestateCreateRecoverySystem)
|
|
devicestateCreateRecoverySystem = f
|
|
return restore
|
|
}
|
|
|
|
func MockDevicestateRemoveRecoverySystem(f func(*state.State, string) (*state.Change, error)) (restore func()) {
|
|
restore = testutil.Backup(&devicestateRemoveRecoverySystem)
|
|
devicestateRemoveRecoverySystem = f
|
|
return restore
|
|
}
|