From 790f868b0d3853f9a04eeba8ead73ae9fbee7b44 Mon Sep 17 00:00:00 2001
From: Abdelhak Marouane <am0089@uah.edu>
Date: Mon, 8 Jul 2024 13:19:43 -0500
Subject: [PATCH 1/4] Mount EFS to DAGs

---
 .../ecs_services/airflow_metrics.tf           |  5 +-
 .../ecs_services/airflow_scheduler.tf         | 46 +++++++++----------
 infrastructure/ecs_services/airflow_server.tf |  7 ++-
 .../ecs_services/airflow_standalone_task.tf   | 42 ++++++++---------
 infrastructure/ecs_services/airflow_worker.tf |  7 +--
 infrastructure/ecs_services/certificate.tf    |  1 +
 infrastructure/ecs_services/ecr.tf            |  9 ++--
 infrastructure/ecs_services/efs.tf            | 17 ++++++-
 infrastructure/ecs_services/varaibles.tf      |  3 ++
 infrastructure/main.tf                        |  1 +
 infrastructure/varaibles.tf                   |  5 ++
 worker/Dockerfile                             |  2 +-
 12 files changed, 85 insertions(+), 60 deletions(-)

diff --git a/infrastructure/ecs_services/airflow_metrics.tf b/infrastructure/ecs_services/airflow_metrics.tf
index 0d0b9b7..0752781 100644
--- a/infrastructure/ecs_services/airflow_metrics.tf
+++ b/infrastructure/ecs_services/airflow_metrics.tf
@@ -29,7 +29,7 @@ resource "aws_ecs_task_definition" "airflow_metrics" {
   network_mode       = "awsvpc"
   runtime_platform {
     operating_system_family = "LINUX"
-    cpu_architecture        = "X86_64"
+    cpu_architecture        = "ARM64"
   }
   requires_compatibilities = ["FARGATE"]
   volume {
@@ -109,5 +109,6 @@ resource "aws_ecs_service" "airflow_metrics" {
   }
   platform_version     = "1.4.0"
   scheduling_strategy  = "REPLICA"
-  # force_new_deployment = var.force_new_ecs_service_deployment
+  # Update from scripts folder
+  force_new_deployment = var.force_new_ecs_service_deployment
 }
diff --git a/infrastructure/ecs_services/airflow_scheduler.tf b/infrastructure/ecs_services/airflow_scheduler.tf
index 1a8c774..1a5bb4b 100644
--- a/infrastructure/ecs_services/airflow_scheduler.tf
+++ b/infrastructure/ecs_services/airflow_scheduler.tf
@@ -45,22 +45,22 @@ resource "aws_ecs_task_definition" "airflow_scheduler" {
   network_mode       = "awsvpc"
   runtime_platform {
     operating_system_family = "LINUX"
-    cpu_architecture        = "X86_64"
+    cpu_architecture        = "ARM64"
   }
   requires_compatibilities = ["FARGATE"]
-  volume {
-    name = "efs-${var.prefix}"
-    efs_volume_configuration {
-      file_system_id          = aws_efs_file_system.efs.id
-      root_directory          = "/mnt/data"
-      transit_encryption      = "ENABLED"
-      transit_encryption_port = 2999
-      authorization_config {
-        access_point_id = aws_efs_access_point.access.id
-        iam             = "ENABLED"
-      }
-    }
-  }
+#  volume {
+#    name = "efs-${var.prefix}"
+#    efs_volume_configuration {
+#      file_system_id          = aws_efs_file_system.efs.id
+#      root_directory          = "/mnt/data"
+#      transit_encryption      = "ENABLED"
+#      transit_encryption_port = 2999
+#      authorization_config {
+#        access_point_id = aws_efs_access_point.access.id
+#        iam             = "ENABLED"
+#      }
+#    }
+#  }
 
   container_definitions = jsonencode([
     {
@@ -68,13 +68,13 @@ resource "aws_ecs_task_definition" "airflow_scheduler" {
       image  = join(":", [aws_ecr_repository.airflow.repository_url, "latest"])
       cpu    = var.scheduler_cpu
       memory = var.scheduler_memory
-      mountPoints : [
-        {
-          "containerPath" : "/opt/airflow/dags_efs",
-          "sourceVolume" : "efs-${var.prefix}"
-
-        }
-      ]
+#      mountPoints : [
+#        {
+#          "containerPath" : "/opt/airflow/dags_efs",
+#          "sourceVolume" : "efs-${var.prefix}"
+#
+#        }
+#      ]
       healthcheck = {
         command = [
           "CMD-SHELL",
@@ -143,7 +143,6 @@ resource "aws_ecs_service" "airflow_scheduler" {
   # Note: If a revision is not specified, the latest ACTIVE revision is used.
   task_definition = aws_ecs_task_definition.airflow_scheduler.family
   cluster         = aws_ecs_cluster.airflow.arn
-
   deployment_controller {
     type = "ECS"
   }
@@ -159,7 +158,8 @@ resource "aws_ecs_service" "airflow_scheduler" {
   }
   platform_version     = "1.4.0"
   scheduling_strategy  = "REPLICA"
-  # force_new_deployment = var.force_new_ecs_service_deployment
+  # Update from requirements
+  force_new_deployment = var.force_new_ecs_service_deployment
 }
 
 
diff --git a/infrastructure/ecs_services/airflow_server.tf b/infrastructure/ecs_services/airflow_server.tf
index bd7c55a..1f461d2 100644
--- a/infrastructure/ecs_services/airflow_server.tf
+++ b/infrastructure/ecs_services/airflow_server.tf
@@ -15,9 +15,7 @@ resource "aws_ecs_task_definition" "airflow_webserver" {
   network_mode       = "awsvpc"
   runtime_platform {
     operating_system_family = "LINUX"
-    # ARM64 currently does not work because of upstream dependencies
-    # https://github.com/apache/airflow/issues/15635
-    cpu_architecture = "X86_64"
+    cpu_architecture = "ARM64"
   }
   requires_compatibilities = ["FARGATE"]
   container_definitions = jsonencode([
@@ -110,7 +108,8 @@ resource "aws_ecs_service" "airflow_webserver" {
     container_name   = "webserver"
     container_port   = 8080
   }
-  # force_new_deployment = var.force_new_ecs_service_deployment
+  # Update from services folder
+  force_new_deployment = var.force_new_ecs_service_deployment
   # This can be used to update tasks to use a newer container image with same
   # image/tag combination (e.g., myimage:latest)
 }
diff --git a/infrastructure/ecs_services/airflow_standalone_task.tf b/infrastructure/ecs_services/airflow_standalone_task.tf
index d7dae0e..2e0151d 100644
--- a/infrastructure/ecs_services/airflow_standalone_task.tf
+++ b/infrastructure/ecs_services/airflow_standalone_task.tf
@@ -31,35 +31,35 @@ resource "aws_ecs_task_definition" "airflow_standalone_task" {
   network_mode       = "awsvpc"
   runtime_platform {
     operating_system_family = "LINUX"
-    cpu_architecture        = "X86_64"
+    cpu_architecture        = "ARM64"
   }
   requires_compatibilities = ["FARGATE"]
-  volume {
-    name = "efs-${var.prefix}"
-    efs_volume_configuration {
-      file_system_id          = aws_efs_file_system.efs.id
-      root_directory          = "/mnt/data"
-      transit_encryption      = "ENABLED"
-      transit_encryption_port = 2999
-      authorization_config {
-        access_point_id = aws_efs_access_point.access.id
-        iam             = "ENABLED"
-      }
-    }
-  }
+#  volume {
+#    name = "efs-${var.prefix}"
+#    efs_volume_configuration {
+#      file_system_id          = aws_efs_file_system.efs.id
+#      root_directory          = "/mnt/data"
+#      transit_encryption      = "ENABLED"
+#      transit_encryption_port = 2999
+#      authorization_config {
+#        access_point_id = aws_efs_access_point.access.id
+#        iam             = "ENABLED"
+#      }
+#    }
+#  }
   container_definitions = jsonencode([
     {
       name        = "airflow"
       image       = join(":", [aws_ecr_repository.airflow.repository_url, "latest"])
       cpu         = 256
       memory      = 512
-      mountPoints : [
-        {
-          "containerPath" : "/opt/airflow/dags_efs",
-          "sourceVolume" : "efs-${var.prefix}"
-
-        }
-      ]
+#      mountPoints : [
+#        {
+#          "containerPath" : "/opt/airflow/dags_efs",
+#          "sourceVolume" : "efs-${var.prefix}"
+#
+#        }
+#      ]
       essential   = true
       command     = ["version"]
       environment = var.airflow_task_common_environment
diff --git a/infrastructure/ecs_services/airflow_worker.tf b/infrastructure/ecs_services/airflow_worker.tf
index 08f6d3f..89d4804 100644
--- a/infrastructure/ecs_services/airflow_worker.tf
+++ b/infrastructure/ecs_services/airflow_worker.tf
@@ -16,14 +16,14 @@ resource "aws_ecs_task_definition" "airflow_worker" {
   network_mode       = "awsvpc"
   runtime_platform {
     operating_system_family = "LINUX"
-    cpu_architecture        = "X86_64"
+    cpu_architecture        = "ARM64"
   }
   requires_compatibilities = ["FARGATE"]
   volume {
     name = "efs-${var.prefix}"
     efs_volume_configuration {
       file_system_id          = aws_efs_file_system.efs.id
-      root_directory          = "/mnt/data"
+      #root_directory          = "/mnt/data"
       transit_encryption      = "ENABLED"
       transit_encryption_port = 2999
       authorization_config {
@@ -115,7 +115,8 @@ resource "aws_ecs_service" "airflow_worker" {
     capacity_provider = "FARGATE"
     weight            = 1
   }
-  # force_new_deployment = var.force_new_ecs_service_deployment
+  # Update from workers folder
+  force_new_deployment = var.force_new_ecs_service_deployment
 
 }
 
diff --git a/infrastructure/ecs_services/certificate.tf b/infrastructure/ecs_services/certificate.tf
index 8fb7a5a..c45006e 100644
--- a/infrastructure/ecs_services/certificate.tf
+++ b/infrastructure/ecs_services/certificate.tf
@@ -8,6 +8,7 @@ resource "aws_acm_certificate" "ecs-domain-certificate" {
   }
 }
 
+
 data "aws_route53_zone" "ecs_domain" {
   name         = var.domain_name
   private_zone = false
diff --git a/infrastructure/ecs_services/ecr.tf b/infrastructure/ecs_services/ecr.tf
index aab3e8c..0ecf4ef 100644
--- a/infrastructure/ecs_services/ecr.tf
+++ b/infrastructure/ecs_services/ecr.tf
@@ -39,7 +39,7 @@ resource "aws_ecr_lifecycle_policy" "ecr_policy" {
 }
 locals {
 
-  build_path        = "../${path.root}/airflow_services"
+  services_build_path        = "../${path.root}/airflow_services"
   dag_folder_path   = "../${path.root}/dags"
   scripts_path      = "../${path.root}/scripts"
   config_path       = "../${path.root}/configuration"
@@ -49,7 +49,7 @@ locals {
 
 resource "null_resource" "build_ecr_image" {
   triggers = {
-    build_path         = sha1(join("", [for f in fileset(local.build_path, "**") : filesha1("${local.build_path}/${f}")]))
+    build_path         = sha1(join("", [for f in fileset(local.services_build_path, "**") : filesha1("${local.services_build_path}/${f}")]))
     scripts_path       = sha1(join("", [for f in fileset(local.scripts_path, "**") : filesha1("${local.scripts_path}/${f}")]))
     dag_folder_path    = sha1(join("", [for f in fileset(local.dag_folder_path, "**") : filesha1("${local.dag_folder_path}/${f}")]))
     config_folder_path = sha1(join("", [for f in fileset(local.config_path, "**") : filesha1("${local.config_path}/${f}")]))
@@ -61,7 +61,7 @@ resource "null_resource" "build_ecr_image" {
     command = <<EOF
           cd ../${path.root}
           aws ecr get-login-password --region ${var.aws_region} | docker login --username AWS --password-stdin ${var.account_id}.dkr.ecr.${var.aws_region}.amazonaws.com
-          docker buildx build -t ${aws_ecr_repository.airflow.repository_url}:latest -f airflow_services/Dockerfile --platform linux/amd64 .
+          docker buildx build -t ${aws_ecr_repository.airflow.repository_url}:latest -f airflow_services/Dockerfile .
           docker push ${aws_ecr_repository.airflow.repository_url}:latest
           cd -
        EOF
@@ -79,7 +79,7 @@ resource "null_resource" "build_worker_ecr_image" {
     command = <<EOF
           cd ../${path.root}
           aws ecr get-login-password --region ${var.aws_region} | docker login --username AWS --password-stdin ${var.account_id}.dkr.ecr.${var.aws_region}.amazonaws.com
-          docker buildx build -t ${aws_ecr_repository.worker_airflow.repository_url}:latest -f airflow_worker/Dockerfile --platform linux/amd64 .
+          docker buildx build -t ${aws_ecr_repository.worker_airflow.repository_url}:latest -f airflow_worker/Dockerfile .
           docker push ${aws_ecr_repository.worker_airflow.repository_url}:latest
           cd -
        EOF
@@ -87,3 +87,4 @@ resource "null_resource" "build_worker_ecr_image" {
 }
 
 
+
diff --git a/infrastructure/ecs_services/efs.tf b/infrastructure/ecs_services/efs.tf
index ba536b1..7769d07 100644
--- a/infrastructure/ecs_services/efs.tf
+++ b/infrastructure/ecs_services/efs.tf
@@ -21,7 +21,20 @@ resource "aws_efs_file_system" "efs" {
 
 resource "aws_efs_access_point" "access" {
   file_system_id = aws_efs_file_system.efs.id
+    posix_user {
+    uid = 50000
+    gid = 0
+  }
+  root_directory {
+    path = "/mnt/data"
+    creation_info {
+      owner_uid = 50000
+      owner_gid = 0
+      permissions = 777
+    }
+  }
 }
+
 resource "aws_security_group" "efs" {
   name   = "${var.prefix}-efs-sg"
   vpc_id = var.vpc_id
@@ -31,14 +44,14 @@ resource "aws_security_group" "efs" {
     from_port       = 2999
     to_port         = 2999
     security_groups = local.task_security_group_ids
-    cidr_blocks     = ["10.0.0.0/16"]
+    cidr_blocks     = var.efs_allowed_cider_block
   }
   ingress {
     description = "NFS traffic from VPC"
     from_port   = 2049
     to_port     = 2049
     protocol    = "tcp"
-    cidr_blocks = ["10.0.0.0/16"]
+    cidr_blocks = var.efs_allowed_cider_block
   }
 }
 resource "aws_efs_mount_target" "mount" {
diff --git a/infrastructure/ecs_services/varaibles.tf b/infrastructure/ecs_services/varaibles.tf
index 6e99096..c050f62 100644
--- a/infrastructure/ecs_services/varaibles.tf
+++ b/infrastructure/ecs_services/varaibles.tf
@@ -102,3 +102,6 @@ variable "subdomain" {
 variable "workers_logs_retention_days" {
   type = number
 }
+variable "efs_allowed_cider_block" {
+  type = list(string)
+}
\ No newline at end of file
diff --git a/infrastructure/main.tf b/infrastructure/main.tf
index b53c32f..f55af10 100644
--- a/infrastructure/main.tf
+++ b/infrastructure/main.tf
@@ -92,6 +92,7 @@ module "ecs_services" {
   worker_cmd                     = var.worker_cmd
   subdomain                      = var.subdomain
   workers_logs_retention_days    = var.workers_logs_retention_days
+  efs_allowed_cider_block        = var.efs_allowed_cider_block
 }
 
 resource "null_resource" "airflow_create_airflow_user" {
diff --git a/infrastructure/varaibles.tf b/infrastructure/varaibles.tf
index 1d4dd6a..2bf2610 100644
--- a/infrastructure/varaibles.tf
+++ b/infrastructure/varaibles.tf
@@ -183,4 +183,9 @@ variable "extra_airflow_configuration" {
 variable "workers_logs_retention_days" {
   type = number
   default = 1
+}
+
+variable "efs_allowed_cider_block" {
+  type = list(string)
+  default = ["10.0.0.0/16"]
 }
\ No newline at end of file
diff --git a/worker/Dockerfile b/worker/Dockerfile
index ffde9c7..5c98205 100644
--- a/worker/Dockerfile
+++ b/worker/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 osgeo/gdal:latest
+FROM --platform=linux/arm64 osgeo/gdal:latest
 
 RUN apt-get -y update \
         && apt install -y python3-pip \

From 0c239010b4f181d442ad5fdb103774232a7b3773 Mon Sep 17 00:00:00 2001
From: Abdelhak Marouane <am0089@uah.edu>
Date: Mon, 8 Jul 2024 13:51:11 -0500
Subject: [PATCH 2/4] Using ARM64 Architecture

---
 .../ecs_services/airflow_metrics.tf           | 26 +++-----
 .../ecs_services/airflow_scheduler.tf         | 32 +++-------
 infrastructure/ecs_services/airflow_server.tf | 11 +++-
 .../ecs_services/airflow_standalone_task.tf   | 21 +------
 infrastructure/ecs_services/airflow_worker.tf | 27 ++------
 infrastructure/ecs_services/ecr.tf            | 24 ++-----
 infrastructure/ecs_services/efs.tf            | 62 -------------------
 infrastructure/ecs_services/locals.tf         | 29 +++++++++
 8 files changed, 68 insertions(+), 164 deletions(-)
 delete mode 100644 infrastructure/ecs_services/efs.tf
 create mode 100644 infrastructure/ecs_services/locals.tf

diff --git a/infrastructure/ecs_services/airflow_metrics.tf b/infrastructure/ecs_services/airflow_metrics.tf
index 0752781..d86f586 100644
--- a/infrastructure/ecs_services/airflow_metrics.tf
+++ b/infrastructure/ecs_services/airflow_metrics.tf
@@ -34,16 +34,6 @@ resource "aws_ecs_task_definition" "airflow_metrics" {
   requires_compatibilities = ["FARGATE"]
   volume {
     name = "efs-${var.prefix}"
-    efs_volume_configuration {
-      file_system_id          = aws_efs_file_system.efs.id
-      root_directory          = "/mnt/data"
-      transit_encryption      = "ENABLED"
-      transit_encryption_port = 2999
-      authorization_config {
-        access_point_id = aws_efs_access_point.access.id
-        iam             = "ENABLED"
-      }
-    }
   }
   container_definitions = jsonencode([
     {
@@ -55,13 +45,6 @@ resource "aws_ecs_task_definition" "airflow_metrics" {
       entryPoint = [
         "python"
       ]
-      mountPoints : [
-        {
-          "containerPath" : "/opt/airflow/dags_efs",
-          "sourceVolume" : "efs-${var.prefix}"
-
-        }
-      ]
       command = [
         "scripts/put_airflow_worker_autoscaling_metric_data.py",
         "--cluster-name",
@@ -75,7 +58,14 @@ resource "aws_ecs_task_definition" "airflow_metrics" {
         "--period",
         "30"
       ]
-      environment = var.airflow_task_common_environment
+      environment = concat(var.airflow_task_common_environment,
+        [
+      {
+            name  = "SERVICES_HASH"
+            value = local.services_hashes
+      }
+
+      ])
       user        = "50000:0"
       logConfiguration = {
         logDriver = "awslogs"
diff --git a/infrastructure/ecs_services/airflow_scheduler.tf b/infrastructure/ecs_services/airflow_scheduler.tf
index 1a5bb4b..c689391 100644
--- a/infrastructure/ecs_services/airflow_scheduler.tf
+++ b/infrastructure/ecs_services/airflow_scheduler.tf
@@ -48,19 +48,6 @@ resource "aws_ecs_task_definition" "airflow_scheduler" {
     cpu_architecture        = "ARM64"
   }
   requires_compatibilities = ["FARGATE"]
-#  volume {
-#    name = "efs-${var.prefix}"
-#    efs_volume_configuration {
-#      file_system_id          = aws_efs_file_system.efs.id
-#      root_directory          = "/mnt/data"
-#      transit_encryption      = "ENABLED"
-#      transit_encryption_port = 2999
-#      authorization_config {
-#        access_point_id = aws_efs_access_point.access.id
-#        iam             = "ENABLED"
-#      }
-#    }
-#  }
 
   container_definitions = jsonencode([
     {
@@ -68,13 +55,7 @@ resource "aws_ecs_task_definition" "airflow_scheduler" {
       image  = join(":", [aws_ecr_repository.airflow.repository_url, "latest"])
       cpu    = var.scheduler_cpu
       memory = var.scheduler_memory
-#      mountPoints : [
-#        {
-#          "containerPath" : "/opt/airflow/dags_efs",
-#          "sourceVolume" : "efs-${var.prefix}"
-#
-#        }
-#      ]
+
       healthcheck = {
         command = [
           "CMD-SHELL",
@@ -92,7 +73,14 @@ resource "aws_ecs_task_definition" "airflow_scheduler" {
       linuxParameters = {
         initProcessEnabled = true
       }
-      environment = var.airflow_task_common_environment
+      environment = concat(var.airflow_task_common_environment,
+        [
+      {
+            name  = "SERVICES_HASH"
+            value = local.services_hashes
+      }
+
+      ])
       user        = "50000:0"
       logConfiguration = {
         logDriver = "awslogs"
@@ -159,7 +147,7 @@ resource "aws_ecs_service" "airflow_scheduler" {
   platform_version     = "1.4.0"
   scheduling_strategy  = "REPLICA"
   # Update from requirements
-  force_new_deployment = var.force_new_ecs_service_deployment
+  #force_new_deployment = var.force_new_ecs_service_deployment
 }
 
 
diff --git a/infrastructure/ecs_services/airflow_server.tf b/infrastructure/ecs_services/airflow_server.tf
index 1f461d2..884c9ed 100644
--- a/infrastructure/ecs_services/airflow_server.tf
+++ b/infrastructure/ecs_services/airflow_server.tf
@@ -46,7 +46,14 @@ resource "aws_ecs_task_definition" "airflow_webserver" {
       }
       essential   = true
       command     = ["webserver"]
-      environment = var.airflow_task_common_environment
+      environment = concat(var.airflow_task_common_environment,
+        [
+      {
+            name  = "SERVICES_HASH"
+            value = [local.config_folder_hash, local.services_build_path_hash]
+      }
+
+      ])
       user        = "50000:0"
       logConfiguration = {
         logDriver = "awslogs"
@@ -109,7 +116,7 @@ resource "aws_ecs_service" "airflow_webserver" {
     container_port   = 8080
   }
   # Update from services folder
-  force_new_deployment = var.force_new_ecs_service_deployment
+  #force_new_deployment = var.force_new_ecs_service_deployment
   # This can be used to update tasks to use a newer container image with same
   # image/tag combination (e.g., myimage:latest)
 }
diff --git a/infrastructure/ecs_services/airflow_standalone_task.tf b/infrastructure/ecs_services/airflow_standalone_task.tf
index 2e0151d..b7a31ff 100644
--- a/infrastructure/ecs_services/airflow_standalone_task.tf
+++ b/infrastructure/ecs_services/airflow_standalone_task.tf
@@ -34,32 +34,13 @@ resource "aws_ecs_task_definition" "airflow_standalone_task" {
     cpu_architecture        = "ARM64"
   }
   requires_compatibilities = ["FARGATE"]
-#  volume {
-#    name = "efs-${var.prefix}"
-#    efs_volume_configuration {
-#      file_system_id          = aws_efs_file_system.efs.id
-#      root_directory          = "/mnt/data"
-#      transit_encryption      = "ENABLED"
-#      transit_encryption_port = 2999
-#      authorization_config {
-#        access_point_id = aws_efs_access_point.access.id
-#        iam             = "ENABLED"
-#      }
-#    }
-#  }
+
   container_definitions = jsonencode([
     {
       name        = "airflow"
       image       = join(":", [aws_ecr_repository.airflow.repository_url, "latest"])
       cpu         = 256
       memory      = 512
-#      mountPoints : [
-#        {
-#          "containerPath" : "/opt/airflow/dags_efs",
-#          "sourceVolume" : "efs-${var.prefix}"
-#
-#        }
-#      ]
       essential   = true
       command     = ["version"]
       environment = var.airflow_task_common_environment
diff --git a/infrastructure/ecs_services/airflow_worker.tf b/infrastructure/ecs_services/airflow_worker.tf
index 89d4804..e73e935 100644
--- a/infrastructure/ecs_services/airflow_worker.tf
+++ b/infrastructure/ecs_services/airflow_worker.tf
@@ -19,20 +19,6 @@ resource "aws_ecs_task_definition" "airflow_worker" {
     cpu_architecture        = "ARM64"
   }
   requires_compatibilities = ["FARGATE"]
-  volume {
-    name = "efs-${var.prefix}"
-    efs_volume_configuration {
-      file_system_id          = aws_efs_file_system.efs.id
-      #root_directory          = "/mnt/data"
-      transit_encryption      = "ENABLED"
-      transit_encryption_port = 2999
-      authorization_config {
-        access_point_id = aws_efs_access_point.access.id
-        iam             = "ENABLED"
-      }
-    }
-  }
-
   container_definitions = jsonencode([
     {
       name      = "worker"
@@ -41,13 +27,6 @@ resource "aws_ecs_task_definition" "airflow_worker" {
       memory    = var.worker_memory
       essential = true
       command   = var.worker_cmd != [] ? var.worker_cmd : ["celery", "worker"]
-      mountPoints : [
-        {
-          "containerPath" : "/opt/airflow/dags_efs",
-          "sourceVolume" : "efs-${var.prefix}"
-
-        }
-      ]
       linuxParameters = {
         initProcessEnabled = true
       }
@@ -59,6 +38,10 @@ resource "aws_ecs_task_definition" "airflow_worker" {
           {
             name  = "DUMB_INIT_SETSID"
             value = "0"
+          },
+          {
+            name  = "WORKER_HASHES"
+            value = local.workers_hashes
           }
         ]
       )
@@ -116,7 +99,7 @@ resource "aws_ecs_service" "airflow_worker" {
     weight            = 1
   }
   # Update from workers folder
-  force_new_deployment = var.force_new_ecs_service_deployment
+  # force_new_deployment = var.force_new_ecs_service_deployment
 
 }
 
diff --git a/infrastructure/ecs_services/ecr.tf b/infrastructure/ecs_services/ecr.tf
index 0ecf4ef..db6c320 100644
--- a/infrastructure/ecs_services/ecr.tf
+++ b/infrastructure/ecs_services/ecr.tf
@@ -37,24 +37,12 @@ resource "aws_ecr_lifecycle_policy" "ecr_policy" {
   })
 
 }
-locals {
-
-  services_build_path        = "../${path.root}/airflow_services"
-  dag_folder_path   = "../${path.root}/dags"
-  scripts_path      = "../${path.root}/scripts"
-  config_path       = "../${path.root}/configuration"
-  worker_build_path = "../${path.root}/airflow_worker"
-}
-
-
 resource "null_resource" "build_ecr_image" {
   triggers = {
-    build_path         = sha1(join("", [for f in fileset(local.services_build_path, "**") : filesha1("${local.services_build_path}/${f}")]))
-    scripts_path       = sha1(join("", [for f in fileset(local.scripts_path, "**") : filesha1("${local.scripts_path}/${f}")]))
-    dag_folder_path    = sha1(join("", [for f in fileset(local.dag_folder_path, "**") : filesha1("${local.dag_folder_path}/${f}")]))
-    config_folder_path = sha1(join("", [for f in fileset(local.config_path, "**") : filesha1("${local.config_path}/${f}")]))
-
-
+    services_build_path_hash         = local.services_build_path_hash
+    scripts_folder_hash       = local.scripts_folder_hash
+    dag_folder_hash    = local.dag_folder_hash
+    config_folder_hash = local.config_folder_hash
   }
 
   provisioner "local-exec" {
@@ -71,8 +59,8 @@ resource "null_resource" "build_ecr_image" {
 
 resource "null_resource" "build_worker_ecr_image" {
   triggers = {
-    build_path_worker = sha1(join("", [for f in fileset(local.worker_build_path, "**") : filesha1("${local.worker_build_path}/${f}")]))
-    dag_folder_path   = sha1(join("", [for f in fileset(local.dag_folder_path, "**") : filesha1("${local.dag_folder_path}/${f}")]))
+    worker_folder_hash = local.worker_folder_hash
+    dag_folder_hash    = local.dag_folder_hash
   }
 
   provisioner "local-exec" {
diff --git a/infrastructure/ecs_services/efs.tf b/infrastructure/ecs_services/efs.tf
deleted file mode 100644
index 7769d07..0000000
--- a/infrastructure/ecs_services/efs.tf
+++ /dev/null
@@ -1,62 +0,0 @@
-#####
-# EFS
-#####
-
-locals {
-  task_security_group_ids = [
-    aws_security_group.airflow_worker_service.id,
-    aws_security_group.airflow_scheduler_service.id,
-    aws_security_group.airflow_standalone_task.id,
-    aws_security_group.airflow_metrics_service.id,
-    aws_security_group.airflow_webserver_service.id
-  ]
-}
-resource "aws_efs_file_system" "efs" {
-  creation_token = "${var.prefix}-efs"
-
-  tags = {
-    Name = "${var.prefix}-efs"
-  }
-}
-
-resource "aws_efs_access_point" "access" {
-  file_system_id = aws_efs_file_system.efs.id
-    posix_user {
-    uid = 50000
-    gid = 0
-  }
-  root_directory {
-    path = "/mnt/data"
-    creation_info {
-      owner_uid = 50000
-      owner_gid = 0
-      permissions = 777
-    }
-  }
-}
-
-resource "aws_security_group" "efs" {
-  name   = "${var.prefix}-efs-sg"
-  vpc_id = var.vpc_id
-
-  ingress {
-    protocol        = "tcp"
-    from_port       = 2999
-    to_port         = 2999
-    security_groups = local.task_security_group_ids
-    cidr_blocks     = var.efs_allowed_cider_block
-  }
-  ingress {
-    description = "NFS traffic from VPC"
-    from_port   = 2049
-    to_port     = 2049
-    protocol    = "tcp"
-    cidr_blocks = var.efs_allowed_cider_block
-  }
-}
-resource "aws_efs_mount_target" "mount" {
-  count = 2
-  file_system_id  = aws_efs_file_system.efs.id
-  subnet_id       = var.private_subnet_ids[count.index]
-  security_groups = [aws_security_group.efs.id]
-}
\ No newline at end of file
diff --git a/infrastructure/ecs_services/locals.tf b/infrastructure/ecs_services/locals.tf
new file mode 100644
index 0000000..f2e74e8
--- /dev/null
+++ b/infrastructure/ecs_services/locals.tf
@@ -0,0 +1,29 @@
+locals {
+
+  services_build_path        = "../${path.root}/airflow_services"
+  dag_folder_path   = "../${path.root}/dags"
+  scripts_path      = "../${path.root}/scripts"
+  config_path       = "../${path.root}/configuration"
+  worker_build_path = "../${path.root}/airflow_worker"
+}
+
+
+
+locals {
+
+  services_build_path_hash        = sha1(join("", [for f in fileset(local.services_build_path, "**") : filesha1("${local.services_build_path}/${f}")]))
+  dag_folder_hash   = sha1(join("", [for f in fileset(local.dag_folder_path, "**") : filesha1("${local.dag_folder_path}/${f}")]))
+  scripts_folder_hash      = sha1(join("", [for f in fileset(local.scripts_path, "**") : filesha1("${local.scripts_path}/${f}")]))
+  config_folder_hash       = sha1(join("", [for f in fileset(local.config_path, "**") : filesha1("${local.config_path}/${f}")]))
+  worker_folder_hash = sha1(join("", [for f in fileset(local.worker_build_path, "**") : filesha1("${local.worker_build_path}/${f}")]))
+}
+
+
+locals {
+
+  services_hashes        = [local.scripts_folder_hash, local.dag_folder_hash, local.config_folder_hash, local.services_build_path_hash]
+  workers_hashes = [local.dag_folder_hash, local.config_folder_hash, local.worker_folder_hash]
+
+}
+
+

From 9a7b856c6cc617007e77499b35770a3a4ffacddc Mon Sep 17 00:00:00 2001
From: Abdelhak Marouane <am0089@uah.edu>
Date: Mon, 8 Jul 2024 16:05:55 -0500
Subject: [PATCH 3/4] Change the ECS envs to supported string

---
 infrastructure/ecs_services/airflow_metrics.tf   | 2 +-
 infrastructure/ecs_services/airflow_scheduler.tf | 2 +-
 infrastructure/ecs_services/airflow_server.tf    | 2 +-
 infrastructure/ecs_services/airflow_worker.tf    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/infrastructure/ecs_services/airflow_metrics.tf b/infrastructure/ecs_services/airflow_metrics.tf
index d86f586..ca04fff 100644
--- a/infrastructure/ecs_services/airflow_metrics.tf
+++ b/infrastructure/ecs_services/airflow_metrics.tf
@@ -62,7 +62,7 @@ resource "aws_ecs_task_definition" "airflow_metrics" {
         [
       {
             name  = "SERVICES_HASH"
-            value = local.services_hashes
+            value = join(",", local.services_hashes)
       }
 
       ])
diff --git a/infrastructure/ecs_services/airflow_scheduler.tf b/infrastructure/ecs_services/airflow_scheduler.tf
index c689391..1538736 100644
--- a/infrastructure/ecs_services/airflow_scheduler.tf
+++ b/infrastructure/ecs_services/airflow_scheduler.tf
@@ -77,7 +77,7 @@ resource "aws_ecs_task_definition" "airflow_scheduler" {
         [
       {
             name  = "SERVICES_HASH"
-            value = local.services_hashes
+            value = join(",", local.services_hashes)
       }
 
       ])
diff --git a/infrastructure/ecs_services/airflow_server.tf b/infrastructure/ecs_services/airflow_server.tf
index 884c9ed..71092c3 100644
--- a/infrastructure/ecs_services/airflow_server.tf
+++ b/infrastructure/ecs_services/airflow_server.tf
@@ -50,7 +50,7 @@ resource "aws_ecs_task_definition" "airflow_webserver" {
         [
       {
             name  = "SERVICES_HASH"
-            value = [local.config_folder_hash, local.services_build_path_hash]
+            value = "${local.config_folder_hash},${local.services_build_path_hash}"
       }
 
       ])
diff --git a/infrastructure/ecs_services/airflow_worker.tf b/infrastructure/ecs_services/airflow_worker.tf
index e73e935..10462b5 100644
--- a/infrastructure/ecs_services/airflow_worker.tf
+++ b/infrastructure/ecs_services/airflow_worker.tf
@@ -41,7 +41,7 @@ resource "aws_ecs_task_definition" "airflow_worker" {
           },
           {
             name  = "WORKER_HASHES"
-            value = local.workers_hashes
+            value = join(",", local.workers_hashes)
           }
         ]
       )

From 32dc48aa8dc0c7af163f760f092b94cc27c0ae4c Mon Sep 17 00:00:00 2001
From: Abdelhak Marouane <am0089@uah.edu>
Date: Wed, 10 Jul 2024 10:43:24 -0500
Subject: [PATCH 4/4] Using ARM64 Architecture

---
 infrastructure/ecs_services/airflow_metrics.tf | 3 ---
 infrastructure/ecs_services/varaibles.tf       | 3 ---
 infrastructure/main.tf                         | 2 +-
 infrastructure/secrets/main.tf                 | 8 ++------
 infrastructure/secrets/varaibles.tf            | 5 +++++
 infrastructure/varaibles.tf                    | 9 ++++++---
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/infrastructure/ecs_services/airflow_metrics.tf b/infrastructure/ecs_services/airflow_metrics.tf
index ca04fff..1045a45 100644
--- a/infrastructure/ecs_services/airflow_metrics.tf
+++ b/infrastructure/ecs_services/airflow_metrics.tf
@@ -32,9 +32,6 @@ resource "aws_ecs_task_definition" "airflow_metrics" {
     cpu_architecture        = "ARM64"
   }
   requires_compatibilities = ["FARGATE"]
-  volume {
-    name = "efs-${var.prefix}"
-  }
   container_definitions = jsonencode([
     {
       name      = "metrics"
diff --git a/infrastructure/ecs_services/varaibles.tf b/infrastructure/ecs_services/varaibles.tf
index c050f62..6e99096 100644
--- a/infrastructure/ecs_services/varaibles.tf
+++ b/infrastructure/ecs_services/varaibles.tf
@@ -102,6 +102,3 @@ variable "subdomain" {
 variable "workers_logs_retention_days" {
   type = number
 }
-variable "efs_allowed_cider_block" {
-  type = list(string)
-}
\ No newline at end of file
diff --git a/infrastructure/main.tf b/infrastructure/main.tf
index f55af10..79bc3c8 100644
--- a/infrastructure/main.tf
+++ b/infrastructure/main.tf
@@ -40,6 +40,7 @@ module "secrets" {
   airflow_admin_username = var.airflow_admin_username
   airflow_admin_password = var.airflow_admin_password
   webserver_url          = module.ecs_services.airflow_url
+  airflow_custom_variables = merge({db_secret_name = module.secrets.airflow_secrets}, var.airflow_custom_variables)
 }
 
 
@@ -92,7 +93,6 @@ module "ecs_services" {
   worker_cmd                     = var.worker_cmd
   subdomain                      = var.subdomain
   workers_logs_retention_days    = var.workers_logs_retention_days
-  efs_allowed_cider_block        = var.efs_allowed_cider_block
 }
 
 resource "null_resource" "airflow_create_airflow_user" {
diff --git a/infrastructure/secrets/main.tf b/infrastructure/secrets/main.tf
index 77d30d6..d1538ce 100644
--- a/infrastructure/secrets/main.tf
+++ b/infrastructure/secrets/main.tf
@@ -60,12 +60,8 @@ resource "aws_secretsmanager_secret" "airflow_dag_variables" {
 }
 
 
+
 resource "aws_secretsmanager_secret_version" "airflow_dag_variables" {
   secret_id     = aws_secretsmanager_secret.airflow_dag_variables.id
-  secret_string = <<EOF
-   {
-    "db_secret_name": "${aws_secretsmanager_secret.airflow_secrets.name}"
-
-   }
-EOF
+  secret_string = jsonencode(var.airflow_custom_variables)
 }
\ No newline at end of file
diff --git a/infrastructure/secrets/varaibles.tf b/infrastructure/secrets/varaibles.tf
index 761282d..e303d94 100644
--- a/infrastructure/secrets/varaibles.tf
+++ b/infrastructure/secrets/varaibles.tf
@@ -26,4 +26,9 @@ variable "airflow_admin_password" {
 }
 
 variable "webserver_url" {
+}
+
+variable "airflow_custom_variables" {
+  description = "Airflow custom variables"
+  type        = map(string)
 }
\ No newline at end of file
diff --git a/infrastructure/varaibles.tf b/infrastructure/varaibles.tf
index 2bf2610..4984b5a 100644
--- a/infrastructure/varaibles.tf
+++ b/infrastructure/varaibles.tf
@@ -185,7 +185,10 @@ variable "workers_logs_retention_days" {
   default = 1
 }
 
-variable "efs_allowed_cider_block" {
-  type = list(string)
-  default = ["10.0.0.0/16"]
+
+
+variable "airflow_custom_variables" {
+  description = "Airflow custom variables"
+  type        = map(string)
+  default = {}
 }
\ No newline at end of file