Merge branch 'main' into fix/2363

Author: mbokman

go.mod

@@ -2,13 +2,13 @@ module github.com/hashicorp/terraform-provider-vsphere
 
 go 1.23.0
 
-toolchain go1.24.0
+toolchain go1.24.1
 
 require (
 	github.com/davecgh/go-spew v1.1.1
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1
 	github.com/mitchellh/copystructure v1.2.0
-	github.com/vmware/govmomi v0.48.1
+	github.com/vmware/govmomi v0.49.0
 )
 
 require (
@@ -18,7 +18,7 @@ require (
 	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/fatih/color v1.16.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -53,10 +53,10 @@ require (
 	github.com/zclconf/go-cty v1.16.2 // indirect
 	golang.org/x/crypto v0.35.0 // indirect
 	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/sync v0.11.0 // indirect
+	golang.org/x/net v0.36.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
 	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect

go.sum

@@ -46,8 +46,8 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
@@ -150,8 +150,8 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU
 github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
-github.com/vmware/govmomi v0.48.1 h1:aAjmoFzSShYA9ED66JaOJzSBvukvrQLYZljZL+pgfKQ=
-github.com/vmware/govmomi v0.48.1/go.mod h1:UFM2aCkggPToQf8TqY3xfd9bOX58vbVa+UAK1JdDTNM=
+github.com/vmware/govmomi v0.49.0 h1:M80ExmFq3kOfeMvMJcHnXgA/4w5hUAFfYfc+Qm3lmPg=
+github.com/vmware/govmomi v0.49.0/go.mod h1:+oZ0tYJw/pXKoeWHLR9Egq5KENVr2hLePRzisFhEWpA=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -180,13 +180,13 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
+golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
-golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -210,8 +210,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

vsphere/data_source_vsphere_network.go

@@ -5,13 +5,23 @@ package vsphere
 
 import (
 	"fmt"
+	"time"
 
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+
 	"github.com/hashicorp/terraform-provider-vsphere/vsphere/internal/helper/network"
+
 	"github.com/vmware/govmomi/object"
 )
 
+const (
+	waitForNetworkPending   = "waitForNetworkPending"
+	waitForNetworkCompleted = "waitForNetworkCompleted"
+	waitForNetworkError     = "waitForNetworkError"
+)
+
 func dataSourceVSphereNetwork() *schema.Resource {
 	return &schema.Resource{
 		Read: dataSourceVSphereNetworkRead,
@@ -52,6 +62,18 @@ func dataSourceVSphereNetwork() *schema.Resource {
 					},
 				},
 			},
+			"retry_timeout": {
+				Type:        schema.TypeInt,
+				Description: "Timeout (in seconds) if network is not present yet",
+				Optional:    true,
+				Default:     0,
+			},
+			"retry_interval": {
+				Type:        schema.TypeInt,
+				Description: "Retry interval (in milliseconds) when probing the network",
+				Optional:    true,
+				Default:     500,
+			},
 		},
 	}
 }
@@ -69,8 +91,6 @@ func dataSourceVSphereNetworkRead(d *schema.ResourceData, meta interface{}) erro
 			return fmt.Errorf("cannot locate datacenter: %s", err)
 		}
 	}
-	var net object.NetworkReference
-	var err error
 
 	vimClient := client.Client
 
@@ -85,19 +105,65 @@ func dataSourceVSphereNetworkRead(d *schema.ResourceData, meta interface{}) erro
 		}
 	}
 
