Merge pull request #20658 from orf/main

Add support for BucketKeyStatus to S3 inventories

.changelog/20658.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_s3_bucket_inventory: Add missing values to `optional_fields` argument
+```

aws/resource_aws_s3_bucket_inventory.go

@@ -164,20 +164,8 @@ func resourceAwsS3BucketInventory() *schema.Resource {
 				Type:     schema.TypeSet,
 				Optional: true,
 				Elem: &schema.Schema{
-					Type: schema.TypeString,
-					ValidateFunc: validation.StringInSlice([]string{
-						s3.InventoryOptionalFieldSize,
-						s3.InventoryOptionalFieldLastModifiedDate,
-						s3.InventoryOptionalFieldStorageClass,
-						s3.InventoryOptionalFieldEtag,
-						s3.InventoryOptionalFieldIsMultipartUploaded,
-						s3.InventoryOptionalFieldReplicationStatus,
-						s3.InventoryOptionalFieldEncryptionStatus,
-						s3.InventoryOptionalFieldObjectLockMode,
-						s3.InventoryOptionalFieldObjectLockRetainUntilDate,
-						s3.InventoryOptionalFieldObjectLockLegalHoldStatus,
-						s3.InventoryOptionalFieldIntelligentTieringAccessTier,
-					}, false),
+					Type:         schema.TypeString,
+					ValidateFunc: validation.StringInSlice(s3.InventoryOptionalField_Values(), false),
 				},
 				Set: schema.HashString,
 			},

website/docs/r/s3_bucket_inventory.html.markdown

@@ -88,8 +88,7 @@ The following arguments are supported:
 * `destination` - (Required) Contains information about where to publish the inventory results (documented below).
 * `enabled` - (Optional, Default: `true`) Specifies whether the inventory is enabled or disabled.
 * `filter` - (Optional) Specifies an inventory filter. The inventory only includes objects that meet the filter's criteria (documented below).
-* `optional_fields` - (Optional) List of optional fields that are included in the inventory results.
-Valid values: `Size`, `LastModifiedDate`, `StorageClass`, `ETag`, `IsMultipartUploaded`, `ReplicationStatus`, `EncryptionStatus`, `ObjectLockRetainUntilDate`, `ObjectLockMode`, `ObjectLockLegalHoldStatus`, `IntelligentTieringAccessTier`.
+* `optional_fields` - (Optional) List of optional fields that are included in the inventory results. Please refer to the S3 [documentation](https://docs.aws.amazon.com/AmazonS3/latest/API/API_InventoryConfiguration.html#AmazonS3-Type-InventoryConfiguration-OptionalFields) for more details.
 
 The `filter` configuration supports the following: