Merge pull request #6729 from ewbankkit/issue-6278

Support S3 Inventory Apache Parquet format reports
hashicorp · Dec 5, 2018 · cc26a65 · cc26a65
2 parents 0f10ccc + 7b6c795
commit cc26a65
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/aws/resource_aws_s3_bucket_inventory.go b/aws/resource_aws_s3_bucket_inventory.go
@@ -73,6 +73,7 @@ func resourceAwsS3BucketInventory() *schema.Resource {
 										ValidateFunc: validation.StringInSlice([]string{
 											s3.InventoryFormatCsv,
 											s3.InventoryFormatOrc,
+											s3.InventoryFormatParquet,
 										}, false),
 									},
 									"bucket_arn": {

diff --git a/aws/resource_aws_s3_bucket_inventory_test.go b/aws/resource_aws_s3_bucket_inventory_test.go
@@ -281,7 +281,7 @@ resource "aws_s3_bucket_inventory" "test" {
 
   destination {
     bucket {
-      format = "ORC"
+      format = "Parquet"
       bucket_arn = "${aws_s3_bucket.bucket.arn}"
 
       encryption {

diff --git a/website/docs/r/s3_bucket_inventory.html.markdown b/website/docs/r/s3_bucket_inventory.html.markdown
@@ -105,7 +105,7 @@ The `destination` configuration supports the following:
 The `bucket` configuration supports the following:
 
 * `bucket_arn` - (Required) The Amazon S3 bucket ARN of the destination.
-* `format` - (Required) Specifies the output format of the inventory results. Can be `CSV` or [`ORC`](https://orc.apache.org/).
+* `format` - (Required) Specifies the output format of the inventory results. Can be `CSV`, [`ORC`](https://orc.apache.org/) or [`Parquet`](https://parquet.apache.org/).
 * `account_id` - (Optional) The ID of the account that owns the destination bucket. Recommended to be set to prevent problems if the destination bucket ownership changes.
 * `prefix` - (Optional) The prefix that is prepended to all inventory results.
 * `encryption` - (Optional) Contains the type of server-side encryption to use to encrypt the inventory (documented below).