From 9cd552bd97e7a154cd140f154e39f029a1744dd2 Mon Sep 17 00:00:00 2001 From: kterada0509 Date: Sun, 17 Mar 2019 21:46:50 +0900 Subject: [PATCH] Add support for tag-on-create --- aws/resource_aws_kinesis_firehose_delivery_stream.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/aws/resource_aws_kinesis_firehose_delivery_stream.go b/aws/resource_aws_kinesis_firehose_delivery_stream.go index fd72e32e1a2c..87d21ea55651 100644 --- a/aws/resource_aws_kinesis_firehose_delivery_stream.go +++ b/aws/resource_aws_kinesis_firehose_delivery_stream.go @@ -2078,6 +2078,10 @@ func resourceAwsKinesisFirehoseDeliveryStreamCreate(d *schema.ResourceData, meta } } + if v, ok := d.GetOk("tags"); ok { + createInput.Tags = tagsFromMapKinesisFirehose(v.(map[string]interface{})) + } + err := resource.Retry(1*time.Minute, func() *resource.RetryError { _, err := conn.CreateDeliveryStream(createInput) if err != nil { @@ -2127,12 +2131,6 @@ func resourceAwsKinesisFirehoseDeliveryStreamCreate(d *schema.ResourceData, meta d.SetId(*s.DeliveryStreamARN) d.Set("arn", s.DeliveryStreamARN) - if err := setTagsKinesisFirehose(conn, d, sn); err != nil { - return fmt.Errorf( - "Error setting for Kinesis Stream (%s) tags: %s", - sn, err) - } - return resourceAwsKinesisFirehoseDeliveryStreamRead(d, meta) }