Adding variables to ELB module

Author: himsharma01

aws/elb/elb.tf

@@ -137,14 +137,14 @@ resource "aws_sns_topic_subscription" "subscription" {
 resource "aws_serverlessapplicationrepository_cloudformation_stack" "auto_enable_access_logs" {
   for_each = toset(local.auto_enable_access_logs ? ["auto_enable_access_logs"] : [])
 
-  name             = "Auto-Enable-Access-Logs-Elb-${random_string.aws_random.id}"
+  name             = "Auto-Enable-Access-Logs-${var.auto_enable_access_logs_options.auto_enable_logging}-${random_string.aws_random.id}"
   application_id   = "arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-s3-logging-auto-enable"
-  semantic_version = "1.0.2"
+  semantic_version = var.app_semantic_version
   capabilities     = data.aws_serverlessapplicationrepository_application.app.required_capabilities
   parameters = {
     BucketName                = local.bucket_name
-    BucketPrefix              = "elasticloadbalancing"
-    AutoEnableLogging         = "ALB"
+    BucketPrefix              = var.auto_enable_access_logs_options.bucket_prefix
+    AutoEnableLogging         = var.auto_enable_access_logs_options.auto_enable_logging
     AutoEnableResourceOptions = var.auto_enable_access_logs
     FilterExpression          = var.auto_enable_access_logs_options.filter
     RemoveOnDeleteStack       = var.auto_enable_access_logs_options.remove_on_delete_stack

aws/elb/locals.tf

@@ -14,7 +14,7 @@ locals {
   auto_enable_access_logs = var.auto_enable_access_logs != "None" ? true : false
 
   # If we create the bucket, then get the default PATH expression.
-  logs_path_expression = var.source_details.bucket_details.create_bucket ? "*AWSLogs/${local.aws_account_id}/elasticloadbalancing/${local.aws_region}/*" : var.source_details.bucket_details.path_expression
+logs_path_expression = var.source_details.bucket_details.create_bucket ? "*${var.auto_enable_access_logs_options.bucket_prefix}/AWSLogs/${local.aws_account_id}/elasticloadbalancing/${local.aws_region}/*" : var.source_details.bucket_details.path_expression
 
   region_to_elb_account_id = {
     "us-east-1"      = "127311923021",

aws/elb/variables.tf

@@ -108,8 +108,16 @@ variable "auto_enable_access_logs" {
   default = "Both"
 }
 
+variable "app_semantic_version" {
+  type        = string
+  description = "Provide the latest version of Serverless Application Repository 'sumologic-s3-logging-auto-enable'."
+  default = "1.0.4"
+}
+
 variable "auto_enable_access_logs_options" {
   type = object({
+    bucket_prefix          = string
+    auto_enable_logging    = string
     filter                 = string
     remove_on_delete_stack = bool
   })
@@ -120,9 +128,15 @@ variable "auto_enable_access_logs_options" {
 	EOT
 
   default = {
+    bucket_prefix          = ""
+    auto_enable_logging    = ""
     filter                 = ""
     remove_on_delete_stack = true
   }
+  validation {
+    condition = contains(["ALB", "ELB"], var.auto_enable_access_logs_options.auto_enable_logging)
+    error_message = "The value must be one of ALB or ELB."
+  }
 }
 
 variable "wait_for_seconds" {