Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

r/aws_kinesis_firehose_delivery_stream add timeouts (#22645) #28469

Merged
merged 7 commits into from
Feb 13, 2023
Merged

r/aws_kinesis_firehose_delivery_stream add timeouts (#22645) #28469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9a0a875
r/aws_kinesis_firehose_delivery_stream add timeouts (#22645)
ameddin73 Dec 8, 2022
29f2b20
Merge branch 'main' into main
ameddin73 Feb 1, 2023
81a413b
Merge remote-tracking branch 'origin/main' into ameddin73/main
jar-b Feb 10, 2023
889e449
r/aws_firehose_delivery_stream: add configurable delete timeout
jar-b Feb 10, 2023
f55c2a5
r/aws_firehose_delivery_stream(docs): update timeouts
jar-b Feb 10, 2023
0995915
r/aws_firehose_delivery_stream: add configurable update timeout
jar-b Feb 10, 2023
1e3048b
chore: changelog
jar-b Feb 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/28469.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_firehose_delivery_stream: Add configurable timeouts for create, update, and delete
```
17 changes: 12 additions & 5 deletions internal/service/firehose/delivery_stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"log"
"regexp"
"strings"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/arn"
Expand Down Expand Up @@ -865,6 +866,12 @@ func ResourceDeliveryStream() *schema.Resource {
},
},

Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(30 * time.Minute),
Update: schema.DefaultTimeout(10 * time.Minute),
Delete: schema.DefaultTimeout(30 * time.Minute),
},

CustomizeDiff: verify.SetTagsDiff,

SchemaVersion: 1,
Expand Down Expand Up @@ -2658,7 +2665,7 @@ func resourceDeliveryStreamCreate(ctx context.Context, d *schema.ResourceData, m
return sdkdiag.AppendErrorf(diags, "creating Kinesis Firehose Delivery Stream (%s): %s", sn, err)
}

s, err := waitDeliveryStreamCreated(ctx, conn, sn)
s, err := waitDeliveryStreamCreated(ctx, conn, sn, d.Timeout(schema.TimeoutCreate))

if err != nil {
return sdkdiag.AppendErrorf(diags, "creating Kinesis Firehose Delivery Stream (%s): waiting for completion: %s", sn, err)
Expand All @@ -2679,7 +2686,7 @@ func resourceDeliveryStreamCreate(ctx context.Context, d *schema.ResourceData, m
return sdkdiag.AppendErrorf(diags, "starting Kinesis Firehose Delivery Stream (%s) encryption: %s", sn, err)
}

if _, err := waitDeliveryStreamEncryptionEnabled(ctx, conn, sn); err != nil {
if _, err := waitDeliveryStreamEncryptionEnabled(ctx, conn, sn, d.Timeout(schema.TimeoutCreate)); err != nil {
return sdkdiag.AppendErrorf(diags, "waiting for Kinesis Firehose Delivery Stream (%s) encryption enable: %s", sn, err)
}
}
Expand Down Expand Up @@ -2835,7 +2842,7 @@ func resourceDeliveryStreamUpdate(ctx context.Context, d *schema.ResourceData, m
return sdkdiag.AppendErrorf(diags, "stopping Kinesis Firehose Delivery Stream (%s) encryption: %s", sn, err)
}

if _, err := waitDeliveryStreamEncryptionDisabled(ctx, conn, sn); err != nil {
if _, err := waitDeliveryStreamEncryptionDisabled(ctx, conn, sn, d.Timeout(schema.TimeoutUpdate)); err != nil {
return sdkdiag.AppendErrorf(diags, "waiting for Kinesis Firehose Delivery Stream (%s) encryption disable: %s", sn, err)
}
} else {
Expand All @@ -2850,7 +2857,7 @@ func resourceDeliveryStreamUpdate(ctx context.Context, d *schema.ResourceData, m
return sdkdiag.AppendErrorf(diags, "starting Kinesis Firehose Delivery Stream (%s) encryption: %s", sn, err)
}

if _, err := waitDeliveryStreamEncryptionEnabled(ctx, conn, sn); err != nil {
if _, err := waitDeliveryStreamEncryptionEnabled(ctx, conn, sn, d.Timeout(schema.TimeoutUpdate)); err != nil {
return sdkdiag.AppendErrorf(diags, "waiting for Kinesis Firehose Delivery Stream (%s) encryption enable: %s", sn, err)
}
}
Expand Down Expand Up @@ -2919,7 +2926,7 @@ func resourceDeliveryStreamDelete(ctx context.Context, d *schema.ResourceData, m
return sdkdiag.AppendErrorf(diags, "deleting Kinesis Firehose Delivery Stream (%s): %s", sn, err)
}

_, err = waitDeliveryStreamDeleted(ctx, conn, sn)
_, err = waitDeliveryStreamDeleted(ctx, conn, sn, d.Timeout(schema.TimeoutDelete))

if err != nil {
return sdkdiag.AppendErrorf(diags, "waiting for Kinesis Firehose Delivery Stream (%s) delete: %s", sn, err)
Expand Down
24 changes: 8 additions & 16 deletions internal/service/firehose/wait.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,12 @@ import (
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
)

const (
deliveryStreamCreatedTimeout = 20 * time.Minute
deliveryStreamDeletedTimeout = 20 * time.Minute

deliveryStreamEncryptionEnabledTimeout = 10 * time.Minute
deliveryStreamEncryptionDisabledTimeout = 10 * time.Minute
)

func waitDeliveryStreamCreated(ctx context.Context, conn *firehose.Firehose, name string) (*firehose.DeliveryStreamDescription, error) {
func waitDeliveryStreamCreated(ctx context.Context, conn *firehose.Firehose, name string, timeout time.Duration) (*firehose.DeliveryStreamDescription, error) {
stateConf := &resource.StateChangeConf{
Pending: []string{firehose.DeliveryStreamStatusCreating},
Target: []string{firehose.DeliveryStreamStatusActive},
Refresh: statusDeliveryStream(ctx, conn, name),
Timeout: deliveryStreamCreatedTimeout,
Timeout: timeout,
}

outputRaw, err := stateConf.WaitForStateContext(ctx)
Expand All @@ -40,12 +32,12 @@ func waitDeliveryStreamCreated(ctx context.Context, conn *firehose.Firehose, nam
return nil, err
}

func waitDeliveryStreamDeleted(ctx context.Context, conn *firehose.Firehose, name string) (*firehose.DeliveryStreamDescription, error) {
func waitDeliveryStreamDeleted(ctx context.Context, conn *firehose.Firehose, name string, timeout time.Duration) (*firehose.DeliveryStreamDescription, error) {
stateConf := &resource.StateChangeConf{
Pending: []string{firehose.DeliveryStreamStatusDeleting},
Target: []string{},
Refresh: statusDeliveryStream(ctx, conn, name),
Timeout: deliveryStreamDeletedTimeout,
Timeout: timeout,
}

outputRaw, err := stateConf.WaitForStateContext(ctx)
Expand All @@ -61,12 +53,12 @@ func waitDeliveryStreamDeleted(ctx context.Context, conn *firehose.Firehose, nam
return nil, err
}

func waitDeliveryStreamEncryptionEnabled(ctx context.Context, conn *firehose.Firehose, name string) (*firehose.DeliveryStreamEncryptionConfiguration, error) { //nolint:unparam
func waitDeliveryStreamEncryptionEnabled(ctx context.Context, conn *firehose.Firehose, name string, timeout time.Duration) (*firehose.DeliveryStreamEncryptionConfiguration, error) { //nolint:unparam
stateConf := &resource.StateChangeConf{
Pending: []string{firehose.DeliveryStreamEncryptionStatusEnabling},
Target: []string{firehose.DeliveryStreamEncryptionStatusEnabled},
Refresh: statusDeliveryStreamEncryptionConfiguration(ctx, conn, name),
Timeout: deliveryStreamEncryptionEnabledTimeout,
Timeout: timeout,
}

outputRaw, err := stateConf.WaitForStateContext(ctx)
Expand All @@ -82,12 +74,12 @@ func waitDeliveryStreamEncryptionEnabled(ctx context.Context, conn *firehose.Fir
return nil, err
}

func waitDeliveryStreamEncryptionDisabled(ctx context.Context, conn *firehose.Firehose, name string) (*firehose.DeliveryStreamEncryptionConfiguration, error) {
func waitDeliveryStreamEncryptionDisabled(ctx context.Context, conn *firehose.Firehose, name string, timeout time.Duration) (*firehose.DeliveryStreamEncryptionConfiguration, error) {
stateConf := &resource.StateChangeConf{
Pending: []string{firehose.DeliveryStreamEncryptionStatusDisabling},
Target: []string{firehose.DeliveryStreamEncryptionStatusDisabled},
Refresh: statusDeliveryStreamEncryptionConfiguration(ctx, conn, name),
Timeout: deliveryStreamEncryptionDisabledTimeout,
Timeout: timeout,
}

outputRaw, err := stateConf.WaitForStateContext(ctx)
Expand Down
8 changes: 8 additions & 0 deletions website/docs/r/kinesis_firehose_delivery_stream.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,14 @@ In addition to all arguments above, the following attributes are exported:

[1]: https://aws.amazon.com/documentation/firehose/

## Timeouts

[Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts):

* `create` - (Default `30m`)
* `update` - (Default `10m`)
* `delete` - (Default `30m`)

## Import

Kinesis Firehose Delivery streams can be imported using the stream ARN, e.g.,
Expand Down