Make logging variables top level for simple_bucket module

modules/simple_bucket/main.tf

@@ -60,10 +60,10 @@ resource "google_storage_bucket" "bucket" {
   }
 
   dynamic "logging" {
-    for_each = var.logging == null ? [] : [var.logging]
+    for_each = var.log_bucket == null ? [] : [var.log_bucket]
     content {
-      log_bucket        = var.logging.log_bucket
-      log_object_prefix = var.logging.log_object_prefix == "" ? var.name : var.logging.log_object_prefix
+      log_bucket        = var.log_bucket
+      log_object_prefix = var.log_object_prefix
     }
   }
 }

modules/simple_bucket/variables.tf

@@ -105,11 +105,14 @@ variable "lifecycle_rules" {
   default = []
 }
 
-variable "logging" {
-  description = "Configuration of the bucket's access and storage logs. If log_object_prefix is set to the empty string, the name of the bucket will be used."
-  type = object({
-    log_bucket        = string
-    log_object_prefix = string
-  })
-  default = null
+variable "log_bucket" {
+  description = "The bucket that will receive log objects."
+  type        = string
+  default     = null
+}
+
+variable "log_object_prefix" {
+  description = "The object prefix for log objects. If it's not provided, by default GCS sets this to this bucket's name"
+  type        = string
+  default     = null
 }