Merge pull request #50602 from hashicorp/f-dx_connection_confirmation-timeouts

r/aws_dx_connection_confirmation: add configurable `create` timeout

Author: jar-b

.changelog/50602.txt

@@ -0,0 +1,9 @@
+```release-note:enhancement
+resource/aws_dx_connection: Add configurable `update` timeout. Defaults to the previously hard-coded value of `10m`.
+```
+```release-note:enhancement
+resource/aws_dx_connection_confirmation: Add configurable `create` timeout. Defaults to the previously hard-coded value of `10m`.
+```
+```release-note:note
+resource/aws_dx_connection_confirmation: Because we cannot easily test this functionality, it is best effort and we ask for community help in testing
+```

internal/service/directconnect/connection.go

@@ -257,6 +257,10 @@ func resourceConnection() *schema.Resource {
 				},
 			}
 		},
+
+		Timeouts: &schema.ResourceTimeout{
+			Update: schema.DefaultTimeout(10 * time.Minute),
+		},
 	}
 }
 
@@ -354,7 +358,7 @@ func resourceConnectionUpdate(ctx context.Context, d *schema.ResourceData, meta
 			return sdkdiag.AppendErrorf(diags, "updating Direct Connect Connection (%s): %s", d.Id(), err)
 		}
 
-		if _, err := waitConnectionConfirmed(ctx, conn, d.Id()); err != nil {
+		if err := waitConnectionConfirmed(ctx, conn, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil {
 			return sdkdiag.AppendErrorf(diags, "waiting for Direct Connect Connection (%s) update: %s", d.Id(), err)
 		}
 	}

internal/service/directconnect/connection_confirmation.go

@@ -38,6 +38,10 @@ func resourceConnectionConfirmation() *schema.Resource {
 				},
 			}
 		},
+
+		Timeouts: &schema.ResourceTimeout{
+			Create: schema.DefaultTimeout(10 * time.Minute),
+		},
 	}
 }
 
@@ -56,12 +60,16 @@ func resourceConnectionConfirmationCreate(ctx context.Context, d *schema.Resourc
 		return sdkdiag.AppendErrorf(diags, "confirming Direct Connect Connection (%s): %s", connectionID, err)
 	}
 
-	d.SetId(connectionID)
-
-	if _, err := waitConnectionConfirmed(ctx, conn, d.Id()); err != nil {
-		return sdkdiag.AppendErrorf(diags, "waiting for Direct Connect Connection (%s) confirm: %s", d.Id(), err)
+	if err := waitConnectionConfirmed(ctx, conn, connectionID, d.Timeout(schema.TimeoutCreate)); err != nil {
+		return sdkdiag.AppendErrorf(diags, "waiting for Direct Connect Connection (%s) confirm: %s", connectionID, err)
 	}
 
+	// Setting ID is deferred until after the waiter to prevent a timeout from producing
+	// a tainted resource.
+	//
+	// As a "connection" resource type, there is nothing to clean up when waiting times out.
+	d.SetId(connectionID)
+
 	return diags
 }
 
@@ -84,22 +92,14 @@ func resourceConnectionConfirmationRead(ctx context.Context, d *schema.ResourceD
 	return diags
 }
 
-func waitConnectionConfirmed(ctx context.Context, conn *directconnect.Client, id string) (*awstypes.Connection, error) { //nolint:unparam
-	const (
-		timeout = 10 * time.Minute
-	)
+func waitConnectionConfirmed(ctx context.Context, conn *directconnect.Client, id string, timeout time.Duration) error {
 	stateConf := &retry.StateChangeConf{
 		Pending: enum.Slice(awstypes.ConnectionStatePending, awstypes.ConnectionStateOrdering, awstypes.ConnectionStateRequested),
 		Target:  enum.Slice(awstypes.ConnectionStateAvailable),
 		Refresh: statusConnection(conn, id),
 		Timeout: timeout,
 	}
 
-	outputRaw, err := stateConf.WaitForStateContext(ctx)
-
-	if output, ok := outputRaw.(*awstypes.Connection); ok {
-		return output, err
-	}
-
-	return nil, err
+	_, err := stateConf.WaitForStateContext(ctx)
+	return err
 }

website/docs/r/dx_connection.html.markdown

@@ -95,6 +95,12 @@ This resource exports the following attributes in addition to the arguments abov
 * `remaining` - Number of rate limiters remaining (available).
 * `total_bandwidth` - Total bandwidth allocated across all rate limiters.
 
+## Timeouts
+
+[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts):
+
+- `update` - (Default `10m`)
+
 ## Import
 
 In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import Direct Connect connections using the connection `id`. For example:

website/docs/r/dx_connection_confirmation.html.markdown

@@ -35,3 +35,9 @@ from your statefile and management, **but will not destroy the Hosted Connection
 This resource exports the following attributes in addition to the arguments above:
 
 * `id` - The ID of the connection.
+
+## Timeouts
+
+[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts):
+
+- `create` - (Default `10m`)