last addons left

Author: g4ze

main

@@ -5,7 +5,7 @@ import (
 	"github.com/g4ze/byoc/pkg/core"
 )
 
-func Deploy_container(UserName string, Image string, Ports int32, Environment map[string]string) {
+func Deploy_container(UserName string, Image string, Ports int32, Environment map[string]string) string {
 	core.CreateCluster(UserName)
 	// KeyValuePair
 	Environment2 := func() []types.KeyValuePair {
@@ -19,6 +19,10 @@ func Deploy_container(UserName string, Image string, Ports int32, Environment ma
 		return Environment2
 	}()
 	core.CreateTaskDefinition(UserName, Image, Ports, Environment2)
-	core.CreateService(UserName, Image, Ports, Environment2)
-	// CreateTaskDefinition(UserName, Image, Port, Environment)
+	lbDNS := core.CreateService(UserName, Image, Ports, Environment2)
+	if *lbDNS == "OK" {
+		return "OK"
+	} else {
+		return *lbDNS
+	}
 }

pkg/controllers/deploy-container.go

@@ -16,7 +16,7 @@ import (
 	"github.com/joho/godotenv"
 )
 
-func CreateService(UserName string, Image string, Port int32, Environment []types.KeyValuePair) {
+func CreateService(UserName string, Image string, Port int32, Environment []types.KeyValuePair) *string {
 	err := godotenv.Load()
 	if err != nil {
 		log.Fatalf("Error loading .env file: %v", err)
@@ -28,40 +28,64 @@ func CreateService(UserName string, Image string, Port int32, Environment []type
 
 	// Create ECS client
 	svc := ecs.NewFromConfig(cfg)
-
-	// Generate names
+	sess := session.Must(session.NewSession())
+	elbSvc := elbv2.New(sess)
 	containerName := generateName(UserName, Image, "container")
 	serviceName := generateName(UserName, Image, "service")
-	loadBalancerName := generateName(UserName, "Image", "lb")
+	// loadBalancerName := generateName(UserName, "Image", "lb")
 	taskName := generateName(UserName, Image, "task")
-	// Create target group
-	// targetGroupArn, err := createTargetGroup(UserName, Image)
+	if serviceExists(svc, serviceName, UserName) {
+		log.Printf("Service %s already exists. Skipping creation.", serviceName)
+		_, err := svc.UpdateService(context.TODO(), &ecs.UpdateServiceInput{
+			Service:            &serviceName,
+			Cluster:            &UserName,
+			ForceNewDeployment: true,
+			DesiredCount:       aws.Int32(2),
+		})
+		if err != nil {
+			log.Fatalf("Unable to update service: %v", err)
+		}
+		return aws.String("OK")
+	}
+
+	loadBalancerArn, lbdns, err := createLoadBalancer(elbSvc, UserName, Image)
+	if err != nil {
+		log.Fatalf("Failed to create load balancer: %v", err)
+	}
+	targetGroupArn, err := createTargetGroup(UserName, Image)
 	if err != nil {
 		log.Fatalf("Failed to create target group: %v", err)
 	}
+	err = createListener(elbSvc, loadBalancerArn, targetGroupArn)
+	if err != nil {
+		log.Fatalf("Failed to create listener: %v", err)
+	}
+	// Generate names
 
 	serviceInput := &ecs.CreateServiceInput{
 		ServiceName:  &serviceName,
 		Cluster:      &UserName,
-		DesiredCount: aws.Int32(0),
+		DesiredCount: aws.Int32(2),
 		LaunchType:   types.LaunchTypeFargate,
 		LoadBalancers: []types.LoadBalancer{
 			{
-
-				LoadBalancerName: &loadBalancerName,
-				ContainerName:    &containerName,
-				ContainerPort:    &Port,
+				TargetGroupArn: targetGroupArn,
+				ContainerName:  &containerName,
+				ContainerPort:  &Port,
 			},
 		},
 		NetworkConfiguration: &types.NetworkConfiguration{
 			AwsvpcConfiguration: &types.AwsVpcConfiguration{
 				Subnets: []string{
-					os.Getenv("SUBNET1"),
-					os.Getenv("SUBNET2"),
-					os.Getenv("SUBNET3"),
+					// os.Getenv("SUBNET1"),
+					// os.Getenv("SUBNET2"),
+					// os.Getenv("SUBNET3"),
+					"subnet-03f664a0d4fe40293",
+					"subnet-01850c7c6f49dfb7f",
+					"subnet-0450df2a14564e3d5",
 				},
 				AssignPublicIp: types.AssignPublicIpEnabled,
-				SecurityGroups: []string{"sg-0a9330b2203aac089"},
+				SecurityGroups: []string{"sg-0d1526e6316cb2abf"},
 			},
 		},
 		SchedulingStrategy: types.SchedulingStrategyReplica,
@@ -80,12 +104,13 @@ func CreateService(UserName string, Image string, Port int32, Environment []type
 	}
 
 	log.Printf("Service created with status: %v", *resp.Service.Status)
+	return lbdns
 }
 
 func generateName(UserName string, Image, suffix string) string {
 	return UserName + "-" + strings.ReplaceAll(strings.ReplaceAll(strings.ReplaceAll(Image, "/", "-"), ".", "-"), ":", "-") + "-" + suffix
 }
-func createTargetGroup(UserName string, Image string) (*string, error) {
+func createTargetGroup(_ string, Image string) (*string, error) {
 	targetGroupName := strings.ReplaceAll(strings.ReplaceAll(strings.ReplaceAll(Image, "/", "-"), ".", "-"), ":", "-") + "-" + "tg"
 
 	// Create ELBv2 client
@@ -112,6 +137,78 @@ func createTargetGroup(UserName string, Image string) (*string, error) {
 	if len(createResp.TargetGroups) == 0 {
 		return nil, fmt.Errorf("no target groups created")
 	}
-
+	log.Printf("TG CREATED")
 	return createResp.TargetGroups[0].TargetGroupArn, nil
 }
+func createLoadBalancer(elbSvc *elbv2.ELBV2, _ string, Image string) (*string, *string, error) {
+	loadBalancerName := strings.ReplaceAll(strings.ReplaceAll(strings.ReplaceAll(Image, "/", "-"), ".", "-"), ":", "-") + "-" + "lb"
+
+	subnets := []*string{
+		aws.String(os.Getenv("SUBNET1")),
+		aws.String(os.Getenv("SUBNET2")),
+		aws.String(os.Getenv("SUBNET3")),
+	}
+
+	createInput := &elbv2.CreateLoadBalancerInput{
+		Name:           aws.String(loadBalancerName),
+		Subnets:        subnets,
+		SecurityGroups: []*string{aws.String("sg-0a9330b2203aac089")},
+		Scheme:         aws.String("internet-facing"),
+		Type:           aws.String("application"),
+	}
+
+	createResp, err := elbSvc.CreateLoadBalancer(createInput)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	if len(createResp.LoadBalancers) == 0 {
+		log.Fatal("No LB created")
+	}
+	log.Println("LB CREATED")
+	lbdns := *createResp.LoadBalancers[0].DNSName
+	log.Printf("LB public DNS %v", lbdns)
+	return createResp.LoadBalancers[0].LoadBalancerArn, &lbdns, nil
+}
+
+func createListener(elbSvc *elbv2.ELBV2, loadBalancerArn *string, targetGroupArn *string) error {
+	listenerInput := &elbv2.CreateListenerInput{
+		LoadBalancerArn: loadBalancerArn,
+		Protocol:        aws.String("HTTP"),
+		Port:            aws.Int64(80),
+		DefaultActions: []*elbv2.Action{
+			{
+				Type: aws.String("forward"),
+				ForwardConfig: &elbv2.ForwardActionConfig{
+					TargetGroups: []*elbv2.TargetGroupTuple{
+						{
+							TargetGroupArn: targetGroupArn,
+						},
+					},
+				},
+			},
+		},
+	}
+
+	_, err := elbSvc.CreateListener(listenerInput)
+	return err
+}
+func serviceExists(svc *ecs.Client, serviceName string, clusterName string) bool {
+	input := &ecs.DescribeServicesInput{
+		Services: []string{serviceName},
+		Cluster:  aws.String(clusterName),
+	}
+
+	result, err := svc.DescribeServices(context.TODO(), input)
+	if err != nil {
+		log.Printf("Error describing service: %v", err)
+		return false
+	}
+
+	if len(result.Services) == 0 {
+		return false
+	}
+	log.Printf("service is %v", *result.Services[0].ServiceName)
+
+	return *result.Services[0].Status != "INACTIVE"
+}

pkg/core/create-service.go

@@ -31,7 +31,6 @@ func CreateTaskDefinition(UserName string, Image string, Port int32, Environment
 		environment   *[]types.KeyValuePair
 		family        string
 		essential     bool
-		compatibility types.Compatibility
 		cpu           string
 		memory        string
 	}

pkg/core/create-task.go

@@ -35,11 +35,8 @@ func Deploy_container(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	controllers.Deploy_container(reqPayload.UserName, reqPayload.Image, reqPayload.Port, reqPayload.Environment)
+	resp := controllers.Deploy_container(reqPayload.UserName, reqPayload.Image, reqPayload.Port, reqPayload.Environment)
 
-	// deploy container
-	// ...
+	w.Write([]byte(resp))
 
-	// return response to client
-	// ...
 }