Merge pull request #34 from YAPP-Github/ci/PRODUCT-108

lvalentine6 · web-flow · commit 31aafd34448a · 2025-06-28T01:58:57.000+09:00
diff --git a/.github/workflows/close-jira-issue.yml b/.github/workflows/close-jira-issue.yml
@@ -29,3 +29,4 @@ jobs:
         uses: atlassian/gajira-transition@v3
         with:
           issue: ${{ env.JIRA_KEY }}
+          transition: 완료
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
@@ -29,4 +29,4 @@ jwt:
 cors:
   origin:
     - "http://localhost:3000"
-    - "https://dev.eatda.net"
+    - "https://api-dev.eatda.net"
diff --git a/terraform-bootstrap/backend.tf b/terraform-bootstrap/backend.tf
@@ -1,9 +1,9 @@
 terraform {
   backend "s3" {
-    bucket         = "timeeat-tf-state"
+    bucket         = "eatda-tf-state"
     key            = "bootstrap/terraform.tfstate"
     region         = "ap-northeast-2"
     encrypt        = true
-    dynamodb_table = "timeeat-tf-lock"
+    dynamodb_table = "eatda-tf-lock"
   }
 }
diff --git a/terraform-bootstrap/main.tf b/terraform-bootstrap/main.tf
@@ -12,14 +12,14 @@ provider "aws" {
 }
 
 resource "aws_s3_bucket" "bootstrap" {
-  bucket        = "timeeat-tf-state"
+  bucket        = "eatda-tf-state"
   force_destroy = false
 
   tags = {
-    Name        = "timeeat-tf-state"
+    Name        = "eatda-tf-state"
     Environment = "state"
     Owner       = "baegam"
-    Project     = "time-eat"
+    Project     = "eatda"
     Service     = "infrastructure"
   }
 }
@@ -50,7 +50,7 @@ resource "aws_s3_bucket_lifecycle_configuration" "bucket_lifecycle" {
 }
 
 resource "aws_dynamodb_table" "lock" {
-  name         = "timeeat-tf-lock"
+  name         = "eatda-tf-lock"
   billing_mode = "PAY_PER_REQUEST"
   hash_key     = "LockID"
 
@@ -60,10 +60,10 @@ resource "aws_dynamodb_table" "lock" {
   }
 
   tags = {
-    Name        = "timeeat-tf-lock"
+    Name        = "eatda-tf-lock"
     Environment = "state"
     Owner       = "baegam"
-    Project     = "time-eat"
+    Project     = "eatda"
     Service     = "infrastructure"
   }
 }
