Merge pull request #26 from zebrunner/develop

1.0.1
zebrunner · Sep 9, 2024 · a8357e4 · a8357e4
2 parents 3ef1e7e + 4b271ff
commit a8357e4
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/deploy/cloudwatch.tf b/deploy/cloudwatch.tf
@@ -1,5 +1,5 @@
 resource "aws_vpc_endpoint" "cloudwatch" {
-  count  = var.enable_cloudwatch && var.nat ? 1 : 0
+  count = var.enable_cloudwatch && var.nat ? 1 : 0
 
   vpc_id     = aws_vpc.main.id
   subnet_ids = [for s in aws_subnet.private_per_zone : s.id]

diff --git a/deploy/e3s.tf b/deploy/e3s.tf
@@ -1,5 +1,5 @@
 locals {
-  subnets_arr = [ for subnet in aws_subnet.public_per_zone :  subnet.id ]
+  subnets_arr = [for subnet in aws_subnet.public_per_zone : subnet.id]
 }
 
 resource "tls_private_key" "pri_key" {
@@ -93,6 +93,8 @@ resource "aws_instance" "e3s_server" {
     bucket_region            = length(aws_s3_bucket.main) > 0 ? var.region : var.bucket.region
     log_group                = length(aws_cloudwatch_log_group.e3s_tasks) > 0 ? local.e3s_log_group_name : ""
 
+    nat = var.nat
+
     zbr_host = var.zebrunner.host
     zbr_user = var.zebrunner.user
     zbr_pass = var.zebrunner.pass
@@ -114,6 +116,6 @@ resource "aws_instance" "e3s_server" {
   depends_on = [aws_ecs_cluster.e3s, aws_lb_listener.main, aws_subnet.public_per_zone]
 
   lifecycle {
-    ignore_changes = [user_data]
+    ignore_changes = [user_data, ami]
   }
 }
diff --git a/deploy/ec2_data/e3s_user_data.sh b/deploy/ec2_data/e3s_user_data.sh
@@ -68,6 +68,18 @@ case ${remote_data} in
   ;;
 esac
 
+case ${nat} in 
+  (true) 
+    replace "SERVICE_STARTUP_TIMEOUT" "5m45s" "./properties/router.env"
+  ;;
+  (false)
+    replace "SERVICE_STARTUP_TIMEOUT" "10m" "./properties/router.env"
+  ;;
+  (*) 
+    echo "nat is not a bool value"
+  ;;
+esac
+
 # config.env
 replace "AWS_REGION" ${region} "./properties/config.env"
 replace "AWS_CLUSTER" ${cluster_name} "./properties/config.env"

diff --git a/deploy/rds.tf b/deploy/rds.tf
@@ -3,7 +3,7 @@ resource "aws_db_subnet_group" "rds" {
   name        = local.e3s_rds_subnet_name
   description = "RDS subnet group"
   subnet_ids  = length(aws_subnet.private_per_zone) != 0 ? [for s in aws_subnet.private_per_zone : s.id] : [for s in aws_subnet.public_per_zone : s.id]
-  depends_on = [aws_subnet.private_per_zone, aws_subnet.public_per_zone]
+  depends_on  = [aws_subnet.private_per_zone, aws_subnet.public_per_zone]
 }
 
 resource "aws_db_instance" "postgres" {

diff --git a/deploy/s3.tf b/deploy/s3.tf
@@ -5,7 +5,7 @@ resource "aws_s3_bucket" "main" {
 }
 
 resource "aws_s3_bucket_policy" "vpc_restrict_policy" {
-  count  = var.bucket.exists || length(aws_vpc_endpoint.s3_gw) == 0  ? 0 : 1
+  count  = var.bucket.exists || length(aws_vpc_endpoint.s3_gw) == 0 ? 0 : 1
   bucket = var.bucket.name
   policy = templatefile("./iam_data/s3-bucket-policy.json", {
     bucket_name     = var.bucket.name

diff --git a/deploy/security_groups.tf b/deploy/security_groups.tf
@@ -180,7 +180,7 @@ resource "aws_security_group" "cloudwatch" {
 }
 
 resource "aws_vpc_security_group_ingress_rule" "cloudwatch" {
-  count             = length(aws_security_group.cloudwatch) != 0 ? 1 : 0
+  count                        = length(aws_security_group.cloudwatch) != 0 ? 1 : 0
   security_group_id            = aws_security_group.cloudwatch[0].id
   ip_protocol                  = "-1"
   referenced_security_group_id = aws_security_group.e3s_agent.id