From 35ae330353558a9641319d2c9cba1e68a5c0c1b9 Mon Sep 17 00:00:00 2001 From: Martin Bokman Date: Wed, 19 Mar 2025 18:56:50 +0100 Subject: [PATCH 1/3] fix: DiskDiffOperation #2363 --- .../internal/virtualdevice/virtual_machine_disk_subresource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go b/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go index 785baf48b..56a536eea 100644 --- a/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go +++ b/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go @@ -683,7 +683,7 @@ nextNew: delete(nm, "size") } } - if dsID, ok := nm["datastore_id"]; !ok || dsID == "" { + if dsID, ok := nm["datastore_id"]; !ok { nm["datastore_id"] = diskDatastoreComputedName } normalized = append(normalized, nm) From 1d374c7c026df26b06ea7527a538fffad3364577 Mon Sep 17 00:00:00 2001 From: Martin Bokman Date: Wed, 19 Mar 2025 22:53:32 +0100 Subject: [PATCH 2/3] fix: DiskDiffOperation #2363 --- .../internal/virtualdevice/virtual_machine_disk_subresource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go b/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go index 56a536eea..affbddabc 100644 --- a/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go +++ b/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go @@ -683,7 +683,7 @@ nextNew: delete(nm, "size") } } - if dsID, ok := nm["datastore_id"]; !ok { + if ok := nm["datastore_id"]; !ok { nm["datastore_id"] = diskDatastoreComputedName } normalized = append(normalized, nm) From 6fdcf707c9ed75aa7eabc1d7249caf941a3232f5 Mon Sep 17 00:00:00 2001 From: Martin Bokman Date: Tue, 1 Apr 2025 22:27:42 +0200 Subject: [PATCH 3/3] fix: DiskDiffOperation hashicorp#2363 --- .../internal/virtualdevice/virtual_machine_disk_subresource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go b/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go index affbddabc..955f41af3 100644 --- a/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go +++ b/vsphere/internal/virtualdevice/virtual_machine_disk_subresource.go @@ -683,7 +683,7 @@ nextNew: delete(nm, "size") } } - if ok := nm["datastore_id"]; !ok { + if _, ok := nm["datastore_id"]; !ok { nm["datastore_id"] = diskDatastoreComputedName } normalized = append(normalized, nm)