Log peering wait errors, use ReadTimeout in peering Data Sources (#363)

* Log peering wait errors * run go generate * Remove Default timeout * Also apply Read timeout to aws network peering
hashicorp · Aug 3, 2022 · 7684238 · 7684238
1 parent 136687f
commit 7684238
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/docs/data-sources/aws_network_peering.md b/docs/data-sources/aws_network_peering.md
@@ -52,6 +52,6 @@ data "hcp_aws_network_peering" "test" {
 
 Optional:
 
-- `default` (String)
+- `read` (String)
 
 
diff --git a/docs/data-sources/azure_peering_connection.md b/docs/data-sources/azure_peering_connection.md
@@ -56,4 +56,4 @@ data "hcp_azure_peering_connection" "test" {
 
 Optional:
 
-- `default` (String)
+- `read` (String)
diff --git a/internal/clients/peering.go b/internal/clients/peering.go
@@ -76,7 +76,7 @@ func waitForPeeringToBe(ps peeringState) WaitFor {
 
 		result, err := stateChangeConfig.WaitForStateContext(ctx)
 		if err != nil {
-			return nil, fmt.Errorf("error waiting for peering connection (%s) to become '%s'", peeringID, ps.Target)
+			return nil, fmt.Errorf("error waiting for peering connection (%s) to become '%s': %v", peeringID, ps.Target, err)
 		}
 
 		return result.(*networkmodels.HashicorpCloudNetwork20200907Peering), nil

diff --git a/internal/provider/data_source_aws_network_peering.go b/internal/provider/data_source_aws_network_peering.go
@@ -16,7 +16,7 @@ func dataSourceAwsNetworkPeering() *schema.Resource {
 		Description: "The AWS network peering data source provides information about an existing network peering between an HVN and a peer AWS VPC.",
 		ReadContext: dataSourceAwsNetworkPeeringRead,
 		Timeouts: &schema.ResourceTimeout{
-			Default: &peeringCreateTimeout,
+			Read: &peeringCreateTimeout,
 		},
 		Schema: map[string]*schema.Schema{
 			// Required inputs
@@ -114,7 +114,7 @@ func dataSourceAwsNetworkPeeringRead(ctx context.Context, d *schema.ResourceData
 	}
 
 	if waitForActive && peering.State != networkmodels.HashicorpCloudNetwork20200907PeeringStateACTIVE {
-		peering, err = clients.WaitForPeeringToBeActive(ctx, client, peering.ID, hvnID, loc, peeringCreateTimeout)
+		peering, err = clients.WaitForPeeringToBeActive(ctx, client, peering.ID, hvnID, loc, d.Timeout(schema.TimeoutRead))
 		if err != nil {
 			return diag.FromErr(err)
 		}

diff --git a/internal/provider/data_source_azure_peering_connection.go b/internal/provider/data_source_azure_peering_connection.go
@@ -16,7 +16,7 @@ func dataSourceAzurePeeringConnection() *schema.Resource {
 		Description: "The Azure peering connection data source provides information about a peering connection between an HVN and a peer Azure VNet.",
 		ReadContext: dataSourceAzurePeeringConnectionRead,
 		Timeouts: &schema.ResourceTimeout{
-			Default: &peeringCreateTimeout,
+			Read: &peeringCreateTimeout,
 		},
 		Schema: map[string]*schema.Schema{
 			// Required inputs
@@ -129,7 +129,7 @@ func dataSourceAzurePeeringConnectionRead(ctx context.Context, d *schema.Resourc
 	}
 
 	if waitForActive && peering.State != networkmodels.HashicorpCloudNetwork20200907PeeringStateACTIVE {
-		peering, err = clients.WaitForPeeringToBeActive(ctx, client, peering.ID, hvnLink.ID, loc, peeringCreateTimeout)
+		peering, err = clients.WaitForPeeringToBeActive(ctx, client, peering.ID, hvnLink.ID, loc, d.Timeout(schema.TimeoutRead))
 		if err != nil {
 			return diag.FromErr(err)
 		}