Add moid in vsphere_virtual_machine data source

Signed-off-by: Stéphane Este-Gracias <sestegra@gmail.com>

vsphere/data_source_vsphere_virtual_machine.go

@@ -152,13 +152,16 @@ func dataSourceVSphereVirtualMachine() *schema.Resource {
 	// include the number of cpus, memory, firmware, disks, etc.
 	structure.MergeSchema(s, schemaVirtualMachineConfigSpec())
 
-	// make name/uuid Optional/AtLeastOneOf since UUID lookup is now supported
+	// make name/uuid/moid Optional/AtLeastOneOf since UUID lookup is now supported
 	s["name"].Required = false
 	s["name"].Optional = true
-	s["name"].AtLeastOneOf = []string{"name", "uuid"}
+	s["name"].AtLeastOneOf = []string{"name", "uuid", "moid"}
 	s["uuid"].Required = false
 	s["uuid"].Optional = true
-	s["uuid"].AtLeastOneOf = []string{"name", "uuid"}
+	s["uuid"].AtLeastOneOf = []string{"name", "uuid", "moid"}
+	s["moid"].Required = false
+	s["moid"].Optional = true
+	s["moid"].AtLeastOneOf = []string{"name", "uuid", "moid"}
 
 	// Now that the schema has been composed and merged, we can attach our reader and
 	// return the resource back to our host process.
@@ -171,13 +174,17 @@ func dataSourceVSphereVirtualMachine() *schema.Resource {
 func dataSourceVSphereVirtualMachineRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*Client).vimClient
 	uuid := d.Get("uuid").(string)
+	moid := d.Get("moid").(string)
 	name := d.Get("name").(string)
 	var vm *object.VirtualMachine
 	var err error
 
 	if uuid != "" {
 		log.Printf("[DEBUG] Looking for VM or template by UUID %q", uuid)
 		vm, err = virtualmachine.FromUUID(client, uuid)
+	} else if moid != "" {
+		log.Printf("[DEBUG] Looking for VM or template by MOID %q", moid)
+		vm, err = virtualmachine.FromMOID(client, moid)
 	} else {
 		log.Printf("[DEBUG] Looking for VM or template by name/path %q", name)
 		var dc *object.Datacenter

vsphere/resource_vsphere_virtual_machine.go

@@ -276,11 +276,6 @@ func resourceVSphereVirtualMachine() *schema.Resource {
 			Computed:    true,
 			Description: "A flag internal to Terraform that indicates that this resource was either imported or came from a earlier major version of this resource. Reset after the first post-import or post-upgrade apply.",
 		},
-		"moid": {
-			Type:        schema.TypeString,
-			Computed:    true,
-			Description: "The machine object ID from VMware vSphere.",
-		},
 		"power_state": {
 			Type:        schema.TypeString,
 			Computed:    true,

vsphere/virtual_machine_config_structure.go

@@ -338,6 +338,11 @@ func schemaVirtualMachineConfigSpec() map[string]*schema.Schema {
 			Computed:    true,
 			Description: "The UUID of the virtual machine. Also exposed as the ID of the resource.",
 		},
+		"moid": {
+			Type:        schema.TypeString,
+			Computed:    true,
+			Description: "The machine object ID from VMware vSphere.",
+		},
 		"storage_policy_id": {
 			Type:        schema.TypeString,
 			Optional:    true,