refactor(logging): use distribution tags and support all destination types

- Remove dedicated tags from logging variables, use var.tags instead
- Add delivery_destination_type parameter for X-Ray trace delivery support
- Make destination_arn optional (not required for X-Ray)
- Make delivery_destination_configuration a dynamic block

Author: clark42

README.md

@@ -213,8 +213,8 @@ No modules.
 | <a name="input_restrictions"></a> [restrictions](#input\_restrictions) | The restrictions configuration for this distribution | <pre>object({<br/>    geo_restriction = object({<br/>      locations        = optional(list(string))<br/>      restriction_type = optional(string, "none")<br/>    })<br/>  })</pre> | <pre>{<br/>  "geo_restriction": {<br/>    "restriction_type": "none"<br/>  }<br/>}</pre> | no |
 | <a name="input_retain_on_delete"></a> [retain\_on\_delete](#input\_retain\_on\_delete) | Disables the distribution instead of deleting it when destroying the resource through Terraform. If this is set, the distribution needs to be deleted manually afterwards | `bool` | `null` | no |
 | <a name="input_staging"></a> [staging](#input\_staging) | Whether the distribution is a staging distribution | `bool` | `null` | no |
-| <a name="input_std_logging_delivery"></a> [std\_logging\_delivery](#input\_std\_logging\_delivery) | Configuration for the standard logging delivery | <pre>object({<br/>    field_delimiter = optional(string)<br/>    record_fields   = optional(list(string))<br/>    s3_delivery_configuration = optional(object({<br/>      enable_hive_compatible_path = optional(bool)<br/>      suffix_path                 = optional(string)<br/>    }))<br/>    tags = optional(map(string), {})<br/>  })</pre> | `null` | no |
-| <a name="input_std_logging_destination"></a> [std\_logging\_destination](#input\_std\_logging\_destination) | Configuration for creating a new standard logging destination. Ignored if std\_logging\_destination\_arn is set | <pre>object({<br/>    name            = string<br/>    output_format   = optional(string, "json")<br/>    destination_arn = string<br/>    tags            = optional(map(string), {})<br/>  })</pre> | `null` | no |
+| <a name="input_std_logging_delivery"></a> [std\_logging\_delivery](#input\_std\_logging\_delivery) | Configuration for the standard logging delivery | <pre>object({<br/>    field_delimiter = optional(string)<br/>    record_fields   = optional(list(string))<br/>    s3_delivery_configuration = optional(object({<br/>      enable_hive_compatible_path = optional(bool)<br/>      suffix_path                 = optional(string)<br/>    }))<br/>  })</pre> | `null` | no |
+| <a name="input_std_logging_destination"></a> [std\_logging\_destination](#input\_std\_logging\_destination) | Configuration for creating a new standard logging destination. Ignored if std\_logging\_destination\_arn is set | <pre>object({<br/>    name                      = string<br/>    output_format             = optional(string, "json") # json, plain, w3c, raw, parquet<br/>    destination_arn           = optional(string)         # Required for S3, CloudWatch Logs, Firehose. Not required for X-Ray<br/>    delivery_destination_type = optional(string)         # S3, CWL, FH, XRAY. Auto-detected from destination_arn if not set<br/>  })</pre> | `null` | no |
 | <a name="input_std_logging_destination_arn"></a> [std\_logging\_destination\_arn](#input\_std\_logging\_destination\_arn) | ARN of an existing CloudWatch Log Delivery Destination to use. If set, std\_logging\_destination is ignored | `string` | `null` | no |
 | <a name="input_std_logging_region"></a> [std\_logging\_region](#input\_std\_logging\_region) | Region for standard logging resources. Required for CloudFront (must be us-east-1 for the source) | `string` | `"us-east-1"` | no |
 | <a name="input_std_logging_source_name"></a> [std\_logging\_source\_name](#input\_std\_logging\_source\_name) | Name for the CloudWatch Log Delivery Source. Defaults to 'cloudfront-<distribution\_id>' | `string` | `null` | no |

main.tf

@@ -553,14 +553,19 @@ resource "aws_cloudwatch_log_delivery_destination" "this" {
 
   region = var.std_logging_region
 
-  name          = var.std_logging_destination.name
-  output_format = var.std_logging_destination.output_format
+  name                      = var.std_logging_destination.name
+  output_format             = var.std_logging_destination.output_format
+  delivery_destination_type = var.std_logging_destination.delivery_destination_type
 
-  delivery_destination_configuration {
-    destination_resource_arn = var.std_logging_destination.destination_arn
+  dynamic "delivery_destination_configuration" {
+    for_each = var.std_logging_destination.destination_arn != null ? [1] : []
+
+    content {
+      destination_resource_arn = var.std_logging_destination.destination_arn
+    }
   }
 
-  tags = var.std_logging_destination.tags
+  tags = var.tags
 }
 
 locals {
@@ -588,7 +593,7 @@ resource "aws_cloudwatch_log_delivery" "this" {
     }
   }
 
-  tags = try(var.std_logging_delivery.tags, {})
+  tags = var.tags
 }
 
 ################################################################################

variables.tf

@@ -485,10 +485,10 @@ variable "std_logging_destination_arn" {
 variable "std_logging_destination" {
   description = "Configuration for creating a new standard logging destination. Ignored if std_logging_destination_arn is set"
   type = object({
-    name            = string
-    output_format   = optional(string, "json")
-    destination_arn = string
-    tags            = optional(map(string), {})
+    name                      = string
+    output_format             = optional(string, "json") # json, plain, w3c, raw, parquet
+    destination_arn           = optional(string)         # Required for S3, CloudWatch Logs, Firehose. Not required for X-Ray
+    delivery_destination_type = optional(string)         # S3, CWL, FH, XRAY. Auto-detected from destination_arn if not set
   })
   default = null
 }
@@ -502,7 +502,6 @@ variable "std_logging_delivery" {
       enable_hive_compatible_path = optional(bool)
       suffix_path                 = optional(string)
     }))
-    tags = optional(map(string), {})
   })
   default = null
 }