Merge branch 'feat/57' into sandbox

comforest · comforest · commit fb7356e5b20f · 2026-01-06T01:24:22.000+09:00
diff --git a/component/ecs-ec2/alb.tf b/component/ecs-ec2/alb.tf
@@ -47,7 +47,7 @@ resource "aws_lb" "nomoney_alb" {
   }
 }
 resource "aws_lb_target_group" "nomoney_tg" {
-  name        = format("%s-nomoney-tg-blue", var.environment)
+  name        = format("%s-nomoney-tg", var.environment)
   port        = 8080
   protocol    = "HTTP"
   vpc_id      = var.vpc_id
@@ -72,7 +72,11 @@ resource "aws_lb_target_group" "nomoney_tg" {
 }
 
 resource "aws_lb_listener" "nomoney_http" {
+<<<<<<< HEAD
   load_balancer_arn = aws_lb.nomoney_alb[0].arn
+=======
+  load_balancer_arn = aws_lb.nomoney_alb.arn
+>>>>>>> feat/57
   port              = "80"
   protocol          = "HTTP"
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ resource "aws_lb" "nomoney_alb" {`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`resource "aws_lb_target_group" "nomoney_tg" {`
`50`		`- name = format("%s-nomoney-tg-blue", var.environment)`
	`50`	`+ name = format("%s-nomoney-tg", var.environment)`
`51`	`51`	`port = 8080`
`52`	`52`	`protocol = "HTTP"`
`53`	`53`	`vpc_id = var.vpc_id`
`@@ -72,7 +72,11 @@ resource "aws_lb_target_group" "nomoney_tg" {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`resource "aws_lb_listener" "nomoney_http" {`
	`75`	`+<<<<<<< HEAD`
`75`	`76`	`load_balancer_arn = aws_lb.nomoney_alb[0].arn`
	`77`	`+=======`
	`78`	`+ load_balancer_arn = aws_lb.nomoney_alb.arn`
	`79`	`+>>>>>>> feat/57`
`76`	`80`	`port = "80"`
`77`	`81`	`protocol = "HTTP"`
`78`	`82`