Merge pull request #417 from justinsb/fix_tests_2

Fix tests broken by schema pointers

upup/models/bindata.go

@@ -230,7 +230,7 @@ func (fi bindataFileInfo) Sys() interface{} {
 	return nil
 }
 
-var _cloudup_awsMaster_master_asgMaster_asgYaml = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x8c\x54\x3d\x6f\xdb\x30\x10\xdd\xfd\x2b\x0e\x6a\x86\x76\xa8\xd4\x64\x2a\x08\x74\x68\xd2\x22\x31\xda\x14\x46\x1d\x74\xe8\x62\x9c\xe5\xb3\x4c\x44\x22\x05\x1e\x09\xc4\x0e\xf2\xdf\x4b\x52\x94\x2d\x25\x6a\xd3\x49\xe4\xdd\xbd\x77\x5f\x8f\x7a\x7c\x04\x83\xaa\x22\x38\x6b\x40\x7c\x82\x5b\x64\x4b\x86\xe1\xe9\x69\x36\x7b\x03\x9f\x97\xd7\xb0\xd5\x06\x9a\x68\x9d\xd5\xe8\x54\xb9\xbb\xd2\x6a\x2b\x2b\x67\xd0\x4a\xad\x0a\x8f\x3f\x6b\xf2\x1f\xd8\x90\xc7\xe4\x5d\x20\xe7\xde\x7a\x55\xbb\x70\x4e\x1e\x31\x03\x60\xde\x7d\xa3\xbd\x48\xdf\x80\x5c\x2e\x6f\xfc\x29\x85\x84\x08\x2a\x9d\x91\x76\x7f\x6d\xb4\x6b\x39\x60\x00\xde\x8f\xad\xc5\x5f\x53\xf8\x68\x89\xcd\x5c\xb1\x45\x55\xd2\xc2\xe8\xad\xac\x49\x4c\xd8\xfe\x4d\xd1\x60\x45\xf3\x8d\x80\xae\xb1\x65\x4b\x65\x3e\x0f\xb6\xe4\x4e\x54\x77\xfb\x96\x46\x31\xb7\x58\xee\xa4\x8a\xf6\x2e\x12\x99\x75\x29\xd1\xd2\xc2\xad\x6b\x59\xce\x17\x02\xac\x71\xe4\x3d\x8e\xc9\x7c\x41\x8b\x02\x0c\xb1\x76\xa6\x24\x2e\x94\xde\x90\x6b\x73\xde\xc1\xea\xde\xad\xc9\x28\xb2\xc4\xab\x34\x77\x00\xa3\xb5\xfd\xa5\x6b\xd7\xd0\x52\x1e\xba\xc4\x7e\x2d\x7d\xee\x9f\x23\x2f\x64\x17\x1f\xb2\xae\x86\x13\xec\x58\xef\x24\x2c\x56\x9d\x55\xed\x45\xc4\xf9\x28\xb9\x1d\x34\xf6\xb0\x30\xb2\xec\x37\xd4\x6a\x1b\xaf\x02\xb2\x51\xf7\xc7\xa0\x2c\xe0\x49\x6d\xa2\x84\xd0\x59\xcd\x25\xd6\x52\x55\xdd\xf6\x4e\x72\x79\x4d\x2d\x8d\x54\x5d\xaf\xe7\xe1\x82\x0f\xa7\x0b\xbb\xb5\x1f\x4f\x94\xc7\x49\xbd\x87\xa0\xde\xbe\x9c\xdf\x5a\x11\x77\x05\x47\x01\x45\x40\xcc\x7d\x08\x2a\x9d\xda\xfb\xa9\x68\x80\x09\x9d\x8b\x29\xe3\xff\x8a\xdf\x53\x5a\xac\x92\x9e\xef\x3f\x72\x2e\x75\x61\xf4\x51\x88\x7e\x94\xe7\xd9\xd0\xb7\x51\x5c\x48\xe5\x3d\x0a\x6b\xef\xc4\x56\xe6\xfd\xf5\x25\x79\x96\xf6\xa5\xb4\x85\xb7\x37\xc8\x77\x58\x41\x96\x94\xb3\xaa\xd7\xd9\xbb\x7e\x0e\x03\xf2\x36\x4a\x32\x51\x4f\x33\xf6\x1b\xec\xc8\x27\x78\x83\xd7\xff\x21\xac\xf5\xc2\x8f\x3f\x0a\xab\xe1\xeb\xf7\xcb\x59\xad\x71\x73\x89\x75\x78\x24\xa6\xf3\x36\xa4\xec\xf0\xcd\x0d\x46\x36\xb9\xf9\x21\x83\x18\xdd\x8a\xc9\x7a\xc3\x63\x7b\xa6\x33\xf1\xc2\x52\xbc\x92\xf8\x59\xcf\xe9\xf8\x27\x00\x00\xff\xff\xaf\xc8\x6d\x14\x1e\x05\x00\x00")
+var _cloudup_awsMaster_master_asgMaster_asgYaml = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x8c\x54\x4b\x6f\xd3\x40\x10\xbe\xe7\x57\x8c\x4c\x0f\x70\xc0\xa6\x3d\x21\x4b\x1c\xda\x82\xda\x08\x8a\x22\x52\x71\xe0\x12\x4d\x9c\x89\xb3\xea\x7a\xd7\xda\x87\xd4\xa4\xea\x7f\x67\x5f\x8e\xed\xd4\xd0\x9e\xbc\x3b\x33\xdf\xb7\xf3\xf8\xc6\x4f\x4f\xa0\x50\xd4\x04\x67\x0d\x94\x5f\xe0\x0e\xb5\x21\xa5\xe1\xf9\x79\x36\x7b\x07\x97\xcb\x1b\xd8\x4a\x05\x4d\xb0\xce\x38\x5a\x51\xed\xae\xa5\xd8\xb2\xda\x2a\x34\x4c\x8a\xc2\xe1\xcf\x9a\xfc\x27\x36\xe4\x30\x79\x0c\xd4\xb9\xb3\x5e\x73\xeb\xcf\xc9\x53\xce\x00\xb4\xde\x7d\xa7\x7d\x99\xbe\x1e\xb9\x5c\xde\xba\x53\x0a\xf1\x11\x54\x59\xc5\xcc\xfe\x46\x49\xdb\x6a\x8f\x01\xf8\x38\xb6\x16\xff\x7c\xc2\x45\x33\x6c\xe6\x42\x1b\x14\x15\x2d\x94\xdc\x32\x4e\xe5\x84\xed\xff\x14\x0d\xd6\x34\xdf\x94\x10\x0b\x5b\xb6\x54\xe5\x73\x6f\x4b\xee\x44\x75\xbf\x6f\x69\x14\x73\x87\xd5\x8e\x89\x60\x8f\x91\xa8\xb5\xac\x18\x1a\x5a\xd8\x35\x67\xd5\x7c\x31\x0a\xbf\x3c\xf5\x46\x90\xd5\xa4\xbe\xa2\xc1\x12\x14\x69\x69\x55\x45\xba\x10\x72\x43\xb6\xcd\xf5\x0e\x56\x0f\x76\x4d\x4a\x90\x21\xbd\x4a\x23\x01\x50\x52\x9a\xdf\x92\xdb\x86\x96\xec\x10\x73\x72\x13\xeb\xde\xf9\x35\xf2\x42\x76\xf1\x29\x8b\x2f\xf5\xb0\x63\x29\x93\xb0\x50\x50\x56\xb7\x17\x01\xe7\xa2\xd8\x76\x50\xf3\xe3\x42\xb1\xaa\x1b\x5e\x2b\x4d\xb8\x96\x90\x8d\x1a\x73\x0c\xca\x3c\x9e\xc4\x26\xa8\x0b\xad\x91\xba\x42\xce\x44\x1d\x07\xdb\x2b\xe9\x35\x21\x35\x4c\xc4\x5a\xcf\xfd\x05\x1f\xfb\x8b\xb6\x6b\xd7\x9e\xa0\x9c\x5e\xd8\x07\x2f\xec\x2e\x9d\x3f\x52\x90\x8e\x09\x07\x6d\x05\x40\x78\xfb\xe0\x05\x3c\x25\x89\x3e\x69\x80\x89\x15\x28\xa7\x8c\x6f\xdd\x0b\x47\x69\xb0\x4e\x52\x7f\xf8\xac\x73\x26\x0b\x25\x8f\x1a\x75\xad\x3c\xcf\x86\xbe\x8d\xd0\x05\x13\xce\x23\x90\x3b\x27\xb6\x2c\xef\xae\x2f\xc9\xb3\x34\x2f\x21\x0d\xbc\xbf\x45\x7d\x8f\x35\x64\x49\x39\x2b\xbe\xce\x3e\x74\x7d\x18\x90\xb7\x41\x8f\x89\x7a\x9a\xb1\x9b\x60\x24\x9f\xe0\xf5\x5e\xf7\xf3\x30\xc6\xed\x44\xf8\x87\x18\x09\xdf\x7e\x5c\xcd\xb8\xc4\xcd\x15\x72\xbf\x3f\x2a\x7a\x1b\x12\x66\xb8\x8e\x83\x96\x4d\x4e\x7e\xc8\x50\x8e\x6e\xc5\x64\xbe\x7e\x0f\x4f\x74\x56\xbe\xb0\x14\xaf\x3c\x7c\x52\x73\x3a\xfe\x0d\x00\x00\xff\xff\xad\x8f\x01\x9d\x39\x05\x00\x00")
 
 func cloudup_awsMaster_master_asgMaster_asgYamlBytes() ([]byte, error) {
 	return bindataRead(
@@ -245,7 +245,7 @@ func cloudup_awsMaster_master_asgMaster_asgYaml() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "cloudup/_aws/master/_master_asg/master_asg.yaml", size: 1310, mode: os.FileMode(420), modTime: time.Unix(1471581503, 0)}
+	info := bindataFileInfo{name: "cloudup/_aws/master/_master_asg/master_asg.yaml", size: 1337, mode: os.FileMode(420), modTime: time.Unix(1473349571, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -370,7 +370,7 @@ func cloudup_awsNetworkYaml() (*asset, error) {
 	return a, nil
 }
 
-var _cloudup_awsNodesYaml = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xac\x55\x4d\x4f\x1b\x4d\x0c\xbe\xe7\x57\x58\xe1\xd5\xcb\x29\x09\xcd\xa9\x5a\xa9\x87\x28\x48\x34\x6a\x41\x51\x52\xb5\x52\x2f\x68\x98\x38\x9b\x29\x93\xf1\x6a\x3e\x0a\x01\xf1\xdf\xeb\x99\xdd\xcd\x47\xb3\x24\x41\x54\x48\xc0\x8c\x1f\xdb\x8f\xc7\x8f\xbd\x67\x30\x1a\x5c\x83\x24\x33\x57\x79\xb0\xc2\x2b\x32\xad\x33\xf8\x81\x20\x2d\x0a\x8f\x20\x0c\x28\xe3\xbc\x30\x12\xc1\x92\x46\x98\x93\x05\xbf\x40\x30\x34\x43\xd7\x52\x62\x39\xe1\xdb\x5e\x3a\x75\x9f\x9f\x61\xa8\x83\xf3\x68\x6f\xc4\x12\xe1\xe5\x25\x6b\x41\xf2\x1a\x93\x56\x72\x75\x49\x32\x2c\xd1\xf8\x0c\x2c\x3a\x0a\x56\xa2\xeb\x71\x80\xde\x7d\xb8\x43\x6b\xd0\xa3\xeb\xc4\x38\x9d\xe8\xd1\xfd\xe5\x98\x49\x1d\xbf\xf4\x3f\x96\x25\x83\x23\x74\x18\x57\xbc\x89\x49\x89\xde\x70\x19\x55\x4f\x31\xb6\x34\x57\x07\xca\x86\xe7\x97\x26\xfc\xb1\xa7\x52\xbb\xf0\x54\xcf\x89\x29\x4f\x7e\x02\xee\xee\xb0\x6c\xad\x43\x19\xac\xf2\x2b\xc8\x2d\x85\x22\x35\xb6\x6c\x6a\x6d\xb8\x8a\xf7\x87\xf8\xfe\x2e\x64\x16\x7f\xf5\x9a\xe8\xb0\x97\xb4\xaa\x88\x8a\xca\xe0\x7c\xfa\x4a\xb2\xf3\x48\x68\xa0\x35\x3d\xc0\x3c\x68\x0d\x98\x73\x47\xfe\xa2\x30\x09\x55\x3d\x9d\xd2\x1a\x53\xef\x00\x32\x38\x89\x32\xbb\x55\x01\xc0\xdb\x80\x7c\x94\x6a\x66\x33\xb8\xe8\xa6\x9f\xde\x45\xe4\x32\x9d\x7e\x06\xe5\x80\x0a\x34\xe0\x29\x49\xfd\x81\xac\x9e\x35\x50\x72\x6e\xd1\xc1\x47\x8e\x6f\x84\xee\x78\x4a\x92\x79\x07\xb7\x92\x0c\x5b\x06\xb3\xa5\x32\xc3\xd1\xe5\xa4\x92\xac\x25\x4f\x92\x34\xb3\x96\x05\x9f\xe7\x96\x96\x63\xb2\x2c\xde\x7e\x9f\x8f\x9e\xd6\x07\xa6\x7f\x13\xc3\x83\xe4\xb1\xf5\x42\xdf\xc7\x0a\x1a\x7a\x9a\xd8\x0b\xad\x4b\x91\xbf\x9f\x79\x39\x42\x6f\x72\xda\xa7\xba\x14\xd1\xee\x4e\xe2\x5b\x62\x8f\x32\xae\x42\xfe\x33\xce\x7c\x65\x85\xc9\x11\xfe\x4b\x10\xf4\x90\x7d\x4a\x65\x4c\xd1\xbb\xaa\xaa\xaf\x22\x18\xb9\x18\x6e\x2f\x54\xf8\x1f\x06\xd3\xab\xad\x01\xd3\xfb\x98\x38\x42\x75\xd4\x6e\x95\xb0\x79\xe8\x58\x75\x5f\x70\x95\x55\x7f\xa3\x1f\x4b\x96\xff\xdb\x2a\x6d\xbb\x9a\x34\x2d\x00\x9d\x93\x9b\xb9\xbf\x73\xde\xb8\x87\xd4\x52\xe4\x38\x9a\x25\x29\xaf\x4b\x9a\x16\x28\xbb\xa3\x68\xa9\x40\x55\xb8\x6f\xab\x02\x1b\x90\xd7\x42\x2e\x94\x49\xd6\x12\x2f\x9c\x23\xa9\x78\x6d\x8d\xc3\x1d\xef\xe4\xd1\x78\x3d\xc3\xc1\xa1\xbd\x14\x5e\x6c\xef\xf2\x18\x2b\x14\x5d\xb7\x80\xdb\xcd\x4a\xbf\x2d\x88\x74\xda\x93\xe4\xbf\x93\xe6\x0f\xc0\x54\x3d\x95\xc9\xb9\x33\xbb\xf9\x27\x3b\x18\x68\xf7\x2f\xda\xf5\x92\xad\x0d\x6b\xe6\x07\x9c\x13\xff\x76\x5e\xf4\x93\x37\x63\xd5\x7c\xaf\xd0\xc7\xb1\x55\xb2\xee\x5c\x41\x3e\x1d\x33\x68\x37\xbc\xc9\x1a\xda\x8e\xb1\xd0\xcc\x92\xe6\x44\xf0\xe4\xa4\xd0\xca\xe4\x65\x6f\x4f\x96\x52\x83\x0e\xb3\xa6\xcb\xd3\x22\x72\x40\xde\x5b\xaf\xbf\xe9\x75\x69\x84\x7e\x85\x15\x8f\x07\xb0\xa5\xb1\xc6\xba\x70\xc7\x2d\x64\x29\x6f\x26\xf0\x89\x0c\xc6\xf1\xdb\xf5\xfb\xc9\xb7\xae\xf4\x49\x9a\x4f\x7e\x89\x7e\xc2\x37\xd2\xde\x3c\x25\x2f\x53\x91\x57\x03\x73\xff\xd1\x75\x15\xf5\x6c\xfd\x2d\xe5\x8e\x7c\x68\xb7\xb6\xc0\x7f\x02\x00\x00\xff\xff\x41\x4a\xc8\x00\x3a\x09\x00\x00")
+var _cloudup_awsNodesYaml = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xac\x55\x5b\x6f\x32\x37\x10\x7d\xe7\x57\x8c\xf8\xaa\x7e\x4f\x40\xca\x53\xb5\x52\x1f\x10\x91\x52\xd4\x26\x42\x50\xb5\x52\x5f\x22\xc7\x0c\x8b\x1b\xe3\x59\xf9\xd2\x84\x44\xf9\xef\x1d\xdb\xbb\x5c\xc2\x06\x88\x52\x45\x4a\x62\xcf\x39\xe3\x33\xd7\xfd\x06\x93\xd1\x2d\x48\x32\x4b\x55\x06\x2b\xbc\x22\xd3\xf9\x06\x7f\x21\x48\x8b\xc2\x23\x08\x03\xca\x38\x2f\x8c\x44\xb0\xa4\x11\x96\x64\xc1\xaf\x10\x0c\x2d\xd0\x75\x94\x58\xcf\xf8\x76\x90\x4e\xfd\xd7\x57\x18\xeb\xe0\x3c\xda\x3b\xb1\x46\x78\x7b\x2b\x3a\x90\x58\x53\xd2\x4a\x6e\xae\x49\x86\x35\x1a\x5f\x80\x45\x47\xc1\x4a\x74\x03\x76\x30\x78\x0c\x0f\x68\x0d\x7a\x74\xbd\xe8\xa7\x17\x19\xfd\x7f\x1c\x2b\x69\xfc\x67\xfe\xb9\x57\x0a\x38\x23\x87\x71\xd5\xa7\x94\x64\xf4\x4e\xcb\xa4\x4e\xc5\xd4\xd2\x52\x9d\x08\x1b\x5e\xdf\xda\xf0\xe7\x52\xa5\x0e\xe1\x29\x9e\x0b\x9f\xbc\x38\x05\x5c\xdd\x71\x2e\xad\x43\x19\xac\xf2\x1b\x28\x2d\x85\x2a\x15\x36\x17\xb5\x31\xdc\xc4\xfb\x53\x7a\xff\xad\x64\x11\x7f\x0d\xda\xe4\x30\x4b\x5a\x55\xc5\x8e\x2a\xe0\xfb\xfc\x83\xc7\xbe\x47\x41\x23\xad\xe9\x09\x96\x41\x6b\xc0\x92\x2b\xf2\x4e\xc2\x2c\xd4\xf1\xf4\xb2\x35\x3e\x7d\x00\x28\xe0\x22\xc9\x4c\xab\x1d\x80\xb7\x01\xf9\x28\xd5\xc2\x16\x70\xd5\x4f\x3f\x83\xab\xa8\x65\x3e\xff\x15\x94\x03\xaa\xd0\x80\xa7\xd4\xea\x4f\x64\xf5\xa2\x45\x92\x73\xab\x1e\x3e\xb3\x7f\x23\x74\xcf\x53\x6a\x99\x2f\x68\xcb\x62\xd8\x32\x5a\xac\x95\x19\x4f\xae\x67\x75\xcb\x5a\xf2\x24\x49\xb3\x6a\x59\xf1\x79\x69\x69\x3d\x25\xcb\xcd\x3b\x1c\xf2\xd1\xd3\xf6\xc0\xf2\xef\xa2\x7b\x90\x3c\xb6\x5e\xe8\xc7\x18\x41\x4b\x4d\x93\x7a\xa1\x75\x6e\xf2\xaf\x2b\xcf\x23\xf4\x29\xd2\xb1\xd4\xb5\x88\x76\x77\x91\xde\x8c\x3d\xab\xb8\x76\xf9\xbf\x69\xe6\x2b\x2b\x4c\x89\xf0\x43\x82\xa0\x87\xe2\x97\x14\xc6\x1c\xbd\xab\xa3\xfa\x5d\x04\x23\x57\xe3\xfd\x85\x0a\x3f\xc2\x68\x7e\xb3\x37\x60\xfa\x18\x13\x47\xa8\xf1\xda\xaf\x1f\x6c\x1f\x3a\xee\xba\xdf\x70\x53\xd4\x7f\x23\x8f\x5b\x96\xff\xdb\x0b\x6d\x3f\x9a\x34\x2d\x00\xbd\x8b\x8b\x79\xbc\x73\x3e\xb9\x87\xd4\x5a\x94\x38\x59\xa4\x56\xde\x86\x34\xaf\x50\xf6\x27\xd1\x52\x83\x6a\x77\x7f\x6c\x2a\x6c\x41\xde\x0a\xb9\x52\x26\x59\x33\x5e\x38\x47\x52\xf1\xda\x9a\x86\x07\xde\xc9\x93\x69\x0b\x69\xf4\x1e\x93\xa9\xc1\xa1\xbd\x16\x5e\xec\x2f\xfb\xc8\x0b\x55\xdf\xad\xe0\x7e\xb7\xf3\xef\x2b\x22\x9d\x16\x29\xf9\x3f\x49\xf3\x17\x62\xae\x5e\xb2\x3a\x2e\xdd\xe1\x5b\xb3\x03\x0c\x74\x87\x57\xdd\x66\x0b\x37\x86\x6d\x68\x27\xc8\x29\xc0\x6e\x59\x0d\x13\x9b\xb1\x6a\x79\x94\x89\xe7\xa9\x55\xb2\x29\x6d\x45\x3e\x1d\x0b\xe8\xb6\x24\x6d\x0b\xed\x46\x5f\x68\x16\xa9\x29\x45\xf0\xe4\xa4\xd0\xca\x94\xb9\xf8\x17\xf7\x5a\x4b\xa3\x16\x6d\x97\x97\x79\x64\x87\xbc\xd8\x3e\xce\xe9\x6d\x36\xc2\xb0\xc6\x8a\xe7\x13\xd8\x6c\x6c\xb0\x2e\x3c\x70\x09\xb9\xd7\x77\x23\xfa\x42\x06\xe3\x7c\x1e\xf2\xfe\xe6\x5b\x97\x39\x69\x28\x12\x2f\xc9\x4f\xf8\x56\xd9\xbb\x54\xf2\xb6\x15\x65\x3d\x51\x8f\x3f\xbb\xbe\xa2\x81\x6d\x3e\xb6\x5c\x91\x9f\xba\x9d\x3d\xf0\x7f\x01\x00\x00\xff\xff\x8f\xa8\x94\x46\x5b\x09\x00\x00")
 
 func cloudup_awsNodesYamlBytes() ([]byte, error) {
 	return bindataRead(
@@ -385,7 +385,7 @@ func cloudup_awsNodesYaml() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "cloudup/_aws/nodes.yaml", size: 2362, mode: os.FileMode(420), modTime: time.Unix(1471581503, 0)}
+	info := bindataFileInfo{name: "cloudup/_aws/nodes.yaml", size: 2395, mode: os.FileMode(420), modTime: time.Unix(1473349571, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -1245,7 +1245,7 @@ func nodeup_automatic_upgrades_debian_familyFilesEtcAptAptConfD20autoUpgrades()
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "nodeup/_automatic_upgrades/_debian_family/files/etc/apt/apt.conf.d/20auto-upgrades", size: 119, mode: os.FileMode(420), modTime: time.Unix(1473344505, 0)}
+	info := bindataFileInfo{name: "nodeup/_automatic_upgrades/_debian_family/files/etc/apt/apt.conf.d/20auto-upgrades", size: 119, mode: os.FileMode(420), modTime: time.Unix(1473349394, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -1265,7 +1265,7 @@ func nodeup_automatic_upgrades_debian_familyPackagesUnattendedUpgrades() (*asset
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "nodeup/_automatic_upgrades/_debian_family/packages/unattended-upgrades", size: 0, mode: os.FileMode(420), modTime: time.Unix(1473344505, 0)}
+	info := bindataFileInfo{name: "nodeup/_automatic_upgrades/_debian_family/packages/unattended-upgrades", size: 0, mode: os.FileMode(420), modTime: time.Unix(1473349394, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }

upup/pkg/fi/cloudup/deepvalidate_test.go

@@ -3,6 +3,7 @@ package cloudup
 import (
 	"fmt"
 	"k8s.io/kops/upup/pkg/api"
+	"k8s.io/kops/upup/pkg/fi"
 	"strings"
 	"testing"
 )
@@ -111,8 +112,8 @@ func TestDeepValidate_EvenEtcdClusterSize(t *testing.T) {
 		{
 			Name: "main",
 			Members: []*api.EtcdMemberSpec{
-				{Name: "us-east-1a", Zone: "us-east-1a"},
-				{Name: "us-east-1b", Zone: "us-east-1b"},
+				{Name: "us-east-1a", Zone: fi.String("us-east-1a")},
+				{Name: "us-east-1b", Zone: fi.String("us-east-1b")},
 			},
 		},
 	}

upup/pkg/fi/cloudup/populatecluster_test.go

@@ -41,7 +41,7 @@ func addEtcdClusters(c *api.Cluster) {
 		for _, zone := range etcdZones {
 			m := &api.EtcdMemberSpec{}
 			m.Name = zone
-			m.Zone = zone
+			m.Zone = fi.String(zone)
 			etcd.Members = append(etcd.Members, m)
 		}
 		c.Spec.EtcdClusters = append(c.Spec.EtcdClusters, etcd)
@@ -68,7 +68,7 @@ func TestPopulateCluster_Default_NoError(t *testing.T) {
 func TestPopulateCluster_Docker_Spec(t *testing.T) {
 	c := buildMinimalCluster()
 	c.Spec.Docker = &api.DockerConfig{
-		MTU:              5678,
+		MTU:              fi.Int(5678),
 		InsecureRegistry: "myregistry.com:1234",
 	}
 
@@ -85,18 +85,13 @@ func TestPopulateCluster_Docker_Spec(t *testing.T) {
 		t.Fatalf("Unexpected error from PopulateCluster: %v", err)
 	}
 
-	if full.Spec.Docker.MTU != 5678 {
+	if fi.IntValue(full.Spec.Docker.MTU) != 5678 {
 		t.Fatalf("Unexpected Docker MTU: %v", full.Spec.Docker.MTU)
 	}
 
 	if full.Spec.Docker.InsecureRegistry != "myregistry.com:1234" {
 		t.Fatalf("Unexpected Docker InsecureRegistry: %v", full.Spec.Docker.InsecureRegistry)
 	}
-
-	// Check default values not changed
-	if full.Spec.Docker.Bridge != "cbr0" {
-		t.Fatalf("Unexpected Docker Bridge: %v", full.Spec.Docker.Bridge)
-	}
 }
 
 func build(c *api.Cluster) (*api.Cluster, error) {

upup/pkg/fi/cloudup/validation_test.go

@@ -41,7 +41,7 @@ func buildDefaultCluster(t *testing.T) *api.Cluster {
 			for _, zone := range etcdZones {
 				m := &api.EtcdMemberSpec{}
 				m.Name = zone
-				m.Zone = zone
+				m.Zone = fi.String(zone)
 				etcd.Members = append(etcd.Members, m)
 			}
 			c.Spec.EtcdClusters = append(c.Spec.EtcdClusters, etcd)

upup/pkg/fi/values.go

@@ -32,6 +32,13 @@ func Int(v int) *int {
 	return &v
 }
 
+func IntValue(v *int) int {
+	if v == nil {
+		return 0
+	}
+	return *v
+}
+
 func Int64(v int64) *int64 {
 	return &v
 }