allow to choose s3 prefix/key as variable - default to AWS_ACCOUNT

README.md

@@ -32,10 +32,11 @@ This module creates:
 
 ## Inputs
 
-| Name | Description | Type | Default | Required |
-|------|-------------|------|---------|:--------:|
-| cloudwatch\_logs\_export\_bucket | Bucket to export logs | `string` | `""` | no |
-| runtime | Runtime version of the lambda function | `string` | `"python3.10"` | no |
+| Name                             | Description                                            | Type | Default       | Required |
+|----------------------------------|--------------------------------------------------------|------|---------------|:--------:|
+| cloudwatch\_logs\_export\_bucket | Bucket to export logs                                  | `string` | `""`          | no |
+| s3\_prefix                       | s3 Key where to export logs ( default to AWS_ACCOUNT ) | `string` | `null`         | no |
+| runtime                          | Runtime version of the lambda function                 | `string` | `"python3.10"` | no |
 
 ## Outputs
 

_variables.tf

@@ -8,4 +8,10 @@ variable "runtime" {
   type        = string
   default     = "python3.10"
   description = "Runtime version of the lambda function"
+}
+
+variable "s3_prefix" {
+  type = string
+  default = null
+  description = "Key prefix where to store logs, defaulted to aws_account if not set"
 }

cloudwatch-logs-exporter.tf

@@ -109,7 +109,7 @@ resource "aws_lambda_function" "log_exporter" {
   environment {
     variables = {
       S3_BUCKET = var.cloudwatch_logs_export_bucket,
-      AWS_ACCOUNT = data.aws_caller_identity.current.account_id
+      S3_PREFIX = coalesce(var.s3_prefix, data.aws_caller_identity.current.account_id)
     }
   }
 }

lambda/cloudwatch-to-s3.py

@@ -56,7 +56,7 @@ def lambda_handler(event, context):
                     fromTime=int(ssm_value),
                     to=export_to_time,
                     destination=os.environ['S3_BUCKET'],
-                    destinationPrefix=os.environ['AWS_ACCOUNT'] + '/' + log_group_name.strip('/')
+                    destinationPrefix=os.environ['S3_PREFIX'] + '/' + log_group_name.strip('/')
                 )
                 print("    Task created: %s" % response['taskId'])
                 ssm_response = ssm.put_parameter(