Resolved static code analysis issues found by tfsec

.github/workflows/aws-template-terraform.yml

@@ -59,16 +59,23 @@ jobs:
   scan:
     name: Scan TF Code
     runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: tfsec
-        uses: aquasecurity/tfsec-action@v1.0.3
+        uses: aquasecurity/tfsec-sarif-action@v0.1.4
         with:
+          sarif_file: tfsec.sarif
           working_directory: ${{ inputs.CONTEXT_FOLDER }}
-          additional_args: "--tfvars-file=${{ inputs.CONTEXT_FOLDER }}/${{ inputs.ENVIRONMENT_NAME }}.tfvars"
-          soft_fail: false
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          tfsec_args: "--tfvars-file=${{ inputs.CONTEXT_FOLDER }}/${{ inputs.ENVIRONMENT_NAME }}.tfvars"
+      - name: Upload SARIF file
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: tfsec.sarif
     needs: [check_changes]
 
   deploy_infra:
@@ -81,7 +88,7 @@ jobs:
       TF_VAR_environment: ${{ vars.ENVIRONMENT_NAME }}
       TF_VAR_kms_key_name: ${{ vars.KMS_KEY_NAME }}
       TF_VAR_vpc_id: ${{ vars.VPC_ID }}
-    needs: [scan]
+    needs: [check_changes, scan]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.github/workflows/build-infra.yml

@@ -22,7 +22,7 @@ on:
           - prod
 
 jobs:
-  deploy:
+  build:
     uses: ./.github/workflows/aws-template-terraform.yml
     with:
       CONTEXT_FOLDER: "./infrastructure/cloud/environments/${{ inputs.environment || 'dev' }}"

infrastructure/cloud/environments/dev/webapp.tf

