Merge pull request #17 from buildrun-tech/diario/dia-23

Diario/dia 23

Author: brunograna

.$solution.drawio.dtmp

@@ -2,23 +2,14 @@
 
 # Core Configuration
 environment = "dev"
-aws_region  = "us-east-1"
+aws_region  = "us-east-2"
 
 # Networking Configuration (using existing VPC)
 # Replace these with your actual VPC and subnet IDs
-vpc_id = "vpc-xxxxxxxxx"  # Replace with your VPC ID
-public_subnet_ids = [
-  "subnet-xxxxxxxxx",     # Replace with your public subnet IDs
-  "subnet-yyyyyyyyy"
-]
-private_subnet_ids = [
-  "subnet-zzzzzzzzz",     # Replace with your private subnet IDs
-  "subnet-aaaaaaaaa"
-]
+vpc_id = "vpc-088d5d306dd51edda"  # Replace with your VPC ID
 
 # ECR Configuration
-ecr_repository_name      = "ticketmaster-app"
-ecr_image_tag_mutability = "MUTABLE"
+ecr_repository_url = "311141562939.dkr.ecr.us-east-2.amazonaws.com/ticketmaster-dev"
 
 # ECS Configuration
 ecs_cluster_name  = "ticketmaster-dev-cluster"

solution.drawio

@@ -62,17 +62,6 @@ module "networking" {
   db_port           = var.db_port
 }
 
-# ECR Module
-# module "ecr" {
-#   source = "./modules/ecr"
-
-#   name_prefix          = local.name_prefix
-#   common_tags         = local.common_tags
-#   repository_name     = var.ecr_repository_name
-#   image_tag_mutability = var.ecr_image_tag_mutability
-#   lifecycle_policy    = var.ecr_lifecycle_policy
-#   aws_account_id      = data.aws_caller_identity.current.account_id
-# }
 
 # RDS Module
 module "rds" {
@@ -113,7 +102,7 @@ module "ecs" {
   task_memory                     = var.ecs_task_memory
   desired_count                   = var.ecs_desired_count
   container_port                  = var.container_port
-  ecr_repository_url              = module.ecr.repository_url
+  ecr_repository_url              = var.ecr_repository_url
   db_endpoint                     = module.rds.endpoint
   db_name                         = var.db_name
   db_username                     = var.db_username

terraform/environments/dev.tfvars

@@ -5,30 +5,6 @@ data "aws_vpc" "existing" {
   id = var.vpc_id
 }
 
-data "aws_subnets" "public" {
-  filter {
-    name   = "vpc-id"
-    values = [var.vpc_id]
-  }
-  
-  filter {
-    name   = "subnet-id"
-    values = var.public_subnet_ids
-  }
-}
-
-data "aws_subnets" "private" {
-  filter {
-    name   = "vpc-id"
-    values = [var.vpc_id]
-  }
-  
-  filter {
-    name   = "subnet-id"
-    values = var.private_subnet_ids
-  }
-}
-
 # Security Group for Application Load Balancer
 resource "aws_security_group" "alb" {
   name_prefix = "${var.name_prefix}-alb-"

terraform/main.tf

@@ -16,16 +16,6 @@ variable "vpc_id" {
   type        = string
 }
 
-variable "public_subnet_ids" {
-  description = "List of existing public subnet IDs"
-  type        = list(string)
-}
-
-variable "private_subnet_ids" {
-  description = "List of existing private subnet IDs"
-  type        = list(string)
-}
-
 variable "allowed_cidr_blocks" {
   description = "CIDR blocks allowed to access the load balancer"
   type        = list(string)

terraform/modules/ecr/main.tf

@@ -23,58 +23,12 @@ variable "aws_region" {
 }
 
 # ECR Configuration
-variable "ecr_repository_name" {
-  description = "Name of the ECR repository"
+variable "ecr_repository_url" {
+  description = "URL of the ECR repository"
   type        = string
   default     = "ticketmaster-app"
 }
 
-variable "ecr_image_tag_mutability" {
-  description = "Image tag mutability setting for ECR repository"
-  type        = string
-  default     = "MUTABLE"
-  validation {
-    condition     = contains(["MUTABLE", "IMMUTABLE"], var.ecr_image_tag_mutability)
-    error_message = "ECR image tag mutability must be either 'MUTABLE' or 'IMMUTABLE'."
-  }
-}
-
-variable "ecr_lifecycle_policy" {
-  description = "Lifecycle policy for ECR repository"
-  type        = string
-  default     = <<EOF
-{
-  "rules": [
-    {
-      "rulePriority": 1,
-      "description": "Keep last 10 images",
-      "selection": {
-        "tagStatus": "tagged",
-        "countType": "imageCountMoreThan",
-        "countNumber": 10
-      },
-      "action": {
-        "type": "expire"
-      }
-    },
-    {
-      "rulePriority": 2,
-      "description": "Delete untagged images older than 1 day",
-      "selection": {
-        "tagStatus": "untagged",
-        "countType": "sinceImagePushed",
-        "countUnit": "days",
-        "countNumber": 1
-      },
-      "action": {
-        "type": "expire"
-      }
-    }
-  ]
-}
-EOF
-}
-
 # ECS Configuration
 variable "ecs_cluster_name" {
   description = "Name of the ECS cluster"