Merge pull request #4 from danbarr:v0.3.4

Add auto update variable and validations

Author: danbarr

main.tf

@@ -78,6 +78,10 @@ resource "aws_ecs_task_definition" "tfc_agent" {
           {
             name  = "TFC_AGENT_LOG_LEVEL",
             value = var.agent_log_level
+          },
+          {
+            name  = "TFC_AGENT_AUTO_UPDATE",
+            value = var.agent_auto_update
           }
         ], var.extra_env_vars),
         secrets = [

variables.tf

@@ -7,6 +7,10 @@ variable "tfc_address" {
   type        = string
   description = "The HTTPS address of the TFC or TFE instance."
   default     = "https://app.terraform.io"
+  validation {
+    condition     = startswith(var.tfc_address, "https://")
+    error_message = "The address must start with 'https://'"
+  }
 }
 
 variable "tfc_org_name" {
@@ -18,18 +22,30 @@ variable "agent_cpu" {
   type        = number
   description = "The CPU units allocated to the agent container(s). See https://docs.aws.amazon.com/AmazonECS/latest/developerguide/AWS_Fargate.html#fargate-tasks-size"
   default     = 256
+  validation {
+    condition     = var.agent_cpu >= 256
+    error_message = "The CPU value must be at least 256."
+  }
 }
 
 variable "agent_memory" {
   type        = number
   description = "The amount of memory, in MB, allocated to the agent container(s)."
   default     = 512
+  validation {
+    condition     = var.agent_memory >= 512
+    error_message = "The memory value must be at least 512."
+  }
 }
 
 variable "agent_log_level" {
   type        = string
   description = "The logging verbosity for the agent. Valid values are trace, debug, info (default), warn, and error."
   default     = "info"
+  validation {
+    condition     = contains(["trace", "debug", "info", "warn", "error"], var.agent_log_level)
+    error_message = "Valid values: trace, debug, info, warn, error"
+  }
 }
 
 variable "agent_image" {
@@ -44,6 +60,16 @@ variable "agent_single_execution" {
   default     = true
 }
 
+variable "agent_auto_update" {
+  type        = string
+  description = "Whether the agent should auto-update. Valid values are minor, patch, and disabled."
+  default     = "minor"
+  validation {
+    condition     = contains(["minor", "patch", "disabled"], var.agent_auto_update)
+    error_message = "Valid values: minor, patch, disabled"
+  }
+}
+
 variable "extra_env_vars" {
   type = list(object({
     name  = string
@@ -67,6 +93,10 @@ variable "cloudwatch_log_group_name" {
 variable "ecs_cluster_arn" {
   type        = string
   description = "ARN of the ECS cluster where the agent will be deployed."
+  validation {
+    condition     = can(regex("^arn:aws[a-z-]*:ecs:", var.ecs_cluster_arn))
+    error_message = "Must be a valid ECS cluster ARN."
+  }
 }
 
 variable "use_spot_instances" {
@@ -78,11 +108,21 @@ variable "use_spot_instances" {
 variable "vpc_id" {
   type        = string
   description = "ID of the VPC where the cluster is running."
+  validation {
+    condition     = can(regex("^vpc-[a-zA-Z0-9]+$", var.vpc_id))
+    error_message = "Must be a valid VPC ID."
+  }
 }
 
 variable "subnet_ids" {
   type        = list(string)
   description = "IDs of the subnet(s) where agents can be deployed (public subnets required)"
+  validation {
+    condition = alltrue([
+      for i in var.subnet_ids : can(regex("^subnet-[a-zA-Z0-9]+$", i))
+    ])
+    error_message = "Must be a list of valid subnet IDs."
+  }
 }
 
 variable "task_policy_arns" {