-	if dvSwitchUUID != "" {
-		// Handle distributed virtual switch port group
-		net, err = network.FromNameAndDVSUuid(client, name, dc, dvSwitchUUID)
-		if err != nil {
-			return fmt.Errorf("error fetching DVS network: %s", err)
+	readRetryFunc := func() (interface{}, string, error) {
+		var net interface{}
+		var err error
+		if dvSwitchUUID != "" {
+			// Handle distributed virtual switch port group
+			net, err = network.FromNameAndDVSUuid(client, name, dc, dvSwitchUUID)
+			if err != nil {
+				if _, ok := err.(network.NetworkNotFoundError); ok {
+					return struct{}{}, waitForNetworkPending, nil
+				}
+
+				return struct{}{}, waitForNetworkError, err
+			}
+			return net, waitForNetworkCompleted, nil
 		}
-	} else {
 		// Handle standard switch port group
 		net, err = network.FromName(vimClient, name, dc, filters) // Pass the *vim25.Client
 		if err != nil {
-			return fmt.Errorf("error fetching network: %s", err)
+			if _, ok := err.(network.NetworkNotFoundError); ok {
+				return struct{}{}, waitForNetworkPending, nil
+			}
+			return struct{}{}, waitForNetworkError, err
 		}
+		return net, waitForNetworkCompleted, nil
+
+	}
+
+	var net object.NetworkReference
+	var netObj interface{}
+	var err error
+	var state string
+
+	retryTimeout := d.Get("retry_timeout").(int)
+	retryInterval := d.Get("retry_interval").(int)
+
+	if retryTimeout == 0 {
+		// no retry
+		netObj, state, err = readRetryFunc()
+	} else {
+
+		deleteRetry := &resource.StateChangeConf{
+			Pending:    []string{waitForNetworkPending},
+			Target:     []string{waitForNetworkCompleted},
+			Refresh:    readRetryFunc,
+			Timeout:    time.Duration(retryTimeout) * time.Second,
+			MinTimeout: time.Duration(retryInterval) * time.Millisecond,
+		}
+
+		netObj, err = deleteRetry.WaitForState()
+	}
+
+	if state == waitForNetworkPending {
+		err = fmt.Errorf("network %s not found", name)
+	}
+
+	if err != nil {
+		return err
 	}
+	net = netObj.(object.NetworkReference)
 
 	d.SetId(net.Reference().Value)
 	_ = d.Set("type", net.Reference().Type)

vsphere/data_source_vsphere_network_test.go

@@ -24,7 +24,31 @@ func TestAccDataSourceVSphereNetwork_dvsPortgroup(t *testing.T) {
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataSourceVSphereNetworkConfigDVSPortgroup(),
+				Config: testAccDataSourceVSphereNetworkConfigDVSPortgroup(false),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("data.vsphere_network.net", "type", "DistributedVirtualPortgroup"),
+					resource.TestCheckResourceAttrPair(
+						"data.vsphere_network.net", "id",
+						"vsphere_distributed_port_group.pg", "id",
+					),
+				),
+			},
+		},
+	})
+}
+
+func TestAccDataSourceVSphereNetwork_withTimeout(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			RunSweepers()
+			testAccPreCheck(t)
+			testAccDataSourceVSphereNetworkPreCheck(t)
+			testAccSkipIfEsxi(t)
+		},
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataSourceVSphereNetworkConfigDVSPortgroup(true),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("data.vsphere_network.net", "type", "DistributedVirtualPortgroup"),
 					resource.TestCheckResourceAttrPair(
@@ -86,7 +110,11 @@ func testAccDataSourceVSphereNetworkPreCheck(t *testing.T) {
 	}
 }
 
