feat: vm agent interface prefixes

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## v0.5.0 (UNRELEASED)
 
+ENHANCEMENTS:
+
+* resource/virtual_environment_vm: Add `agent.prefixes` argument
+
 OTHER:
 
 * provider/example: Remove support for Terraform v0.11 and older

docs/resources/virtual_environment_vm.md

@@ -97,6 +97,7 @@ output "ubuntu_vm_public_key" {
 * `acpi` - (Optional) Whether to enable ACPI (defaults to `true`).
 * `agent` - (Optional) The QEMU agent configuration.
     * `enabled` - (Optional) Whether to enable the QEMU agent (defaults to `false`).
+    * `prefixes` - (Optional) The prefixes for the network interfaces which need to have an IP assigned before continuing (defaults to `["eno","enp","ens","eth","tun"]`).
     * `timeout` - (Optional) The maximum amount of time to wait for data from the QEMU agent to become available (defaults to `15m`).
     * `trim` - (Optional) Whether to enable the FSTRIM feature in the QEMU agent (defaults to `false`).
     * `type` - (Optional) The QEMU agent interface type (defaults to `virtio`).

proxmox/virtual_environment_vm.go

@@ -369,7 +369,7 @@ func (c *VirtualEnvironmentClient) UpdateVMAsync(nodeName string, vmID int, d *V
 }
 
 // WaitForNetworkInterfacesFromVMAgent waits for a virtual machine's QEMU agent to publish the network interfaces.
-func (c *VirtualEnvironmentClient) WaitForNetworkInterfacesFromVMAgent(nodeName string, vmID int, timeout int, delay int, waitForIP bool) (*VirtualEnvironmentVMGetQEMUNetworkInterfacesResponseData, error) {
+func (c *VirtualEnvironmentClient) WaitForNetworkInterfacesFromVMAgent(nodeName string, vmID int, timeout int, delay int, waitForIP bool, interfacePrefixes []string) (*VirtualEnvironmentVMGetQEMUNetworkInterfacesResponseData, error) {
 	timeDelay := int64(delay)
 	timeMax := float64(timeout)
 	timeStart := time.Now()
@@ -384,13 +384,13 @@ func (c *VirtualEnvironmentClient) WaitForNetworkInterfacesFromVMAgent(nodeName
 
 				if waitForIP {
 					for _, nic := range *data.Result {
-						if nic.Name == "lo" {
-							continue
-						}
-
-						if nic.IPAddresses == nil || (nic.IPAddresses != nil && len(*nic.IPAddresses) == 0) {
-							missingIP = true
-							break
+						for _, prefix := range interfacePrefixes {
+							if strings.HasPrefix(nic.Name, prefix) {
+								if nic.IPAddresses == nil || (nic.IPAddresses != nil && len(*nic.IPAddresses) == 0) {
+									missingIP = true
+									break
+								}
+							}
 						}
 					}
 				}

proxmoxtf/resource_virtual_environment_vm.go

@@ -98,6 +98,7 @@ const (
 	mkResourceVirtualEnvironmentVMACPI                              = "acpi"
 	mkResourceVirtualEnvironmentVMAgent                             = "agent"
 	mkResourceVirtualEnvironmentVMAgentEnabled                      = "enabled"
+	mkResourceVirtualEnvironmentVMAgentPrefixes                     = "prefixes"
 	mkResourceVirtualEnvironmentVMAgentTimeout                      = "timeout"
 	mkResourceVirtualEnvironmentVMAgentTrim                         = "trim"
 	mkResourceVirtualEnvironmentVMAgentType                         = "type"
@@ -235,6 +236,21 @@ func resourceVirtualEnvironmentVM() *schema.Resource {
 							Optional:    true,
 							Default:     dvResourceVirtualEnvironmentVMAgentEnabled,
 						},
+						mkResourceVirtualEnvironmentVMAgentPrefixes: {
+							Type:        schema.TypeList,
+							Description: "The prefixes for the network interfaces which need to have an IP assigned before continuing",
+							Optional:    true,
+							DefaultFunc: func() (interface{}, error) {
+								return []interface{}{
+									"eno",
+									"enp",
+									"ens",
+									"eth",
+									"tun",
+								}, nil
+							},
+							Elem: &schema.Schema{Type: schema.TypeString},
+						},
 						mkResourceVirtualEnvironmentVMAgentTimeout: {
 							Type:         schema.TypeString,
 							Description:  "The maximum amount of time to wait for data from the QEMU agent to become available",
@@ -1798,7 +1814,7 @@ func resourceVirtualEnvironmentVMCreateCustomDisks(d *schema.ResourceData, m int
 		fileFormat, _ := block[mkResourceVirtualEnvironmentVMDiskFileFormat].(string)
 		size, _ := block[mkResourceVirtualEnvironmentVMDiskSize].(int)
 		speed := block[mkResourceVirtualEnvironmentVMDiskSpeed].([]interface{})
-		diskInterface,_ := block[mkResourcevirtualEnvironmentVMDiskInterface].(string)
+		diskInterface, _ := block[mkResourcevirtualEnvironmentVMDiskInterface].(string)
 
 		if len(speed) == 0 {
 			diskSpeedDefault, err := diskSpeedResource.DefaultValue()
@@ -3032,14 +3048,21 @@ func resourceVirtualEnvironmentVMReadNetworkValues(d *schema.ResourceData, m int
 				return err
 			}
 
+			agentPrefixes := agentBlock[mkResourceVirtualEnvironmentVMAgentPrefixes].([]interface{})
 			agentTimeout, err := time.ParseDuration(agentBlock[mkResourceVirtualEnvironmentVMAgentTimeout].(string))
 
 			if err != nil {
 				return err
 			}
 
+			interfacePrefixes := make([]string, len(agentPrefixes))
+
+			for i, v := range agentPrefixes {
+				interfacePrefixes[i] = v.(string)
+			}
+
 			macAddresses := []interface{}{}
-			networkInterfaces, err := veClient.WaitForNetworkInterfacesFromVMAgent(nodeName, vmID, int(agentTimeout.Seconds()), 5, true)
+			networkInterfaces, err := veClient.WaitForNetworkInterfacesFromVMAgent(nodeName, vmID, int(agentTimeout.Seconds()), 5, true, interfacePrefixes)
 
 			if err == nil && networkInterfaces.Result != nil {
 				ipv4Addresses = make([]interface{}, len(*networkInterfaces.Result))

proxmoxtf/resource_virtual_environment_vm_test.go

@@ -89,15 +89,18 @@ func TestResourceVirtualEnvironmentVMSchema(t *testing.T) {
 
 	testOptionalArguments(t, agentSchema, []string{
 		mkResourceVirtualEnvironmentVMAgentEnabled,
+		mkResourceVirtualEnvironmentVMAgentPrefixes,
 		mkResourceVirtualEnvironmentVMAgentTimeout,
 		mkResourceVirtualEnvironmentVMAgentTrim,
 		mkResourceVirtualEnvironmentVMAgentType,
 	})
 
 	testValueTypes(t, agentSchema, map[string]schema.ValueType{
-		mkResourceVirtualEnvironmentVMAgentEnabled: schema.TypeBool,
-		mkResourceVirtualEnvironmentVMAgentTrim:    schema.TypeBool,
-		mkResourceVirtualEnvironmentVMAgentType:    schema.TypeString,
+		mkResourceVirtualEnvironmentVMAgentEnabled:  schema.TypeBool,
+		mkResourceVirtualEnvironmentVMAgentPrefixes: schema.TypeList,
+		mkResourceVirtualEnvironmentVMAgentTimeout:  schema.TypeString,
+		mkResourceVirtualEnvironmentVMAgentTrim:     schema.TypeBool,
+		mkResourceVirtualEnvironmentVMAgentType:     schema.TypeString,
 	})
 
 	audioDeviceSchema := testNestedSchemaExistence(t, s, mkResourceVirtualEnvironmentVMAudioDevice)

proxmoxtf/version.go

@@ -9,5 +9,5 @@ const (
 	TerraformProviderName = "terraform-provider-proxmox"
 
 	// TerraformProviderVersion specifies the version number.
-	TerraformProviderVersion = "0.4.1"
+	TerraformProviderVersion = "0.5.0"
 )