mirror of
https://github.com/docker/docs.git
synced 2026-11-06 12:54:24 +03:00
- Clear out some cruft tightly coupling libmachine to filestore - Comment out drivers other than virtualbox for now - Change way too many things - Mostly, break out the code to be more modular. - Destroy all traces of "provider" in its current form. It will be brought back as something more sensible, instead of something which overlaps in function with both Host and Store. - Fix mis-managed config passthru - Remove a few instances of state stored in env vars - This should be explicitly communicated in Go-land, not through the shell. - Rename "store" module to "persist" - This is done mostly to avoid confusion about the fact that a concrete instance of a "Store" interface is oftentimes referred to as "store" in the code. - Rip out repetitive antipattern for getting store - This replaces the previous repetive idiom for getting the cert info, and consequently the store, with a much less repetitive idiom. - Also, some redundant methods in commands.go for accessing hosts have either been simplified or removed entirely. - First steps towards fixing up tests - Test progress continues - Replace unit tests with integration tests - MAKE ALL UNIT TESTS PASS YAY - Add helper test files - Don't write to disk in libmachine/host - Heh.. coverage check strikes again - Fix remove code - Move cert code around - Continued progress: simplify Driver - Fixups and make creation work with new model - Move drivers module inside of libmachine - Move ssh module inside of libmachine - Move state module to libmachine - Move utils module to libmachine - Move version module to libmachine - Move log module to libmachine - Modify some constructor methods around - Change Travis build dep structure - Boring gofmt fix - Add version module - Move NewHost to store - Update some boring cert path infos to make API easier to use - Fix up some issues around the new model - Clean up some cert path stuff - Don't use shady functions to get store path :D - Continue artifact work - Fix silly machines dir bug - Continue fixing silly path issues - Change up output of vbm a bit - Continue work to make example go - Change output a little more - Last changes needed to make create finish properly - Fix config.go to use libmachine - Cut down code duplication and make both methods work with libmachine - Add pluggable logging implementation - Return error when machine already in desired state - Update example to show log method - Fix file:// bug - Fix Swarm defaults - Remove unused TLS settings from Engine and Swarm options - Remove spurious error - Correct bug detecting if migration was performed - Fix compilation errors from tests - Fix most of remaining test issues - Fix final silly bug in tests - Remove extraneous debug code - Add -race to test command - Appease the gofmt - Appease the generate coverage - Making executive decision to remove Travis coverage check In the early days I thought this would be a good idea because it would encourage people to write tests in case they added a new module. Well, in fact it has just turned into a giant nuisance and made refactoring work like this even more difficult. - Move Get to Load - Move HostListItem code to CLI Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
79 lines
2.1 KiB
Go
79 lines
2.1 KiB
Go
package host
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"path/filepath"
|
|
|
|
"github.com/docker/machine/drivers/driverfactory"
|
|
"github.com/docker/machine/libmachine/version"
|
|
)
|
|
|
|
func getMigratedHostMetadata(data []byte) (*HostMetadata, error) {
|
|
// HostMetadata is for a "first pass" so we can then load the driver
|
|
var (
|
|
hostMetadata *HostMetadataV0
|
|
)
|
|
|
|
if err := json.Unmarshal(data, &hostMetadata); err != nil {
|
|
return &HostMetadata{}, err
|
|
}
|
|
|
|
migratedHostMetadata := MigrateHostMetadataV0ToHostMetadataV1(hostMetadata)
|
|
|
|
return migratedHostMetadata, nil
|
|
}
|
|
|
|
func MigrateHost(h *Host, data []byte) (*Host, bool, error) {
|
|
var (
|
|
migrationPerformed = false
|
|
hostV1 *HostV1
|
|
)
|
|
|
|
migratedHostMetadata, err := getMigratedHostMetadata(data)
|
|
if err != nil {
|
|
return &Host{}, false, err
|
|
}
|
|
|
|
globalStorePath := filepath.Dir(filepath.Dir(migratedHostMetadata.HostOptions.AuthOptions.StorePath))
|
|
|
|
driver, err := driverfactory.NewDriver(migratedHostMetadata.DriverName, h.Name, globalStorePath)
|
|
if err != nil {
|
|
return &Host{}, false, err
|
|
}
|
|
|
|
if migratedHostMetadata.ConfigVersion == version.ConfigVersion {
|
|
h.Driver = driver
|
|
if err := json.Unmarshal(data, &h); err != nil {
|
|
return &Host{}, migrationPerformed, fmt.Errorf("Error unmarshalling most recent host version: %s", err)
|
|
}
|
|
} else {
|
|
migrationPerformed = true
|
|
for h.ConfigVersion = migratedHostMetadata.ConfigVersion; h.ConfigVersion < version.ConfigVersion; h.ConfigVersion++ {
|
|
switch h.ConfigVersion {
|
|
case 0:
|
|
hostV0 := &HostV0{
|
|
Driver: driver,
|
|
}
|
|
if err := json.Unmarshal(data, &hostV0); err != nil {
|
|
return &Host{}, migrationPerformed, fmt.Errorf("Error unmarshalling host config version 0: %s", err)
|
|
}
|
|
hostV1 = MigrateHostV0ToHostV1(hostV0)
|
|
case 1:
|
|
if hostV1 == nil {
|
|
hostV1 = &HostV1{
|
|
Driver: driver,
|
|
}
|
|
if err := json.Unmarshal(data, &hostV1); err != nil {
|
|
return &Host{}, migrationPerformed, fmt.Errorf("Error unmarshalling host config version 1: %s", err)
|
|
}
|
|
}
|
|
h = MigrateHostV1ToHostV2(hostV1)
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
return h, migrationPerformed, nil
|
|
}
|