rename variables

Author: magreenbaum

README.md

@@ -260,10 +260,10 @@ No modules.
 | <a name="input_lifecycle_rule"></a> [lifecycle\_rule](#input\_lifecycle\_rule) | List of maps containing configuration of object lifecycle management. | `any` | `[]` | no |
 | <a name="input_location_type"></a> [location\_type](#input\_location\_type) | Location type. Valid values: `AvailabilityZone` or `LocalZone` | `string` | `null` | no |
 | <a name="input_logging"></a> [logging](#input\_logging) | Map containing access bucket logging configuration. | `any` | `{}` | no |
-| <a name="input_metadata_configuration_state"></a> [metadata\_configuration\_state](#input\_metadata\_configuration\_state) | Configuration state of the inventory table, indicating whether the inventory table is enabled or disabled. Valid values: ENABLED, DISABLED | `string` | `null` | no |
 | <a name="input_metadata_encryption_configuration"></a> [metadata\_encryption\_configuration](#input\_metadata\_encryption\_configuration) | Encryption configuration block | `any` | `null` | no |
-| <a name="input_metadata_record_expiration"></a> [metadata\_record\_expiration](#input\_metadata\_record\_expiration) | Whether journal table record expiration is enabled or disabled. Valid values: ENABLED, DISABLED | `string` | `null` | no |
-| <a name="input_metadata_record_expiration_days"></a> [metadata\_record\_expiration\_days](#input\_metadata\_record\_expiration\_days) | Number of days to retain journal table records | `number` | `null` | no |
+| <a name="input_metadata_inventory_table_configuration_state"></a> [metadata\_inventory\_table\_configuration\_state](#input\_metadata\_inventory\_table\_configuration\_state) | Configuration state of the inventory table, indicating whether the inventory table is enabled or disabled. Valid values: ENABLED, DISABLED | `string` | `null` | no |
+| <a name="input_metadata_journal_table_record_expiration"></a> [metadata\_journal\_table\_record\_expiration](#input\_metadata\_journal\_table\_record\_expiration) | Whether journal table record expiration is enabled or disabled. Valid values: ENABLED, DISABLED | `string` | `null` | no |
+| <a name="input_metadata_journal_table_record_expiration_days"></a> [metadata\_journal\_table\_record\_expiration\_days](#input\_metadata\_journal\_table\_record\_expiration\_days) | Number of days to retain journal table records | `number` | `null` | no |
 | <a name="input_metric_configuration"></a> [metric\_configuration](#input\_metric\_configuration) | Map containing bucket metric configuration. | `any` | `[]` | no |
 | <a name="input_object_lock_configuration"></a> [object\_lock\_configuration](#input\_object\_lock\_configuration) | Map containing S3 object locking configuration. | `any` | `{}` | no |
 | <a name="input_object_lock_enabled"></a> [object\_lock\_enabled](#input\_object\_lock\_enabled) | Whether S3 bucket should have an Object Lock configuration enabled. | `bool` | `false` | no |

examples/complete/main.tf

@@ -376,12 +376,12 @@ module "s3_bucket" {
     }
   ]
 
-  # metadata configuration
-  # create_metadata_configuration   = true
-  # metadata_configuration_state    = "ENABLED"
-  # metadata_record_expiration      = "ENABLED"
-  # metadata_record_expiration_days = 7
-  # metadata_encryption_configuration = {
-  #   sse_algorithm = "AES256"
-  # }
+  # metadata configuration example
+  create_metadata_configuration                 = true
+  metadata_inventory_table_configuration_state  = "ENABLED"
+  metadata_journal_table_record_expiration      = "ENABLED"
+  metadata_journal_table_record_expiration_days = 7
+  metadata_encryption_configuration = {
+    sse_algorithm = "AES256"
+  }
 }

main.tf

@@ -1364,7 +1364,7 @@ resource "aws_s3_bucket_metadata_configuration" "this" {
 
   metadata_configuration {
     inventory_table_configuration {
-      configuration_state = var.metadata_configuration_state
+      configuration_state = var.metadata_inventory_table_configuration_state
 
       dynamic "encryption_configuration" {
         for_each = var.metadata_encryption_configuration != null ? [var.metadata_encryption_configuration] : []
@@ -1377,8 +1377,8 @@ resource "aws_s3_bucket_metadata_configuration" "this" {
 
     journal_table_configuration {
       record_expiration {
-        days       = var.metadata_record_expiration_days
-        expiration = var.metadata_record_expiration
+        days       = var.metadata_journal_table_record_expiration_days
+        expiration = var.metadata_journal_table_record_expiration
       }
     }
   }

variables.tf

@@ -389,7 +389,7 @@ variable "create_metadata_configuration" {
   default     = false
 }
 
-variable "metadata_configuration_state" {
+variable "metadata_inventory_table_configuration_state" {
   description = "Configuration state of the inventory table, indicating whether the inventory table is enabled or disabled. Valid values: ENABLED, DISABLED"
   type        = string
   default     = null
@@ -401,13 +401,13 @@ variable "metadata_encryption_configuration" {
   default     = null
 }
 
-variable "metadata_record_expiration_days" {
+variable "metadata_journal_table_record_expiration_days" {
   description = "Number of days to retain journal table records"
   type        = number
   default     = null
 }
 
-variable "metadata_record_expiration" {
+variable "metadata_journal_table_record_expiration" {
   description = "Whether journal table record expiration is enabled or disabled. Valid values: ENABLED, DISABLED"
   type        = string
   default     = null

wrappers/main.tf

@@ -52,10 +52,10 @@ module "wrapper" {
   lifecycle_rule                                  = try(each.value.lifecycle_rule, var.defaults.lifecycle_rule, [])
   location_type                                   = try(each.value.location_type, var.defaults.location_type, null)
   logging                                         = try(each.value.logging, var.defaults.logging, {})
-  metadata_configuration_state                    = try(each.value.metadata_configuration_state, var.defaults.metadata_configuration_state, null)
   metadata_encryption_configuration               = try(each.value.metadata_encryption_configuration, var.defaults.metadata_encryption_configuration, null)
-  metadata_record_expiration                      = try(each.value.metadata_record_expiration, var.defaults.metadata_record_expiration, null)
-  metadata_record_expiration_days                 = try(each.value.metadata_record_expiration_days, var.defaults.metadata_record_expiration_days, null)
+  metadata_inventory_table_configuration_state    = try(each.value.metadata_inventory_table_configuration_state, var.defaults.metadata_inventory_table_configuration_state, null)
+  metadata_journal_table_record_expiration        = try(each.value.metadata_journal_table_record_expiration, var.defaults.metadata_journal_table_record_expiration, null)
+  metadata_journal_table_record_expiration_days   = try(each.value.metadata_journal_table_record_expiration_days, var.defaults.metadata_journal_table_record_expiration_days, null)
   metric_configuration                            = try(each.value.metric_configuration, var.defaults.metric_configuration, [])
   object_lock_configuration                       = try(each.value.object_lock_configuration, var.defaults.object_lock_configuration, {})
   object_lock_enabled                             = try(each.value.object_lock_enabled, var.defaults.object_lock_enabled, false)