@@ -1,8 +1,11 @@
 module "security" {
-  source       = "../../modules/security"
-  environment  = var.environment
-  app_name     = var.app_name
-  kms_key_name = var.kms_key_name
+  source                   = "../../modules/security"
+  environment              = var.environment
+  app_name                 = var.app_name
+  kms_key_name             = var.kms_key_name
+  ecs_web_td_log_group_arn = module.monitoring.ecs_web_td_log_group_arn
+  ecs_api_td_log_group_arn = module.monitoring.ecs_api_td_log_group_arn
+  ecr_repository_arn       = module.container.ecr_repository_arn
 }
 
 module "storage" {
@@ -35,12 +38,14 @@ module "container" {
   sg_id                     = module.networking.ecs_sg_id
   lb_tg_arn                 = module.networking.lb_tg_arn
   ecs_web_td_log_group_name = module.monitoring.ecs_web_td_log_group_name
+  ecs_api_td_log_group_name = module.monitoring.ecs_api_td_log_group_name
+  kms_key_id                = module.security.kms_key_id
   depends_on                = [module.monitoring]
-
 }
 
 module "monitoring" {
   source      = "../../modules/monitoring"
   environment = var.environment
   app_name    = var.app_name
+  kms_key_arn = module.security.kms_key_arn
 }

infrastructure/cloud/modules/container/ecr.tf

@@ -1,11 +1,23 @@
 resource "aws_ecr_repository" "ecr_repository" {
-  name         = "${var.app_name}-ecr-repo-${var.environment}"
-  force_delete = true
+  name                 = "${var.app_name}-ecr-repo-${var.environment}"
+  force_delete         = true
+  image_tag_mutability = "IMMUTABLE"
 
   image_scanning_configuration {
     scan_on_push = true
   }
 
+  encryption_configuration {
+    encryption_type = "KMS"
+    kms_key         = var.kms_key_id
+  }
+
+  lifecycle {
+    ignore_changes = [
+      encryption_configuration,
+    ]
+  }
+
   tags = {
     name = "${var.app_name}-ecr-repo-${var.environment}"
   }

infrastructure/cloud/modules/container/ecs.tf

@@ -1,6 +1,11 @@
 resource "aws_ecs_cluster" "ecs_cluster" {
   name = "${var.app_name}-ecs-cluster-${var.environment}"
 
+  setting {
+    name  = "containerInsights"
+    value = "enabled"
+  }
+
   tags = {
     name = "${var.app_name}-ecs-cluster-${var.environment}"
   }
@@ -18,7 +23,7 @@ resource "aws_ecs_task_definition" "ecs_web_task_definition" {
   container_definitions = jsonencode([
     {
       name      = "${var.app_name}-web-container-${var.environment}"
-      image     = "${aws_ecr_repository.ecr_repository.repository_url}:${var.app_name}-web"
+      image     = "${aws_ecr_repository.ecr_repository.repository_url}:web"
       essential = true
       portMappings = [
         {
@@ -56,3 +61,54 @@ resource "aws_ecs_service" "ecs_web_service" {
     container_port   = 8080
   }
 }
+
+# API
+resource "aws_ecs_task_definition" "ecs_api_task_definition" {
+  family                   = "${var.app_name}-api-task-definition-${var.environment}"
+  network_mode             = "awsvpc"
+  requires_compatibilities = ["FARGATE"]
+  cpu                      = 256
+  memory                   = 512
+  execution_role_arn       = var.ecs_execution_role_arn
+
+  container_definitions = jsonencode([
+    {
+      name      = "${var.app_name}-api-container-${var.environment}"
+      image     = "${aws_ecr_repository.ecr_repository.repository_url}:api"
+      essential = true
+      portMappings = [
+        {
+          containerPort = 5000
+        }
+      ]
+      logConfiguration = {
+        logDriver = "awslogs"
+        options = {
+          "awslogs-group"         = var.ecs_api_td_log_group_name
+          "awslogs-region"        = var.region
+          "awslogs-stream-prefix" = "ecs"
+        }
+      }
+    }
+  ])
+}
+
+resource "aws_ecs_service" "ecs_api_service" {
+  name            = "${var.app_name}-ecs-api-service-${var.environment}"
+  cluster         = aws_ecs_cluster.ecs_cluster.id
+  task_definition = aws_ecs_task_definition.ecs_api_task_definition.arn
+  launch_type     = "FARGATE"
+  desired_count   = 1
+
+  network_configuration {
+    subnets          = var.subnet_ids
+    security_groups  = [var.sg_id]
+    assign_public_ip = true
+  }
+
+  load_balancer {
+    target_group_arn = var.lb_tg_arn
+    container_name   = "${var.app_name}-api-container-${var.environment}"
+    container_port   = 5000
+  }
+}

infrastructure/cloud/modules/container/outputs.tf

@@ -1,3 +1,7 @@
 output "ecr_url" {
   value = try(aws_ecr_repository.ecr_repository.repository_url, "")
 }
+
+output "ecr_repository_arn" {
+  value = aws_ecr_repository.ecr_repository.arn
+}

infrastructure/cloud/modules/container/variables.tf

@@ -37,3 +37,14 @@ variable "ecs_web_td_log_group_name" {
   description = "ECS Web Task Definition Log Group Name in CloudWatch"
   type        = string
 }
+
+variable "ecs_api_td_log_group_name" {
+  description = "ECS API Task Definition Log Group Name in CloudWatch"
+  type        = string
+}
+
+variable "kms_key_id" {
+  description = "The KMS Key ID"
+  type        = string
+}
+

infrastructure/cloud/modules/monitoring/logs.tf

@@ -1,4 +1,13 @@
 resource "aws_cloudwatch_log_group" "ecs_web_td_log_group" {
-  name              = "${var.app_name}-ecs-web-td-log-group-${var.environment}"
+  name              = "/aws/ecs/${var.app_name}-ecs-web-td-log-group-${var.environment}"
   retention_in_days = 90
+
+  kms_key_id = var.kms_key_arn
+}
+
+resource "aws_cloudwatch_log_group" "ecs_api_td_log_group" {
+  name              = "/aws/ecs/${var.app_name}-ecs-api-td-log-group-${var.environment}"
+  retention_in_days = 90
+
+  kms_key_id = var.kms_key_arn
 }

infrastructure/cloud/modules/monitoring/outputs.tf

@@ -1,3 +1,15 @@
 output "ecs_web_td_log_group_name" {
   value = aws_cloudwatch_log_group.ecs_web_td_log_group.name
 }
+
+output "ecs_web_td_log_group_arn" {
+  value = aws_cloudwatch_log_group.ecs_web_td_log_group.arn
+}
+
+output "ecs_api_td_log_group_name" {
+  value = aws_cloudwatch_log_group.ecs_api_td_log_group.name
+}
+
+output "ecs_api_td_log_group_arn" {
+  value = aws_cloudwatch_log_group.ecs_api_td_log_group.arn
+}

infrastructure/cloud/modules/monitoring/variables.tf

@@ -7,3 +7,9 @@ variable "app_name" {
   description = "The name of the application"
   type        = string
 }
+
+variable "kms_key_arn" {
+  description = "KMS Key ARN"
+  type        = string
+}
+

infrastructure/cloud/modules/networking/alb.tf

@@ -1,10 +1,11 @@
 resource "aws_lb" "lb" {
-  name               = "${var.app_name}-lb-${var.environment}"
-  subnets            = local.web_subnets
-  security_groups    = [aws_security_group.sg.id]
-  internal           = true
-  load_balancer_type = "application"
-  enable_http2       = true
+  name                       = "${var.app_name}-lb-${var.environment}"
+  subnets                    = local.web_subnets
+  security_groups            = [aws_security_group.sg.id]
+  internal                   = true
+  load_balancer_type         = "application"
+  enable_http2               = true
+  drop_invalid_header_fields = true
 
   tags = {
     Name = "${var.app_name}-lb-${var.environment}"

infrastructure/cloud/modules/networking/securitygroup.tf

@@ -1,23 +1,27 @@
 # Load Balancer Security Group	
 resource "aws_security_group" "sg" {
-  name   = "${var.app_name}-lb-sg-${var.environment}"
-  vpc_id = data.aws_vpc.vpc.id
+  name        = "${var.app_name}-lb-sg-${var.environment}"
+  vpc_id      = data.aws_vpc.vpc.id
+  description = "May change once Network Architecture has been finalized."
 
   ingress {
+    description = "Allow inbound HTTP traffic on port 80"
     from_port   = 80
     to_port     = 80
     protocol    = "tcp"
     cidr_blocks = ["0.0.0.0/0"]
   }
 
   ingress {
+    description = "Accept traffic on port 8080"
     from_port   = 8080
     to_port     = 8080
     protocol    = "tcp"
     cidr_blocks = ["0.0.0.0/0"]
   }
 
   egress {
+    description = "Unrestricted"
     from_port   = 0
     to_port     = 0
     protocol    = "-1"
@@ -32,10 +36,12 @@ resource "aws_security_group" "sg" {
 
 # ECS Security Group	
 resource "aws_security_group" "ecs_sg" {
-  name   = "${var.app_name}-ecs-sg-${var.environment}"
-  vpc_id = data.aws_vpc.vpc.id
+  name        = "${var.app_name}-ecs-sg-${var.environment}"
+  vpc_id      = data.aws_vpc.vpc.id
+  description = "May change once Network Architecture has been finalized."
 
   ingress {
+    description     = "Accept traffic on port 8080 and from specific Security Group"
     from_port       = 8080
     to_port         = 8080
     protocol        = "tcp"
@@ -44,6 +50,7 @@ resource "aws_security_group" "ecs_sg" {
   }
 
   egress {
+    description = "Unrestricted"
     from_port   = 0
     to_port     = 0
     protocol    = "-1"

infrastructure/cloud/modules/security/iam.tf

@@ -22,9 +22,15 @@ resource "aws_iam_role_policy" "ecs_execution_policy" {
   policy = jsonencode({
     Version = "2012-10-17",
     Statement = [
+      {
+        Effect = "Allow",
+        Action = [
+          "ecr:GetAuthorizationToken"
+        ],
+        Resource = "*"
+      },
       {
         Action = [
-          "ecr:GetAuthorizationToken",
           "ecr:BatchCheckLayerAvailability",
           "ecr:GetDownloadUrlForLayer",
           "ecr:GetRepositoryPolicy",
@@ -37,17 +43,22 @@ resource "aws_iam_role_policy" "ecs_execution_policy" {
           "ecr:ListTagsForResource",
           "ecr:DescribeImageScanFindings"
         ],
-        Effect   = "Allow",
-        Resource = "*"
+        Effect = "Allow",
+        Resource = [
+          var.ecr_repository_arn
+        ]
       },
       {
         Action = [
           "logs:CreateLogStream",
           "logs:PutLogEvents",
           "logs:CreateLogGroup"
         ],
-        Effect   = "Allow",
-        Resource = "arn:aws:logs:*:*:*"
+        Effect = "Allow",
+        Resource = [
+          "${var.ecs_web_td_log_group_arn}:*",
+          "${var.ecs_api_td_log_group_arn}:*"
+        ]
       }
     ]
   })

infrastructure/cloud/modules/security/kms.tf

@@ -18,3 +18,38 @@ resource "aws_kms_alias" "kms_alias" {
   name          = "alias/${var.kms_key_name}-${var.environment}"
   target_key_id = aws_kms_key.kms_key.key_id
 }
+
+resource "aws_kms_key_policy" "kms_key_policy" {
+  key_id = aws_kms_key.kms_key.id
+
+  policy = jsonencode({
+    Version = "2012-10-17"
+    Statement = [
+      # Allow full access to the key for administrators
+      {
+        Sid    = "EnableIAMUserPermissions"
+        Effect = "Allow"
+        Principal = {
+          AWS = ["arn:aws:iam::${data.aws_caller_identity.current.account_id}:root"]
+        }
+        Action   = "kms:*"
+        Resource = "*"
+      },
+
+      # Allow CloudWatch Logs to use the key
+      {
+        Sid    = "AllowCloudWatchLogsUsage"
+        Effect = "Allow"
+        Principal = {
+          Service = "logs.amazonaws.com"
+        }
+        Action = [
+          "kms:Decrypt",
+          "kms:Encrypt",
+          "kms:GenerateDataKey"
+        ]
+        Resource = "*"
+      }
+    ]
+  })
+}