From 7684238a69c80f52b3faf7aee51a6bcd2b1ddbcb Mon Sep 17 00:00:00 2001 From: Joshua Timmons Date: Wed, 3 Aug 2022 18:07:12 -0400 Subject: [PATCH] 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 --- docs/data-sources/aws_network_peering.md | 2 +- docs/data-sources/azure_peering_connection.md | 2 +- internal/clients/peering.go | 2 +- internal/provider/data_source_aws_network_peering.go | 4 ++-- internal/provider/data_source_azure_peering_connection.go | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/data-sources/aws_network_peering.md b/docs/data-sources/aws_network_peering.md index dce1e4f8d..f67bbac0c 100644 --- 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 index 03c2331b5..0d47f21ae 100644 --- 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 index 2a66d0632..2a543a3aa 100644 --- 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 index 53c3ba25a..bdcf8a5cf 100644 --- 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 index 2c81575fc..6d622cd84 100644 --- 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) }