feat: add more options

Author: sgtoj

main.tf

@@ -1,4 +1,6 @@
 locals {
+  aws_partition = data.aws_partition.current.partition
+
   vpc_dns_resolver       = module.this.enabled ? cidrhost(data.aws_vpc.lookup[0].cidr_block, 2) : "10.0.0.2"
   proxies                = { for k, v in var.proxies : k => merge(v, { name = k }) }
   proxies_port_range     = [local.proxies.default.listener_port, local.proxies.default.listener_port]
@@ -27,6 +29,8 @@ locals {
   }
 }
 
+data "aws_partition" "current" {}
+
 # ================================================================== service ===
 
 module "proxy" {
@@ -50,39 +54,27 @@ module "proxy" {
   }
 
   iam_instance_profile_name     = module.this.enabled ? resource.aws_iam_instance_profile.this[0].id : null
-  key_name                      = ""
+  key_name                      = var.key_name
   metadata_http_tokens_required = true
 
   autoscaling_policies_enabled      = false
   desired_capacity                  = local.capacity.desired
-  min_size                          = var.capacity.min
-  max_size                          = var.capacity.max
+  min_size                          = local.capacity.min
+  max_size                          = local.capacity.max
   max_instance_lifetime             = "604800"
   wait_for_capacity_timeout         = "300s"
   tag_specifications_resource_types = ["instance", "volume", "spot-instances-request"]
 
   mixed_instances_policy = {
     instances_distribution = {
-      on_demand_base_capacity                  = 0
-      on_demand_percentage_above_base_capacity = 0
+      on_demand_base_capacity                  = var.spot.enabled ? 0 : 100
+      on_demand_percentage_above_base_capacity = var.spot.enabled ? 0 : 100
       on_demand_allocation_strategy            = "prioritized"
-      spot_allocation_strategy                 = "capacity-optimized"
+      spot_allocation_strategy                 = var.spot.allocation_strategy
       spot_instance_pools                      = 0
       spot_max_price                           = ""
     }
-    override = [{
-      instance_type     = "t3.nano"
-      weighted_capacity = 1
-      }, {
-      instance_type     = "t3a.nano"
-      weighted_capacity = 1
-      }, {
-      instance_type     = "t3.micro"
-      weighted_capacity = 1
-      }, {
-      instance_type     = "t3a.micro"
-      weighted_capacity = 1
-    }]
+    override = [for x in var.instance_types : { instance_type = x.type, weighted_capacity = x.weight }]
   }
 
   associate_public_ip_address = false
@@ -266,7 +258,7 @@ resource "aws_iam_role_policy_attachment" "ssm_managed_instance_core" {
   count = module.this.enabled ? 1 : 0
 
   role       = resource.aws_iam_role.this[0].name
-  policy_arn = "arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore"
+  policy_arn = "arn:${local.aws_partition}:iam::aws:policy/AmazonSSMManagedInstanceCore"
 }
 
 resource "aws_iam_policy" "this" {
@@ -307,8 +299,8 @@ data "aws_iam_policy_document" "this" {
         "s3:GetBucketLocation",
       ]
       resources = [
-        "arn:aws:s3:::${var.ssm_sessions.logs_bucket_name}",
-        "arn:aws:s3:::${var.ssm_sessions.logs_bucket_name}/*"
+        "arn:${local.aws_partition}:s3:::${var.ssm_sessions.logs_bucket_name}",
+        "arn:${local.aws_partition}:s3:::${var.ssm_sessions.logs_bucket_name}/*"
       ]
     }
   }

variables.tf

@@ -27,6 +27,24 @@ variable "capacity" {
   default     = {}
 }
 
+variable "instance_types" {
+  type = list(object({
+    type   = string
+    weight = optional(number, 1)
+  }))
+  description = "List of instance types and their weighted capacity to be used."
+  default     = [{ type = "t3.nano" }, { type = "t3a.nano" }, { type = "t3.micro" }, { type = "t3a.micro" }]
+}
+
+variable "spot" {
+  type = object({
+    enabled             = optional(bool, true)
+    allocation_strategy = optional(string, "capacity-optimized")
+  })
+  description = "Configuration of spot instances"
+  default     = {}
+}
+
 variable "logs_bucket_name" {
   type        = string
   description = "S3 bucket for storing logs."
@@ -44,6 +62,12 @@ variable "ssm_sessions" {
 
 # --------------------------------------------------------------- networking ---
 
+variable "key_name" {
+  type        = string
+  description = "Name of existing SSH key to be assigned to instances."
+  default     = ""
+}
+
 variable "public_accessible" {
   type        = bool
   description = "Toggle whether the NLB is publicly accessible."