Merge pull request #7981 from kterada0509/feature/add-support-for-tag…

…-on-create-aws_kinesis_firehose_delivery_stream

Add support for tag-on-create for aws_kinesis_firehose_delivery_stream resource

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 {
@@ -2130,12 +2134,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)
 }