Skip to content

Commit 74ea869

Browse files
committed
provider/vsphere: Add migration for enable_disk_uuid on
`virtual_machine` Fixes hashicorp#7275 - a state migration was missed when `enable_disk_uuid` was merged ``` make testacc TEST=./builtin/providers/vsphere TESTARGS='-run=TestVSphereVirtualMachineMigrateState' ==> Checking that code complies with gofmt requirements... go generate $(go list ./... | grep -v /vendor/) TF_ACC=1 go test ./builtin/providers/vsphere -v -run=TestVSphereVirtualMachineMigrateState -timeout 120m === RUN TestVSphereVirtualMachineMigrateState --- PASS: TestVSphereVirtualMachineMigrateState (0.00s) PASS ok github.com/hashicorp/terraform/builtin/providers/vsphere 0.018s ```
1 parent 004cec6 commit 74ea869

2 files changed

Lines changed: 11 additions & 0 deletions

File tree

builtin/providers/vsphere/resource_vsphere_virtual_machine_migrate.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ func migrateVSphereVirtualMachineStateV0toV1(is *terraform.InstanceState) (*terr
4040
is.Attributes["skip_customization"] = "false"
4141
}
4242

43+
if is.Attributes["enable_disk_uuid"] == "" {
44+
is.Attributes["enable_disk_uuid"] = "false"
45+
}
46+
4347
for k, _ := range is.Attributes {
4448
if strings.HasPrefix(k, "disk.") && strings.HasSuffix(k, ".size") {
4549
diskParts := strings.Split(k, ".")

builtin/providers/vsphere/resource_vsphere_virtual_machine_migrate_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ func TestVSphereVirtualMachineMigrateState(t *testing.T) {
2020
"skip_customization": "false",
2121
},
2222
},
23+
"enable_disk_uuid before 0.6.16": {
24+
StateVersion: 0,
25+
Attributes: map[string]string{},
26+
Expected: map[string]string{
27+
"enable_disk_uuid": "false",
28+
},
29+
},
2330
"disk controller_type": {
2431
StateVersion: 0,
2532
Attributes: map[string]string{

0 commit comments

Comments
 (0)