@@ -77,4 +77,4 @@ module "ecr" {
   scan_on_push         = each.value.scan_on_push
   image_tag_mutability = each.value.image_tag_mutability
   tags                 = each.value.tags
-}
+}
diff --git a/terraform-bootstrap/outputs.tf b/terraform-bootstrap/outputs.tf
@@ -8,4 +8,4 @@ output "ecr_repo_names" {
   value = {
     for k, v in module.ecr : k => v.repository_name
   }
-}
+}
diff --git a/terraform/common/alb/locals.tf b/terraform/common/alb/locals.tf
@@ -1,5 +1,5 @@
 locals {
-  alb_name            = "timeeat-alb"
+  alb_name            = "eatda-alb"
   deletion_protection = false
   loadbalancer_type   = "application"
   internal            = false
@@ -74,13 +74,13 @@ locals {
   listener_rules = {
     "prod-path-rule" = {
       priority         = 1
-      host_header      = "api.time-eat.com"
+      host_header      = "api.eatda.net"
       action_type      = "forward"
       target_group_arn = module.target_groups.target_group_arns["api-prod"]
     }
     "dev-path-rule" = {
       priority         = 2
-      host_header      = "dev.time-eat.com"
+      host_header      = "api-dev.eatda.net"
       action_type      = "forward"
       target_group_arn = module.target_groups.target_group_arns["api-dev"]
     }
diff --git a/terraform/common/alb/target-group/variables.tf b/terraform/common/alb/target-group/variables.tf
@@ -1,8 +1,8 @@
 variable "target_groups" {
   type = map(object({
-    port        = number
-    protocol    = string
-    target_type = string
+    port                 = number
+    protocol             = string
+    target_type          = string
     deregistration_delay = number
     health_check = object({
       path                = string
@@ -17,5 +17,5 @@ variable "target_groups" {
 
 
 variable "vpc_id" {
-  type        = string
-}
+  type = string
+}
diff --git a/terraform/common/backend.tf b/terraform/common/backend.tf
@@ -1,9 +1,9 @@
 terraform {
   backend "s3" {
-    bucket         = "timeeat-tf-state"
+    bucket         = "eatda-tf-state"
     key            = "common/terraform.tfstate"
     region         = "ap-northeast-2"
     encrypt        = true
-    dynamodb_table = "timeeat-tf-lock"
+    dynamodb_table = "eatda-tf-lock"
   }
 }
diff --git a/terraform/common/locals.tf b/terraform/common/locals.tf
@@ -1,6 +1,6 @@
 locals {
   group_name   = "power"
-  project_name = "time-eat"
+  project_name = "eatda"
 
   policy_arns = [
     "arn:aws:iam::aws:policy/AdministratorAccess",
@@ -61,7 +61,7 @@ locals {
 }
 
 locals {
-  domain_name       = "time-eat.com"
+  domain_name       = "eatda.net"
   validation_method = "DNS"
   record_type       = "A"
   alb_alias = {
@@ -78,28 +78,28 @@ locals {
 locals {
   security_groups = {
     alb = {
-      name        = "timeeat-alb-sg"
+      name        = "eatda-alb-sg"
       description = "ALB SG"
       tags = {
-        Name        = "timeeat-alb-sg"
+        Name        = "eatda-alb-sg"
         Environment = "common"
         Service     = "alb"
       }
     }
     ec2 = {
-      name        = "timeeat-ec2-sg"
+      name        = "eatda-ec2-sg"
       description = "EC2 SG"
       tags = {
-        Name        = "timeeat-ec2-sg"
+        Name        = "eatda-ec2-sg"
         Environment = "common"
         Service     = "ec2"
       }
     }
     rds = {
-      name        = "timeeat-rds-sg"
+      name        = "eatda-rds-sg"
       description = "RDS SG"
       tags = {
-        Name        = "timeeat-rds-sg"
+        Name        = "eatda-rds-sg"
         Environment = "common"
         Service     = "rds"
       }
diff --git a/terraform/common/route53/variables.tf b/terraform/common/route53/variables.tf
@@ -1,5 +1,5 @@
 variable "domain_name" {
-  description = "time-eat.com"
+  description = "eatda.net"
   type        = string
 }
 
diff --git a/terraform/dev/backend.tf b/terraform/dev/backend.tf
@@ -1,9 +1,9 @@
 terraform {
   backend "s3" {
-    bucket         = "timeeat-tf-state"
+    bucket         = "eatda-tf-state"
     key            = "dev/terraform.tfstate"
     region         = "ap-northeast-2"
     encrypt        = true
-    dynamodb_table = "timeeat-tf-lock"
+    dynamodb_table = "eatda-tf-lock"
   }
 }
diff --git a/terraform/dev/ec2/main.tf b/terraform/dev/ec2/main.tf
@@ -9,7 +9,7 @@ resource "aws_instance" "dev" {
   user_data_replace_on_change = true
 
   metadata_options {
-    http_tokens = "required"
+    http_tokens   = "required"
     http_endpoint = "enabled"
   }
 
@@ -25,4 +25,4 @@ resource "aws_eip" "dev" {
   tags = {
     Name = "${var.name_prefix}-${var.instance_definitions.role}-eip"
   }
-}
+}
diff --git a/terraform/dev/ecs/locals.tf b/terraform/dev/ecs/locals.tf
@@ -25,7 +25,7 @@ locals {
       task_role_arn        = def.task_role_arn
       execution_role_arn   = def.execution_role_arn
       environment = {
-        MYSQL_DATABASE = "time-eat"
+        MYSQL_DATABASE = "eatda"
       }
       secrets = [
         {
@@ -68,8 +68,8 @@ locals {
 
   resolved_ecs_services = {
     for name, def in var.ecs_services : name => {
-      name          = name
-      iam_role_arn  = var.ecs_task_definitions[name].task_role_arn
+      name         = name
+      iam_role_arn = var.ecs_task_definitions[name].task_role_arn
       load_balancer = try(def.load_balancer, null)
     }
   }
@@ -110,7 +110,7 @@ locals {
         mountPoints = [
           for vol in (def.volumes != null ? def.volumes : []) : {
             sourceVolume = vol.name
-            containerPath = lookup(var.volume_mount_paths, vol.name, "/time-eat")
+            containerPath = lookup(var.volume_mount_paths, vol.name, "/eatda")
             readOnly     = false
           }
         ]
diff --git a/terraform/dev/locals.tf b/terraform/dev/locals.tf
@@ -2,7 +2,7 @@ data "terraform_remote_state" "bootstrap" {
   backend = "s3"
 
   config = {
-    bucket = "timeeat-tf-state"
+    bucket = "eatda-tf-state"
     key    = "bootstrap/terraform.tfstate"
     region = "ap-northeast-2"
   }
@@ -11,22 +11,22 @@ data "terraform_remote_state" "bootstrap" {
 data "terraform_remote_state" "common" {
   backend = "s3"
   config = {
-    bucket = "timeeat-tf-state"
+    bucket = "eatda-tf-state"
     key    = "common/terraform.tfstate"
     region = "ap-northeast-2"
   }
 }
 
 locals {
-  project_name = "time-eat"
+  project_name = "eatda"
   region       = "ap-northeast-2"
   environment  = "dev"
-  name_prefix  = "time-eat"
+  name_prefix  = "eatda"
 
   ec2_sg_id                 = data.terraform_remote_state.common.outputs.security_group_ids["ec2"]
   instance_definitions      = data.terraform_remote_state.common.outputs.instance_profile_name["ec2-to-ecs"]
   instance_subnet_map       = data.terraform_remote_state.common.outputs.public_subnet_ids
-  ecr_repo_urls            = data.terraform_remote_state.bootstrap.outputs.ecr_repo_urls
+  ecr_repo_urls             = data.terraform_remote_state.bootstrap.outputs.ecr_repo_urls
   ecs_services              = var.ecs_services
   ecs_task_definitions_base = var.ecs_task_definitions_base
   alb_target_group_arns     = data.terraform_remote_state.common.outputs.target_group_arns
@@ -43,7 +43,7 @@ locals {
     instance_type        = "t2.micro"
     role                 = "dev"
     iam_instance_profile = "ec2-to-ecs"
-    key_name             = "time-eat-ec2-dev-key"
+    key_name             = "eatda-ec2-dev-key"
     user_data            = <<-EOF
 #!/bin/bash
 echo ECS_CLUSTER=dev-cluster >> /etc/ecs/ecs.config
diff --git a/terraform/dev/main.tf b/terraform/dev/main.tf
@@ -10,7 +10,7 @@ module "ec2" {
 module "ecs" {
   source                = "./ecs"
   alb_target_group_arns = local.alb_target_group_arns
-  ecr_repo_urls        = local.ecr_repo_urls
+  ecr_repo_urls         = local.ecr_repo_urls
   ecs_services          = var.ecs_services
   ecs_task_definitions  = local.ecs_task_definitions
   environment           = local.environment
diff --git a/terraform/dev/terraform.tfvars b/terraform/dev/terraform.tfvars
@@ -25,7 +25,7 @@ ecs_task_definitions_base = {
     volumes = [
       {
         name      = "dev-api-volume"
-        host_path = "/home/ec2-user/time-eat/dev/"
+        host_path = "/home/ec2-user/eatda/dev/"
       }
     ]
   }
@@ -40,7 +40,7 @@ ecs_task_definitions_base = {
     requires_compatibilities = ["EC2"]
     container_image   = "mysql:8"
     environment = {
-      MYSQL_DATABASE = "time-eat"
+      MYSQL_DATABASE = "eatda"
     }
     secrets = [
       {
@@ -59,7 +59,7 @@ ecs_task_definitions_base = {
     volumes = [
       {
         name      = "dev-mysql-volume"
-        host_path = "/home/ec2-user/time-eat/mysql/"
+        host_path = "/home/ec2-user/eatda/mysql/"
       }
     ]
   }
diff --git a/terraform/prod/.terraform.lock.hcl b/terraform/prod/.terraform.lock.hcl
diff --git a/terraform/prod/backend.tf b/terraform/prod/backend.tf
@@ -1,9 +1,9 @@
 terraform {
   backend "s3" {
-    bucket         = "timeeat-tf-state"
+    bucket         = "eatda-tf-state"
     key            = "prod/terraform.tfstate"
     region         = "ap-northeast-2"
     encrypt        = true
-    dynamodb_table = "timeeat-tf-lock"
+    dynamodb_table = "eatda-tf-lock"
   }
 }
diff --git a/terraform/prod/ecs/locals.tf b/terraform/prod/ecs/locals.tf
@@ -56,8 +56,8 @@ locals {
 
   resolved_ecs_services = {
     for name, def in var.ecs_services : name => {
-      name          = name
-      iam_role_arn  = var.ecs_task_definitions[name].task_role_arn
+      name         = name
+      iam_role_arn = var.ecs_task_definitions[name].task_role_arn
       load_balancer = try(def.load_balancer, null)
     }
   }
diff --git a/terraform/prod/locals.tf b/terraform/prod/locals.tf
diff --git a/terraform/prod/terraform.tfvars b/terraform/prod/terraform.tfvars

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`terraform {`
`2`	`2`	`backend "s3" {`
`3`		`- bucket = "timeeat-tf-state"`
	`3`	`+ bucket = "eatda-tf-state"`
`4`	`4`	`key = "bootstrap/terraform.tfstate"`
`5`	`5`	`region = "ap-northeast-2"`
`6`	`6`	`encrypt = true`
`7`		`- dynamodb_table = "timeeat-tf-lock"`
	`7`	`+ dynamodb_table = "eatda-tf-lock"`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,14 +12,14 @@ provider "aws" {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`resource "aws_s3_bucket" "bootstrap" {`
`15`		`- bucket = "timeeat-tf-state"`
	`15`	`+ bucket = "eatda-tf-state"`
`16`	`16`	`force_destroy = false`
`17`	`17`
`18`	`18`	`tags = {`
`19`		`- Name = "timeeat-tf-state"`
	`19`	`+ Name = "eatda-tf-state"`
`20`	`20`	`Environment = "state"`
`21`	`21`	`Owner = "baegam"`
`22`		`- Project = "time-eat"`
	`22`	`+ Project = "eatda"`
`23`	`23`	`Service = "infrastructure"`
`24`	`24`	`}`
`25`	`25`	`}`
`@@ -50,7 +50,7 @@ resource "aws_s3_bucket_lifecycle_configuration" "bucket_lifecycle" {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`resource "aws_dynamodb_table" "lock" {`
`53`		`- name = "timeeat-tf-lock"`
	`53`	`+ name = "eatda-tf-lock"`
`54`	`54`	`billing_mode = "PAY_PER_REQUEST"`
`55`	`55`	`hash_key = "LockID"`
`56`	`56`
`@@ -60,10 +60,10 @@ resource "aws_dynamodb_table" "lock" {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`tags = {`
`63`		`- Name = "timeeat-tf-lock"`
	`63`	`+ Name = "eatda-tf-lock"`
`64`	`64`	`Environment = "state"`
`65`	`65`	`Owner = "baegam"`
`66`		`- Project = "time-eat"`
	`66`	`+ Project = "eatda"`
`67`	`67`	`Service = "infrastructure"`
`68`	`68`	`}`
`69`	`69`	`}`
`@@ -77,4 +77,4 @@ module "ecr" {`
`77`	`77`	`scan_on_push = each.value.scan_on_push`
`78`	`78`	`image_tag_mutability = each.value.image_tag_mutability`
`79`	`79`	`tags = each.value.tags`
`80`		`-}`
	`80`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@ output "ecr_repo_names" {`
`8`	`8`	`value = {`
`9`	`9`	`for k, v in module.ecr : k => v.repository_name`
`10`	`10`	`}`
`11`		`-}`
	`11`	`+}`