Added support for Kinesis Extended S3 Configuration Backup Mode

aws/resource_aws_kinesis_firehose_delivery_stream.go

@@ -344,6 +344,7 @@ func flattenKinesisFirehoseDeliveryStream(d *schema.ResourceData, s *firehose.De
 				"role_arn":                   roleArn,
 				"compression_format":         *destination.ExtendedS3DestinationDescription.CompressionFormat,
 				"prefix":                     *destination.ExtendedS3DestinationDescription.Prefix,
+				"s3_backup_mode":             *destination.ExtendedS3DestinationDescription.S3BackupMode,
 				"cloudwatch_logging_options": flattenCloudwatchLoggingOptions(*destination.ExtendedS3DestinationDescription.CloudWatchLoggingOptions),
 			}
 
@@ -355,13 +356,13 @@ func flattenKinesisFirehoseDeliveryStream(d *schema.ResourceData, s *firehose.De
 				extendedS3Configuration["processing_configuration"] = flattenProcessingConfiguration(*v, roleArn)
 			}
 
+			if v := destination.ExtendedS3DestinationDescription.S3BackupDescription; v != nil {
+				extendedS3Configuration["s3_backup_configuration"] = flattenFirehoseS3Configuration(*v)
+			}
+
 			extendedS3ConfList := make([]map[string]interface{}, 1)
 			extendedS3ConfList[0] = extendedS3Configuration
-
-			err := d.Set("extended_s3_configuration", extendedS3ConfList)
-			if err != nil {
-				return err
-			}
+			d.Set("extended_s3_configuration", extendedS3ConfList)
 		}
 		d.Set("destination_id", *destination.DestinationId)
 	}
@@ -491,6 +492,22 @@ func resourceAwsKinesisFirehoseDeliveryStream() *schema.Resource {
 							Optional: true,
 						},
 
+						"s3_backup_mode": {
+							Type:     schema.TypeString,
+							Optional: true,
+							Default:  "Disabled",
+							ValidateFunc: func(v interface{}, k string) (ws []string, errors []error) {
+								value := v.(string)
+								if value != "Disabled" && value != "Enabled" {
+									errors = append(errors, fmt.Errorf(
+										"%q must be one of 'Disabled', 'Enabled'", k))
+								}
+								return
+							},
+						},
+
+						"s3_backup_configuration": s3ConfigurationSchema(),
+
 						"cloudwatch_logging_options": cloudWatchLoggingOptionsSchema(),
 
 						"processing_configuration": processingConfigurationSchema(),
@@ -852,6 +869,11 @@ func createExtendedS3Config(d *schema.ResourceData) *firehose.ExtendedS3Destinat
 		configuration.CloudWatchLoggingOptions = extractCloudWatchLoggingConfiguration(s3)
 	}
 
+	if s3BackupMode, ok := s3["s3_backup_mode"]; ok {
+		configuration.S3BackupMode = aws.String(s3BackupMode.(string))
+		configuration.S3BackupConfiguration = expandS3BackupConfig(d.Get("extended_s3_configuration").([]interface{})[0].(map[string]interface{}))
+	}
+
 	return configuration
 }
 
@@ -927,6 +949,11 @@ func updateExtendedS3Config(d *schema.ResourceData) *firehose.ExtendedS3Destinat
 		configuration.CloudWatchLoggingOptions = extractCloudWatchLoggingConfiguration(s3)
 	}
 
+	if s3BackupMode, ok := s3["s3_backup_mode"]; ok {
+		configuration.S3BackupMode = aws.String(s3BackupMode.(string))
+		configuration.S3BackupUpdate = updateS3BackupConfig(d.Get("extended_s3_configuration").([]interface{})[0].(map[string]interface{}))
+	}
+
 	return configuration
 }
 

aws/resource_aws_kinesis_firehose_delivery_stream_test.go

@@ -260,6 +260,7 @@ func TestAccAWSKinesisFirehoseDeliveryStream_ExtendedS3Updates(t *testing.T) {
 				},
 			},
 		},
+		S3BackupMode: aws.String("Enabled"),
 	}
 
 	resource.Test(t, resource.TestCase{
@@ -489,12 +490,15 @@ func testAccCheckAWSKinesisFirehoseDeliveryStreamAttributes(stream *firehose.Del
 				// destination. For simplicity, our test only have a single S3 or
 				// Redshift destination, so at this time it's safe to match on the first
 				// one
-				var match, processingConfigMatch bool
+				var match, processingConfigMatch, matchS3BackupMode bool
 				for _, d := range stream.Destinations {
 					if d.ExtendedS3DestinationDescription != nil {
 						if *d.ExtendedS3DestinationDescription.BufferingHints.SizeInMBs == *es.BufferingHints.SizeInMBs {
 							match = true
 						}
+						if *d.ExtendedS3DestinationDescription.S3BackupMode == *es.S3BackupMode {
+							matchS3BackupMode = true
+						}
 
 						processingConfigMatch = len(es.ProcessingConfiguration.Processors) == len(d.ExtendedS3DestinationDescription.ProcessingConfiguration.Processors)
 					}
@@ -505,6 +509,9 @@ func testAccCheckAWSKinesisFirehoseDeliveryStreamAttributes(stream *firehose.Del
 				if !processingConfigMatch {
 					return fmt.Errorf("Mismatch extended s3 ProcessingConfiguration.Processors count, expected: %s, got: %s", es, stream.Destinations)
 				}
+				if !matchS3BackupMode {
+					return fmt.Errorf("Mismatch extended s3 S3BackupMode, expected: %s, got: %s", es, stream.Destinations)
+				}
 			}
 
 			if redshiftConfig != nil {
@@ -956,7 +963,8 @@ resource "aws_kinesis_firehose_delivery_stream" "test_stream" {
     			parameter_value = "${aws_lambda_function.lambda_function_test.arn}:$LATEST"
     		}]
     	}]
-    }]
+    }],
+    s3_backup_mode = "Disabled"
   }
 }
 `
@@ -1053,6 +1061,11 @@ resource "aws_kinesis_firehose_delivery_stream" "test_stream" {
     buffer_size = 10
     buffer_interval = 400
     compression_format = "GZIP"
+    s3_backup_mode = "Enabled"
+    s3_backup_configuration {
+      role_arn = "${aws_iam_role.firehose.arn}"
+      bucket_arn = "${aws_s3_bucket.bucket.arn}"
+    }
   }
 }
 `

website/docs/r/kinesis_firehose_delivery_stream.html.markdown

@@ -268,6 +268,8 @@ be used.
 The `extended_s3_configuration` object supports the same fields from `s3_configuration` as well as the following:
 
 * `processing_configuration` - (Optional) The data processing configuration.  More details are given below.
+* `s3_backup_mode` - (Optional) The Amazon S3 backup mode.  Valid values are `Disabled` and `Enabled`.  Default value is `Disabled`.
+* `s3_backup_configuration` - (Optional) The configuration for backup in Amazon S3. Required if `s3_backup_mode` is `Enabled`. Supports the same fields as `s3_configuration` object.
 
 The `redshift_configuration` object supports the following: