fix: change s3 inventory optional fields (#321)

githubjianli · JianLi-Expedia · web-flow · commit 2d5e78da9d53 · 2025-06-20T10:50:32.000-07:00
* fix: change s3 inventory optional fields

* fix: add variable for backwards support

* fix: update variable type

---------

Co-authored-by: janli &lt;janli@expediagroup.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [7.10.19] - 2025-06-18
+### Changed
+- Added new variable `s3_inventory_optional_fields` to support different optional fields
+
 ## [7.10.18] - 2025-06-10
 ### Changed
 - Add Lakeformation customer account default database permissions.
diff --git a/VARIABLES.md b/VARIABLES.md
@@ -116,6 +116,7 @@
 | s3\_inventory\_customer\_accounts                         | AWS account IDs allowed to access s3 inventory database.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `list(string)`           | `[]`                                                                                                                                                                                                                                                                                           |    no    |
 | s3\_inventory\_expiration\_days                           | S3 inventory bucket objects expiration days.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `number`                 | `"7"`                                                                                                                                                                                                                                                                                        |    no    |
 | s3\_inventory\_format                                     | Output format for S3 inventory results. Can be Parquet, ORC, CSV                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `string`                 | `"ORC"`                                                                                                                                                                                                                                                                                        |    no    |
+| s3\_inventory\_optional\_fields                                     | Optional fields for S3 inventory results                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `list(string)`                 | `"["Size", "LastModifiedDate", "StorageClass", "ETag", "IntelligentTieringAccessTier"]"`                                                                                                                                                                                                                                                                                        |    no    |
 | s3\_inventory\_update\_schedule                           | Cron schedule to update S3 inventory tables (if enabled). Defaults to every 12 hours.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `string`                 | `"0 */12 * * *"`                                                                                                                                                                                                                                                                               |    no    |
 | s3\_lifecycle\_abort\_incomplete\_multipart\_upload\_days | Number of days after which incomplete multipart uploads will be deleted.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `string`                 | `"7"`                                                                                                                                                                                                                                                                                          |    no    |
 | s3\_lifecycle\_policy\_transition\_period                 | S3 Lifecycle Policy number of days for Transition rule                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `string`                 | `"30"`                                                                                                                                                                                                                                                                                         |    no    |
diff --git a/s3.tf b/s3.tf
@@ -140,7 +140,7 @@ resource "aws_s3_bucket_inventory" "apiary_bucket" {
     }
   }
 
-  optional_fields = ["Size", "LastModifiedDate", "StorageClass", "ETag", "IntelligentTieringAccessTier"]
+  optional_fields = var.s3_inventory_optional_fields
 }
 
 resource "aws_s3_bucket_public_access_block" "apiary_bucket" {
diff --git a/variables.tf b/variables.tf
@@ -693,6 +693,12 @@ variable "s3_inventory_format" {
   default     = "ORC"
 }
 
+variable "s3_inventory_optional_fields" {
+  description = "Optional fields for S3 inventory results"
+  type        = list(string)
+  default     = ["Size", "LastModifiedDate", "StorageClass", "ETag", "IntelligentTieringAccessTier"]
+}
+
 variable "s3_inventory_customer_accounts" {
   description = "AWS account IDs allowed to access s3 inventory database."
   type        = list(string)

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ resource "aws_s3_bucket_inventory" "apiary_bucket" {`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
`143`		`- optional_fields = ["Size", "LastModifiedDate", "StorageClass", "ETag", "IntelligentTieringAccessTier"]`
	`143`	`+ optional_fields = var.s3_inventory_optional_fields`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`resource "aws_s3_bucket_public_access_block" "apiary_bucket" {`