Fixing pipeline

Author: jnonino

examples/test/main.tf

@@ -26,6 +26,7 @@ module "task" {
   source                                      = "../../"
   name_prefix                                 = "test-task"
   event_rule_name                             = "test-rule"
+  event_rule_schedule_expression              = "cron(0 20 * * ? *)"
   ecs_cluster_arn                             = module.cluster.aws_ecs_cluster_cluster_arn
   event_target_ecs_target_subnets             = module.base-network.public_subnets_ids
   event_target_ecs_target_task_definition_arn = module.td.aws_ecs_task_definition_td_arn

main.tf

@@ -24,9 +24,10 @@ resource "aws_iam_role_policy" "scheduled_task_cw_event_role_cloudwatch_policy"
 #------------------------------------------------------------------------------
 resource "aws_cloudwatch_event_rule" "event_rule" {
   name                = var.event_rule_name
-  description         = var.event_rule_description
   schedule_expression = var.event_rule_schedule_expression
+  event_bus_name      = var.event_rule_event_bus_name
   event_pattern       = var.event_rule_event_pattern
+  description         = var.event_rule_description
   role_arn            = var.event_rule_role_arn
   is_enabled          = var.event_rule_is_enabled
   tags = {
@@ -38,18 +39,21 @@ resource "aws_cloudwatch_event_rule" "event_rule" {
 # CLOUDWATCH EVENT TARGET
 #------------------------------------------------------------------------------
 resource "aws_cloudwatch_event_target" "ecs_scheduled_task" {
-  rule       = aws_cloudwatch_event_rule.event_rule.name
-  target_id  = var.event_target_target_id
-  arn        = var.ecs_cluster_arn
-  input      = var.event_target_input
-  input_path = var.event_target_input_path
-  role_arn   = aws_iam_role.scheduled_task_cw_event_role.arn
+  rule              = aws_cloudwatch_event_rule.event_rule.name
+  event_bus_name    = aws_cloudwatch_event_rule.event_rule.event_bus_name
+  target_id         = var.event_target_target_id
+  arn               = var.ecs_cluster_arn
+  input             = var.event_target_input
+  input_path        = var.event_target_input_path
+  role_arn          = aws_iam_role.scheduled_task_cw_event_role.arn
+
   ecs_target {
-    task_definition_arn = var.event_target_ecs_target_task_definition_arn
-    task_count          = var.event_target_ecs_target_task_count
-    platform_version    = var.event_target_ecs_target_platform_version
-    launch_type         = "FARGATE"
     group               = var.event_target_ecs_target_group
+    launch_type         = "FARGATE"
+    platform_version    = var.event_target_ecs_target_platform_version
+    task_count          = var.event_target_ecs_target_task_count
+    task_definition_arn = var.event_target_ecs_target_task_definition_arn
+
     network_configuration {
       subnets          = var.event_target_ecs_target_subnets
       security_groups  = var.event_target_ecs_target_security_groups

outputs.tf

@@ -54,8 +54,12 @@ output "aws_iam_role_policy_scheduled_task_cw_event_role_cloudwatch_policy_role"
 #------------------------------------------------------------------------------
 # CLOUDWATCH EVENT RULE
 #------------------------------------------------------------------------------
+output "aws_cloudwatch_event_rule_event_rule_id" {
+  description = "The name of the rule."
+  value       = aws_cloudwatch_event_rule.event_rule.id
+}
+
 output "aws_cloudwatch_event_rule_event_rule_arn" {
   description = "The Amazon Resource Name (ARN) of the CloudWatch Event Rule."
   value       = aws_cloudwatch_event_rule.event_rule.arn
 }
-

variables.tf

@@ -9,16 +9,21 @@ variable "name_prefix" {
 # CLOUDWATCH EVENT RULE
 #------------------------------------------------------------------------------
 variable "event_rule_name" {
-  description = "The rule's name."
+  description = "The name of the rule."
 }
 
 variable "event_rule_schedule_expression" {
-  description = "(Required, if event_pattern isn't specified) The scheduling expression. For example, cron(0 20 * * ? *) or rate(5 minutes)."
+  description = "(Optional) The scheduling expression. For example, cron(0 20 * * ? *) or rate(5 minutes). At least one of event_rule_schedule_expression or event_rule_event_pattern is required. Can only be used on the default event bus."
+  default     = null
+}
+
+variable "event_rule_event_bus_name" {
+  description = "(Optional) The event bus to associate with this rule. If you omit this, the default event bus is used."
   default     = null
 }
 
 variable "event_rule_event_pattern" {
-  description = "(Required, if schedule_expression isn't specified) Event pattern described a JSON object. See full documentation of CloudWatch Events and Event Patterns for details."
+  description = "(Optional) The event pattern described a JSON object. At least one of schedule_expression or event_pattern is required."
   default     = null
 }
 
@@ -41,48 +46,37 @@ variable "event_rule_is_enabled" {
 #------------------------------------------------------------------------------
 # CLOUDWATCH EVENT TARGET
 #------------------------------------------------------------------------------
-variable "ecs_cluster_arn" {
-  description = "The ECS Cluster where the scheduled task will run"
-}
-
-variable "event_target_ecs_target_subnets" {
-  description = "The subnets associated with the task or service."
-  type        = list
-}
-
-variable "event_target_ecs_target_task_definition_arn" {
-  description = "(Required) The ARN of the task definition to use if the event target is an Amazon ECS cluster."
-}
-
-variable "ecs_execution_task_role_arn" {
-  description = "(Required) The task definition execution role"
-}
-
 variable "event_target_target_id" {
   description = "(Optional) The unique target assignment ID. If missing, will generate a random, unique id."
   default     = null
 }
 
+variable "ecs_cluster_arn" {
+  description = "The ECS Cluster where the scheduled task will run"
+}
+
 variable "event_target_input" {
-  description = "(Optional) Valid JSON text passed to the target."
+  description = "(Optional) Valid JSON text passed to the target. Conflicts with event_target_input_path."
   default     = null
 }
 
 variable "event_target_input_path" {
-  description = "(Optional) The value of the JSONPath that is used for extracting part of the matched event when passing it to the target."
+  description = " (Optional) The value of the JSONPath that is used for extracting part of the matched event when passing it to the target. Conflicts with event_target_input."
   default     = null
 }
 
-variable "event_target_ecs_target_security_groups" {
-  description = "(Optional) The security groups associated with the task or service. If you do not specify a security group, the default security group for the VPC is used."
-  type        = list
-  default     = []
+variable "ecs_execution_task_role_arn" {
+  description = "(Required) The task definition execution role. The Amazon Resource Name (ARN) of the IAM role to be used for this target when the rule is triggered."
 }
 
-variable "event_target_ecs_target_assign_public_ip" {
-  description = "(Optional) Assign a public IP address to the ENI (Fargate launch type only). Valid values are true or false. Default false."
-  type        = bool
-  default     = false
+variable "event_target_ecs_target_group" {
+  description = "(Optional) Specifies an ECS task group for the task. The maximum length is 255 characters."
+  default     = null
+}
+
+variable "event_target_ecs_target_platform_version" {
+  description = "(Optional) Specifies the platform version for the task. Specify only the numeric portion of the platform version, such as 1.1.0. For more information about valid platform versions, see AWS Fargate Platform Versions. Default to LATEST"
+  default     = "LATEST"
 }
 
 variable "event_target_ecs_target_task_count" {
@@ -91,12 +85,23 @@ variable "event_target_ecs_target_task_count" {
   default     = 1
 }
 
-variable "event_target_ecs_target_platform_version" {
-  description = "(Optional) Specifies the platform version for the task. Specify only the numeric portion of the platform version, such as 1.1.0. This is used only if LaunchType is FARGATE. For more information about valid platform versions, see AWS Fargate Platform Versions. Default to LATEST"
-  default     = "LATEST"
+variable "event_target_ecs_target_task_definition_arn" {
+  description = "(Required) The ARN of the task definition to use if the event target is an Amazon ECS cluster."
 }
 
-variable "event_target_ecs_target_group" {
-  description = "(Optional) Specifies an ECS task group for the task. The maximum length is 255 characters."
+variable "event_target_ecs_target_subnets" {
+  description = "The subnets associated with the task or service."
+  type        = list
+}
+
+variable "event_target_ecs_target_security_groups" {
+  description = "(Optional) The security groups associated with the task or service. If you do not specify a security group, the default security group for the VPC is used."
+  type        = list
   default     = null
 }
+
+variable "event_target_ecs_target_assign_public_ip" {
+  description = "(Optional) Assign a public IP address to the ENI. Default false."
+  type        = bool
+  default     = false
+}