-func testAccDataSourceVSphereNetworkConfigDVSPortgroup() string {
+func testAccDataSourceVSphereNetworkConfigDVSPortgroup(withTimeout bool) string {
+	additionalConfig := ""
+	if withTimeout {
+		additionalConfig = `retry_timeout = 180`
+	}
 	return fmt.Sprintf(`
 %s
 
@@ -104,10 +132,10 @@ data "vsphere_network" "net" {
   name          = "${vsphere_distributed_port_group.pg.name}"
   datacenter_id = "${data.vsphere_datacenter.rootdc1.id}"
   distributed_virtual_switch_uuid = "${vsphere_distributed_virtual_switch.dvs.id}"
+  %s
 }
 `,
-		testhelper.CombineConfigs(testhelper.ConfigDataRootDC1(), testhelper.ConfigDataRootPortGroup1()),
-	)
+		testhelper.CombineConfigs(testhelper.ConfigDataRootDC1(), testhelper.ConfigDataRootPortGroup1()), additionalConfig)
 }
 
 func testAccDataSourceVSphereNetworkConfigDVSPortgroupAbsolute() string {

vsphere/internal/helper/customattribute/custom_attributes_helper.go

@@ -126,6 +126,9 @@ func (p *DiffProcessor) ProcessDiff(subject object.Reference) error {
 }
 
 func GetDiffProcessorIfAttributesDefined(client *govmomi.Client, d *schema.ResourceData) (*DiffProcessor, error) {
+	if !d.HasChange(ConfigKey) {
+		return nil, nil
+	}
 	old, newValue := d.GetChange(ConfigKey)
 	if len(old.(map[string]interface{})) > 0 || len(newValue.(map[string]interface{})) > 0 {
 		if err := VerifySupport(client); err != nil {

vsphere/internal/helper/network/network_helper.go

@@ -24,6 +24,19 @@ var NetworkType = []string{
 	"OpaqueNetwork",
 }
 
+type NetworkNotFoundError struct {
+	Name string
+	ID   string
+}
+
+func (e NetworkNotFoundError) Error() string {
+	if len(e.ID) > 0 {
+		return fmt.Sprintf("Network with ID %s not found", e.ID)
+	}
+
+	return fmt.Sprintf("Network %s not found", e.Name)
+}
+
 // FromPath loads a network via its path.
 //
 // A network is a usually one of three kinds of networks: a DVS port group, a
@@ -57,7 +70,7 @@ func FromNameAndDVSUuid(client *govmomi.Client, name string, dc *object.Datacent
 		return nil, err
 	}
 	if len(networks) == 0 {
-		return nil, fmt.Errorf("%s %s not found", "Network", name)
+		return nil, NetworkNotFoundError{Name: name}
 	}
 
 	switch {
@@ -90,7 +103,7 @@ func FromNameAndDVSUuid(client *govmomi.Client, name string, dc *object.Datacent
 		}
 		return nil, fmt.Errorf("error while getting Network with name %s and Distributed virtual switch %s", name, dvsUUID)
 	}
-	return nil, fmt.Errorf("%s %s not found", "Network", name)
+	return nil, NetworkNotFoundError{Name: name}
 }
 
 func List(client *govmomi.Client) ([]*object.VmwareDistributedVirtualSwitch, error) {
@@ -169,7 +182,7 @@ func FromID(client *govmomi.Client, id string) (object.NetworkReference, error)
 			return nref.(object.NetworkReference), nil
 		}
 	}
-	return nil, fmt.Errorf("could not find network with ID %q", id)
+	return nil, NetworkNotFoundError{ID: id}
 }
 
 func dvsFromMOID(client *govmomi.Client, id string) (*object.VmwareDistributedVirtualSwitch, error) {
@@ -218,7 +231,7 @@ func FromName(client *vim25.Client, name string, dc *object.Datacenter, filters
 	// Find the network by name
 	networks, err := finder.NetworkList(ctx, name)
 	if err != nil {
-		return nil, fmt.Errorf("error finding network %s: %v", name, err)
+		return nil, NetworkNotFoundError{Name: name}
 	}
 
 	// If multiple networks are found and no filters are specified, return an error
@@ -255,5 +268,5 @@ func FromName(client *vim25.Client, name string, dc *object.Datacenter, filters
 		}
 	}
 
-	return nil, fmt.Errorf("no network found matching the specified criteria")
+	return nil, NetworkNotFoundError{Name: name}
 }

vsphere/resource_vsphere_vmfs_datastore.go

@@ -378,7 +378,7 @@ func resourceVSphereVmfsDatastoreDelete(d *schema.ResourceData, meta interface{}
 		Pending:    []string{retryDeletePending},
 		Target:     []string{retryDeleteCompleted},
 		Refresh:    deleteRetryFunc,
-		Timeout:    30 * time.Second,
+		Timeout:    defaultAPITimeout,
 		MinTimeout: 2 * time.Second,
 		Delay:      2 * time.Second,
 	}

website/docs/d/network.html.markdown

@@ -62,6 +62,8 @@ The following arguments are supported:
   the distributed virtual switch ID.
 * `filter` - (Optional) Apply a filter for the discovered network.
   * `network_type`: This is required if you have multiple port groups with the same name. This will be one of `DistributedVirtualPortgroup` for distributed port groups, `Network` for standard (host-based) port groups, or `OpaqueNetwork` for networks managed externally, such as those managed by NSX.
+* `retry_timeout` - (Optional) The timeout duration in seconds for the data source to retry read operations.
+* `retry_interval` - (Optional) The interval in milliseconds to retry the read operation if `retry_timeout` is set. Default: 500.
 [docs-about-morefs]: /docs/providers/vsphere/index.html#use-of-managed-object-references-by-the-vsphere-provider
 
 ## Attribute Reference