newDeplyment col integration

g4ze · g4ze · commit 34e6cafd47a8 · 2024-06-24T13:14:25.000+05:30
diff --git a/fe/app/service/page.tsx b/fe/app/service/page.tsx
@@ -80,12 +80,12 @@ export default function ServicePage() {
                             <li key={service.id} className="py-2 px-4">
                                 {activeService === service.id ? (
                                     <ActiveTaskButton
-                                        label={service.name}
+                                        label={service.deploymentName}
                                         onClick={() => scrollToService(service.name)}
                                     />
                                 ) : (
                                     <TabButton
-                                        label={service.name}
+                                        label={service.deploymentName}
                                         onClick={() => scrollToService(service.name)}
                                     />
                                 )}
diff --git a/fe/components/ServiceForm.tsx b/fe/components/ServiceForm.tsx
@@ -5,13 +5,22 @@ import Image from 'next/image';
 import exclamationImg from '@/public/exclamation.png'
 import { Env } from '@/types';
 import { time } from 'console';
+import { uniqueNamesGenerator, Config, adjectives, animals } from 'unique-names-generator';
+
 
 const ServiceForm = () => {
+
+  const customConfig: Config = {
+    dictionaries: [adjectives, animals],
+    separator: '_',
+    length: 2,
+  };
     const env: Env = {
         'any':'any'
     }
   const [imageName, setImageName] = useState('');
   const [port, setPort] = useState(0);
+  const [deploymentName, setDeploymentName] = useState(uniqueNamesGenerator(customConfig));
 //   const [env, setEnv] = useState(Env);
 //   const [region, setRegion] = useState('US East (Ohio)');
 
@@ -29,6 +38,7 @@ const ServiceForm = () => {
                 'image': imageName.trim(),
                 'port': Number(port),
                 'env': env,
+                'deploymentName': deploymentName,
             }),
         });
         console.log(resp.text());
