b5927f10c4
- 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>
109 lines
3.6 KiB
Go
109 lines
3.6 KiB
Go
package host
|
|
|
|
import (
|
|
"path/filepath"
|
|
"testing"
|
|
)
|
|
|
|
var (
|
|
v1conf = []byte(`{
|
|
"ConfigVersion": 1,
|
|
"Driver": {
|
|
"IPAddress": "192.168.99.100",
|
|
"SSHUser": "docker",
|
|
"SSHPort": 64477,
|
|
"MachineName": "foobar",
|
|
"CaCertPath": "/Users/catbug/.docker/machine/certs/ca.pem",
|
|
"PrivateKeyPath": "/Users/catbug/.docker/machine/certs/ca-key.pem",
|
|
"SwarmMaster": false,
|
|
"SwarmHost": "tcp://0.0.0.0:3376",
|
|
"SwarmDiscovery": "",
|
|
"CPU": 1,
|
|
"Memory": 1024,
|
|
"DiskSize": 20000,
|
|
"Boot2DockerURL": "",
|
|
"Boot2DockerImportVM": "",
|
|
"HostOnlyCIDR": "192.168.99.1/24"
|
|
},
|
|
"DriverName": "virtualbox",
|
|
"HostOptions": {
|
|
"Driver": "",
|
|
"Memory": 0,
|
|
"Disk": 0,
|
|
"EngineOptions": {
|
|
"ArbitraryFlags": [],
|
|
"Dns": null,
|
|
"GraphDir": "",
|
|
"Env": [],
|
|
"Ipv6": false,
|
|
"InsecureRegistry": [],
|
|
"Labels": [],
|
|
"LogLevel": "",
|
|
"StorageDriver": "",
|
|
"SelinuxEnabled": false,
|
|
"TlsCaCert": "",
|
|
"TlsCert": "",
|
|
"TlsKey": "",
|
|
"TlsVerify": true,
|
|
"RegistryMirror": [],
|
|
"InstallURL": "https://get.docker.com"
|
|
},
|
|
"SwarmOptions": {
|
|
"IsSwarm": false,
|
|
"Address": "",
|
|
"Discovery": "",
|
|
"Master": false,
|
|
"Host": "tcp://0.0.0.0:3376",
|
|
"Image": "swarm:latest",
|
|
"Strategy": "spread",
|
|
"Heartbeat": 0,
|
|
"Overcommit": 0,
|
|
"TlsCaCert": "",
|
|
"TlsCert": "",
|
|
"TlsKey": "",
|
|
"TlsVerify": false,
|
|
"ArbitraryFlags": []
|
|
},
|
|
"AuthOptions": {
|
|
"StorePath": "",
|
|
"CaCertPath": "/Users/catbug/.docker/machine/certs/ca.pem",
|
|
"CaCertRemotePath": "",
|
|
"ServerCertPath": "/Users/catbug/.docker/machine/machines/foobar/server.pem",
|
|
"ServerKeyPath": "/Users/catbug/.docker/machine/machines/foobar/server-key.pem",
|
|
"ClientKeyPath": "/Users/catbug/.docker/machine/certs/key.pem",
|
|
"ServerCertRemotePath": "",
|
|
"ServerKeyRemotePath": "",
|
|
"PrivateKeyPath": "/Users/catbug/.docker/machine/certs/ca-key.pem",
|
|
"ClientCertPath": "/Users/catbug/.docker/machine/certs/cert.pem"
|
|
}
|
|
},
|
|
"StorePath": "/Users/catbug/.docker/machine/machines/foobar"
|
|
}`)
|
|
)
|
|
|
|
func TestMigrateHostV1ToHostV2(t *testing.T) {
|
|
h := &Host{}
|
|
expectedGlobalStorePath := "/Users/catbug/.docker/machine"
|
|
expectedCaPrivateKeyPath := "/Users/catbug/.docker/machine/certs/ca-key.pem"
|
|
migratedHost, migrationPerformed, err := MigrateHost(h, v1conf)
|
|
if err != nil {
|
|
t.Fatalf("Error attempting to migrate host: %s", err)
|
|
}
|
|
|
|
if !migrationPerformed {
|
|
t.Fatal("Expected a migration to be reported as performed but it was not")
|
|
}
|
|
|
|
if migratedHost.HostOptions.AuthOptions.StorePath != expectedGlobalStorePath {
|
|
t.Fatalf("Expected %q, got %q for the store path in AuthOptions", migratedHost.HostOptions.AuthOptions.StorePath, expectedGlobalStorePath)
|
|
}
|
|
|
|
if migratedHost.HostOptions.AuthOptions.CaPrivateKeyPath != expectedCaPrivateKeyPath {
|
|
t.Fatalf("Expected %q, got %q for the private key path in AuthOptions", migratedHost.HostOptions.AuthOptions.CaPrivateKeyPath, expectedCaPrivateKeyPath)
|
|
}
|
|
|
|
if migratedHost.HostOptions.AuthOptions.CertDir != filepath.Join(expectedGlobalStorePath, "certs") {
|
|
t.Fatalf("Expected %q, got %q for the cert dir in AuthOptions", migratedHost.HostOptions.AuthOptions.CaPrivateKeyPath, expectedGlobalStorePath)
|
|
}
|
|
}
|