[수정] user tf 파일 생성 (#13)

Author: dusdjhyeon

app/controllers/terraform_controller.go

@@ -1,17 +1,14 @@
 package controllers
 
 import (
-	"github.com/gofiber/fiber/v2"
+	"path/filepath"
+
 	"main/app/services"
-)
 
-// accept랑 produce는 (swagger에서의) 애매해서 생략(s3에서도 생략되어 있음)
-// Description Merge module tf file and Add in user folder
-// Summary merge module tf file and add in user folder
-// Tags Env
-// Param email path string true "user email"
-// Success 200 {string} status "ok"
+	"github.com/gofiber/fiber/v2"
+)
 
+// Create a user env tf
 // @Router /v1/terraform/merge/{email} [post]
 func MergeEnvTf(c *fiber.Ctx) error {
 	var data []map[string]interface{}
@@ -23,30 +20,25 @@ func MergeEnvTf(c *fiber.Ctx) error {
 	}
 
 	email := c.Params("email")
+	userFolderPath := filepath.Join("usertf", email)
 
-	err := services.MergeEnvTf(email, data)
+	err := services.InitializeFolder(userFolderPath)
 	if err != nil {
-		return c.Status(fiber.StatusNotFound).JSON(fiber.Map{
+		return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
 			"error": true,
 			"msg":   err,
 		})
 	}
 
-	return c.Status(fiber.StatusOK).JSON(fiber.Map{
-		"error": false,
-	})
-}
-
-// @Router /v1/terraform/tfvars/{email} [post]
-func CreateTfvars(c *fiber.Ctx) error {
-	var data []map[string]interface{}
-	if err := c.BodyParser(&data); err != nil {
-		return c.Status(fiber.StatusBadRequest).JSON(err)
+	err = services.MergeEnvTf(userFolderPath, data)
+	if err != nil {
+		return c.Status(fiber.StatusNotFound).JSON(fiber.Map{
+			"error": true,
+			"msg":   err,
+		})
 	}
 
-	email := c.Params("email")
-
-	err := services.CreateTfvars(email, data)
+	err = services.CreateTfvars(userFolderPath, data)
 	if err != nil {
 		return c.Status(fiber.StatusNotFound).JSON(fiber.Map{
 			"error": true,
@@ -56,9 +48,11 @@ func CreateTfvars(c *fiber.Ctx) error {
 
 	return c.Status(fiber.StatusOK).JSON(fiber.Map{
 		"error": false,
+		"msg":   "merge user env tf success",
 	})
 }
 
+// Apply user env's tf
 // @Router /v1/terraform/apply/{email} [post]
 func ApplyEnvTf(c *fiber.Ctx) error {
 	email := c.Params("email")

app/services/terraform_service.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -16,7 +17,20 @@ import (
 	"github.com/hashicorp/hcl"
 )
 
-func MergeEnvTf(email string, data []map[string]interface{}) error {
+func InitializeFolder(folderPath string) error {
+	err := os.RemoveAll(folderPath)
+	if err != nil {
+		return err
+	}
+	err = os.MkdirAll(folderPath, os.ModePerm)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func MergeEnvTf(userFolderPath string, data []map[string]interface{}) error {
 	for _, item := range data {
 		folderPath := item["type"].(string)
 
@@ -32,12 +46,12 @@ func MergeEnvTf(email string, data []map[string]interface{}) error {
 			return err
 		}
 
-		userMainPath := filepath.Join("usertf", email, "main.tf")
+		userMainPath := filepath.Join(userFolderPath, "main.tf")
 		if err := AppendFile(userMainPath, mainContent); err != nil {
 			return err
 		}
 
-		userVarPath := filepath.Join("usertf", email, "variables.tf")
+		userVarPath := filepath.Join(userFolderPath, "variables.tf")
 		if err := AppendFile(userVarPath, varContent); err != nil {
 			return err
 		}
@@ -52,7 +66,7 @@ func AppendFile(filePath string, content []byte) error {
 		return ioutil.WriteFile(filePath, content, 0o644)
 	}
 
-	newContent := append(exist, []byte("\n")...)
+	newContent := append(exist, []byte("\n\n")...)
 	newContent = append(newContent, content...)
 
 	err = ioutil.WriteFile(filePath, newContent, 0o644)
@@ -63,15 +77,18 @@ func AppendFile(filePath string, content []byte) error {
 	return nil
 }
 
-func CreateTfvars(email string, data []map[string]interface{}) error {
+func CreateTfvars(userFolderPath string, data []map[string]interface{}) error {
 	var v map[string]interface{}
-	variablesFile := filepath.Join("usertf", email, "variables.tf")
+	variablesFile := filepath.Join(userFolderPath, "variables.tf")
 	existingVariables, err := ioutil.ReadFile(variablesFile)
 	if err != nil {
 		return err
 	}
 
-	err = hcl.Unmarshal(existingVariables, &v)
+	re := regexp.MustCompile(`\{[^{}]*\}`)
+	fileContent := re.ReplaceAllString(string(existingVariables), "{}")
+
+	err = hcl.Unmarshal([]byte(fileContent), &v)
 	if err != nil {
 		return err
 	}
@@ -141,7 +158,7 @@ func CreateTfvars(email string, data []map[string]interface{}) error {
 		tfvars.WriteString("\n")
 	}
 
-	writePath := filepath.Join("usertf", email, "terraform.tfvars")
+	writePath := filepath.Join(userFolderPath, "terraform.tfvars")
 	err = ioutil.WriteFile(writePath, []byte(tfvars.String()), 0o644)
 	if err != nil {
 		return err

pkg/routes/public_routes.go

@@ -11,8 +11,7 @@ func PublicRoutes(a *fiber.App) {
 	route := a.Group("/api/v1")
 	// Routes for POST method:
 	route.Post("/login/new", controllers.UserSignIn)
-	route.Post("/terraform/merge/:email", controllers.MergeEnvTf)
-	route.Post("/terraform/tfvars/:email", controllers.CreateTfvars)
+	route.Post("/terraform/usertf/:email", controllers.MergeEnvTf)
 	route.Post("/terraform/apply/:email", controllers.ApplyEnvTf)
 	route.Post("/s3/upload/:email", controllers.UploadHandler)
 	route.Get("/s3/download/:email", controllers.DownloadHandler)

platform/terraform/alb/main.tf

@@ -1,41 +1,41 @@
 #alb 
 module "alb" {
-    source = "terraform-aws-modules/alb/aws"
-    version = "~> 8.0"
-
-    name = "terramino"
-    
-    load_balancer_type = "application"
-    
-    vpc_id = module.vpc.vpd_id
-    subnets = module.vpc.public_subnets
-    security_groups = [module.terramino_lb.id]
-    internal = false
-
-    http_tcp_listeners=[
-        {
-            port = 80
-            protocol="HTTP"
-            action_type = "forward"
-        }
-    ]
-
-    target_groups = [
-        name = "learn-asg-terramino"
-        backend_port = 80
-        backend_protocol = "HTTP"
-    ]
+  source  = "terraform-aws-modules/alb/aws"
+  version = "~> 8.0"
+
+  name = "terramino"
+
+  load_balancer_type = "application"
+
+  vpc_id          = module.vpc.vpc_id
+  subnets         = module.vpc.public_subnets
+  security_groups = [module.terramino_lb.security_group_id]
+  internal        = false
+
+  http_tcp_listeners = [
+    {
+      port        = 80
+      protocol    = "HTTP"
+      action_type = "forward"
+    }
+  ]
+
+  target_groups = [{
+    name             = "learn-asg-terramino"
+    backend_port     = 80
+    backend_protocol = "HTTP"
+  }]
 }
 resource "aws_autoscaling_attachment" "terramino" {
-  autoscaling_group_name = aws_autoscaling_group.terramino.id
-  alb_target_group_arn   = aws_lb_target_group.terramino.arn
+  autoscaling_group_name = module.asg.autoscaling_group_id
+  lb_target_group_arn    = module.alb.target_group_arns[0]
 }
 
 module "terramino_instance" {
-    source = "terraform-aws-modules/security-group/aws//modules/http-80"
-    
-    name = "learn-asg-terramino-instance"
-    vpc_id = module.vpc.vpc_id
+  source = "terraform-aws-modules/security-group/aws//modules/http-80"
+
+  name   = "learn-asg-terramino-instance"
+  vpc_id = module.vpc.vpc_id
 
-    ingress_with_security_group_id = module.terramino_lb.id
+  ingress_with_source_security_group_id = module.terramino_lb.security_group_id
 }

platform/terraform/asg/main.tf

@@ -1,32 +1,32 @@
 # asg
 module "asg" {
-    source = "terraform-aws-modules/autoscaling/aws"
+  source = "terraform-aws-modules/autoscaling/aws"
 
-    name = "terramino"
-    min_size = var.asg_min_size ####*
-    max_size = var.asg_max_size ####*
-    desired_capacity = var.asg_desired_capacity ####*
-    vpc_zone_identifier = module.vpc.private_subnets
+  name                = "terramino"
+  min_size            = var.asg_min_size
+  max_size            = var.asg_max_size
+  desired_capacity    = var.asg_desired_capacity
+  vpc_zone_identifier = module.vpc.private_subnets
 
-    launch_template_name = "learn-terraform-aws-asg-" #이건 그냥 asg이름-username-asg-로 하는게 어지
-    use_name_prefix = true
-    image_id = var.asg_image_id
-    instance_type = var.asg_instance_type        ####*
-    user_data = file("user-data.sh")  ####*
-    security_groups = [module.terramino_lb.id]
+  launch_template_name = "learn-terraform-aws-asg-"
+  use_name_prefix      = true
+  image_id             = data.aws_ami.amazon-linux.id
+  instance_type        = var.asg_instance_type
+  user_data            = file("user-data.sh")
+  security_groups      = [module.terramino_instance.security_group_id]
 
-    tags = {
-        key = "Name"
-        value = "HashiCorp Learn ASG - Terramino"
-        propagate_at_launch = true
-    }
+  tags = {
+    key                 = "Name"
+    value               = "HashiCorp Learn ASG - Terramino"
+    propagate_at_launch = true
+  }
 }
 
 module "terramino_lb" {
   source = "terraform-aws-modules/security-group/aws//modules/http-80"
 
-  name        = "learn-asg-terramino-lb"
-  vpc_id      = module.vpc.vpd_id
+  name   = "learn-asg-terramino-lb"
+  vpc_id = module.vpc.vpc_id
 
-  ingress_cidr_blocks = ["10.10.0.0/16"]
-}
+  ingress_cidr_blocks = ["0.0.0.0/0"]
+}

platform/terraform/asg/variables.tf

@@ -1,19 +1,19 @@
-variable asg_min_size {
-    type="number"
+variable "asg_min_size" {
+  type = number
 }
 
-variable asg_max_size {
-    type="number"
+variable "asg_max_size" {
+  type = number
 }
 
-variable asg_instance_type {
-    type="string"
+variable "asg_instance_type" {
+  type = string
 }
 
-variable asg_desired_capacity {
-    type="number"
+variable "asg_desired_capacity" {
+  type = number
 }
 
-variable asg_image_id {
-    type="string"
+variable "asg_image_id" {
+  type = string
 }

platform/terraform/vpc/main.tf

@@ -1,23 +1,25 @@
+# vpc
+data "aws_availability_zones" "available" {
+  state = "available"
+}
+
 module "vpc" {
   source  = "terraform-aws-modules/vpc/aws"
-  version = "2.77.0"
+  version = "4.0.1"
 
-  name = var.vpc_name      ####*
+  name = var.vpc_name
   cidr = var.vpc_cidr
 
   azs                  = data.aws_availability_zones.available.names
-  private_subnets = var.vpc_privatesubnet
-  public_subnets  = var.vpc_publicsubnet
-  enable_dns_hostnames = true # VPC 내의 ec2 인스터스에 대해 자동으로 DNS 호스트 이름 할당
-  enable_dns_support   = true # 인스턴스는 아마존 내부 DNS 서비스를 통해 도메인 이름 해석 가능 
+  private_subnets      = var.vpc_privatesubnet
+  public_subnets       = var.vpc_publicsubnet
+  enable_dns_hostnames = true
+  enable_dns_support   = true
 
-  #nat를 위한 설정(자동으로 public에만 들어감)
-	## 나트 수에 따라 달라짐 -> 표시 방식을 먼저 정하기(간소화 or 아이콘 사용) 
   enable_nat_gateway = true
-  single_nat_gateway = false 
+  single_nat_gateway = false
 }
 
-#ami는 만드는거까진 하지 말자 
 data "aws_ami" "amazon-linux" {
   most_recent = true
   owners      = ["amazon"]
@@ -26,4 +28,4 @@ data "aws_ami" "amazon-linux" {
     name   = "name"
     values = ["amzn-ami-hvm-*-x86_64-ebs"]
   }
-}
+}

platform/terraform/vpc/variables.tf

@@ -1,15 +1,15 @@
-variable vpc_name {
-  type="string"
+variable "vpc_name" {
+  type = string
 }
 
-variable vpc_cidr {
-    type="string"
+variable "vpc_cidr" {
+  type = string
 }
 
-variable vpc_publicsubnet {
-    type="list"
+variable "vpc_publicsubnet" {
+  type = list(any)
 }
 
-variable vpc_privatesubnet {
-    type="list"
+variable "vpc_privatesubnet" {
+  type = list(any)
 }