feat(ebs): Add defaults ebs to ec2 module (#95)

* feat(ec2): Add defaults to ebs inside ec2 * fix(trade-infra): fix default az in ebs * fix(ec2): Add defaults of ebs * feat(ebs): Add ebs tagname default * fix(ebs): Fix default device name
TradrAPI · Nov 12, 2024 · b98b313 · b98b313
1 parent 21e09ab
commit b98b313
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/aws/ec2/ebs.tf b/aws/ec2/ebs.tf
@@ -2,10 +2,13 @@ resource "aws_ebs_volume" "this" {
   count = var.ebs != null ? 1 : 0
 
   size              = var.ebs.size
-  tags              = var.ebs.tags
-  availability_zone = var.ebs.az
+  availability_zone = var.ebs.az != null ? var.ebs.az : var.availability_zone
   type              = var.ebs.type
   iops              = var.ebs.iops
+
+  tags = {
+    Name = var.ebs.tagName != null ? var.ebs.tagName : "${var.name}-ebs${var.ebs.size}g"
+  }
 }
 
 resource "aws_volume_attachment" "this" {

diff --git a/aws/ec2/variables.tf b/aws/ec2/variables.tf
@@ -22,11 +22,11 @@ variable "key_pair" {
 variable "ebs" {
   type = object({
     size        = number
-    device_name = string
-    az          = string
-    type        = string
+    device_name = optional(string, "xvdf")
+    az          = optional(string)
+    type        = optional(string)
     iops        = optional(string)
-    tags        = map(string)
+    tagName     = optional(string)
   })
 
   default = null