@@ -38,7 +48,17 @@ const ServiceForm = () => {
 
 return (
     <div className=" max-w-400 mx-10 text-white ">
-        <Heading label="Create Deployment"/>
+        <Heading label="Create Deployment: " className="font-bold text-1xl pt-6 mb-3"/>
+        <input
+                    type="text"
+                    id="deploymentName"
+                    value= {deploymentName}
+                    onChange={(e) => {setDeploymentName(e.target.value)
+                        console.log(deploymentName)
+                    }}
+                    placeholder="e.g., docker.io/library/nginx:latest"
+                    className="text-4xl font-bold w-full bg-transparent text-white px-3 py-2 focus:border-r-2 rounded  hover:shadow-[inset_-32px_0_32px_-15px_rgba(255,255,255,0.2)] transition-shadow duration-150 focus:outline-none focus:shadow-[inset_-32px_0_20px_-15px_rgba(255,255,255,0.2)] transition-shadow duration-300"/>
+               
         <form onSubmit={handleSubmit}>
             <div >
                 <Heading label={'Image Link'} className="font-bold text-1xl py-2 text-white"/>
diff --git a/fe/components/Services.tsx b/fe/components/Services.tsx
@@ -6,7 +6,7 @@ export default function Services({ services }: { services: Service[] }) {
         
             {services.map((service) => (
                 <section id={service.name} className="h-screen flex items-center justify-center">
-                    <h2>{service.name}</h2>
+                    <h2>{service.deploymentName}</h2>
                     hi
                     {/* Add the content for each service section here */}
 
diff --git a/fe/package-lock.json b/fe/package-lock.json
diff --git a/fe/package.json b/fe/package.json
@@ -13,8 +13,10 @@
     "@splinetool/runtime": "^1.7.6",
     "next": "14.2.4",
     "next-auth": "^4.24.7",
+    "random-words": "^2.0.1",
     "react": "^18",
-    "react-dom": "^18"
+    "react-dom": "^18",
+    "unique-names-generator": "^4.7.1"
   },
   "devDependencies": {
     "@types/node": "^20",
diff --git a/fe/types.ts b/fe/types.ts
@@ -40,6 +40,7 @@ export interface Service{
     user: string;
     userName: string;
     logs: string;
+    deploymentName: string;
 }
 export interface Env {
     [variableName: string]: string;
diff --git a/pkg/controllers/deploy-container.go b/pkg/controllers/deploy-container.go
@@ -16,12 +16,12 @@ import (
 )
 
 // Deploy the container
-func Deploy_container(UserName string, Image string, Port int32, Environment map[string]string) (*byocTypes.Service, error) {
+func Deploy_container(newDeployment *byocTypes.DeployContainerPayload) (*byocTypes.Service, error) {
 
 	// KeyValuePair
 	Environment2 := func() []types.KeyValuePair {
 		var Environment2 []types.KeyValuePair
-		for key, value := range Environment {
+		for key, value := range newDeployment.Environment {
 			Environment2 = append(Environment2, types.KeyValuePair{
 				Name:  &key,
 				Value: &value,
@@ -41,17 +41,17 @@ func Deploy_container(UserName string, Image string, Port int32, Environment map
 	svc := ecs.NewFromConfig(cfg)
 	sess := session.Must(session.NewSession())
 	elbSvc := elbv2.New(sess)
-	err = core.CreateCluster(svc, UserName)
+	err = core.CreateCluster(svc, newDeployment.UserName)
 	if err != nil {
 		return nil, err
 	}
 
-	err = core.CreateTaskDefinition(svc, UserName, Image, Port, Environment2)
+	err = core.CreateTaskDefinition(svc, newDeployment.UserName, newDeployment.Image, int32(newDeployment.Port), Environment2)
 	if err != nil {
 		return nil, err
 	}
 
-	service, err := core.CreateService(svc, elbSvc, UserName, Image, Port, Environment2)
+	service, err := core.CreateService(svc, elbSvc, newDeployment.UserName, newDeployment.Image, int32(newDeployment.Port), Environment2, newDeployment.DeplomentName)
 	if err != nil {
 		return nil, err
 	}
@@ -62,7 +62,7 @@ func Deploy_container(UserName string, Image string, Port int32, Environment map
 		return nil, nil
 	}
 
-	service.Slug, err = GenerateSlug(UserName)
+	service.Slug, err = GenerateSlug(newDeployment.UserName)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/core/service-ops.go b/pkg/core/service-ops.go
@@ -13,7 +13,7 @@ import (
 	byocTypes "github.com/g4ze/byoc/pkg/types"
 )
 
-func CreateService(svc *ecs.Client, elbSvc *elbv2.ELBV2, UserName string, Image string, Port int32, Environment []types.KeyValuePair) (*byocTypes.Service, error) {
+func CreateService(svc *ecs.Client, elbSvc *elbv2.ELBV2, UserName string, Image string, Port int32, Environment []types.KeyValuePair, DeploymentName string) (*byocTypes.Service, error) {
 	var desiredCount int32 = 2
 	containerName := generateName(UserName, Image, "container")
 	serviceName := generateNameFromImage(Image)
@@ -125,6 +125,7 @@ func CreateService(svc *ecs.Client, elbSvc *elbv2.ELBV2, UserName string, Image
 		Cluster:          UserName,
 		Image:            Image,
 		EventListenerARN: EventListenerARN,
+		DeploymentName:   DeploymentName,
 	}, nil
 }
 
diff --git a/pkg/database/Service.go b/pkg/database/Service.go
@@ -38,6 +38,7 @@ func InsertService(Service *types.Service, userName string) error {
 		db.Service.User.Link(
 			db.User.UserName.Equals(userName),
 		),
+		db.Service.DeploymentName.Set(Service.DeploymentName),
 	).Exec(ctx)
 	if err != nil {
 		return err
diff --git a/pkg/database/schema.prisma b/pkg/database/schema.prisma
@@ -38,4 +38,5 @@ model Service {
     userName        String
     // logging functionality still in development
     logs            String?
+    deploymentName   String @default("default")
 }
diff --git a/pkg/handlers/deploy-container.go b/pkg/handlers/deploy-container.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/g4ze/byoc/pkg/controllers"
 	"github.com/g4ze/byoc/pkg/database"
+	"github.com/g4ze/byoc/pkg/types"
 	"github.com/gin-gonic/gin"
 )
 
@@ -16,7 +17,7 @@ func Deploy_Container(c *gin.Context) {
 	// return response to client
 
 	// check if request payload matches the required payload
-	var reqPayload DeployContainerPayload
+	var reqPayload types.DeployContainerPayload
 
 	err := json.NewDecoder(c.Request.Body).Decode(&reqPayload)
 	if err != nil {
@@ -26,14 +27,13 @@ func Deploy_Container(c *gin.Context) {
 	// extracting user name from the auth add on param
 	reqPayload.UserName = c.Params.ByName("user")
 	log.Printf("Received request to deploy container: %v", reqPayload)
-
+	log.Printf("Deployment Name: %v", reqPayload.DeploymentName)
 	// validate the request payload
 	if reqPayload.Image == "" || reqPayload.UserName == "" || (reqPayload.Port) == 0 {
 		http.Error(c.Writer, "Invalid request payload", http.StatusBadRequest)
 		return
 	}
-	Int32Port := int32(reqPayload.Port)
-	resp, err := controllers.Deploy_container(reqPayload.UserName, reqPayload.Image, Int32Port, reqPayload.Environment)
+	resp, err := controllers.Deploy_container(&reqPayload)
 	if err != nil {
 		http.Error(c.Writer, err.Error(), http.StatusInternalServerError)
 		return
diff --git a/pkg/types/database-types.go b/pkg/types/database-types.go
@@ -22,4 +22,5 @@ type Service struct {
 	Image            string `json:"image"`
 	Slug             string `json:"slug"`
 	EventListenerARN string `json:"eventListenerARN"`
+	DeploymentName   string `json:"deploymentName"`
 }
diff --git a/pkg/types/requests-types.go b/pkg/types/requests-types.go
@@ -5,8 +5,9 @@ type DeleteContainer struct {
 	UserName string `json:"userName"`
 }
 type DeployContainerPayload struct {
-	Image       string            `json:"image"`
-	UserName    string            `json:"userName"`
-	Port        int               `json:"port"`
-	Environment map[string]string `json:"environment"`
+	DeploymentName string            `json:"deploymentName"`
+	Image          string            `json:"image"`
+	UserName       string            `json:"userName"`
+	Port           int               `json:"port"`
+	Environment    map[string]string `json:"environment"`
 }

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ export interface Service{`
`40`	`40`	`user: string;`
`41`	`41`	`userName: string;`
`42`	`42`	`logs: string;`
	`43`	`+ deploymentName: string;`
`43`	`44`	`}`
`44`	`45`	`export interface Env {`
`45`	`46`	`[variableName: string]: string;`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`byocTypes "github.com/g4ze/byoc/pkg/types"`
`14`	`14`	`)`
`15`	`15`
`16`		`-func CreateService(svc ecs.Client, elbSvc elbv2.ELBV2, UserName string, Image string, Port int32, Environment []types.KeyValuePair) (*byocTypes.Service, error) {`
	`16`	`+func CreateService(svc ecs.Client, elbSvc elbv2.ELBV2, UserName string, Image string, Port int32, Environment []types.KeyValuePair, DeploymentName string) (*byocTypes.Service, error) {`
`17`	`17`	`var desiredCount int32 = 2`
`18`	`18`	`containerName := generateName(UserName, Image, "container")`
`19`	`19`	`serviceName := generateNameFromImage(Image)`
`@@ -125,6 +125,7 @@ func CreateService(svc ecs.Client, elbSvc elbv2.ELBV2, UserName string, Image`
`125`	`125`	`Cluster: UserName,`
`126`	`126`	`Image: Image,`
`127`	`127`	`EventListenerARN: EventListenerARN,`
	`128`	`+ DeploymentName: DeploymentName,`
`128`	`129`	`}, nil`
`129`	`130`	`}`
`130`	`131`
Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,5 @@ model Service {`
`38`	`38`	`userName String`
`39`	`39`	`// logging functionality still in development`
`40`	`40`	`logs String?`
	`41`	`+ deploymentName String @default("default")`
`41`	`42`	`}`