Переглянути джерело

fix up provision endpoints

Alexander Belanger 4 роки тому
батько
коміт
20a3178bb1

+ 3 - 1
api/server/handlers/provision/provision_docr.go

@@ -35,7 +35,9 @@ func (c *ProvisionDOCRHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 	user, _ := r.Context().Value(types.UserScope).(*models.User)
 	proj, _ := r.Context().Value(types.ProjectScope).(*models.Project)
 
-	request := &types.CreateDOCRInfraRequest{}
+	request := &types.CreateDOCRInfraRequest{
+		ProjectID: proj.ID,
+	}
 
 	if ok := c.DecodeAndValidate(w, r, request); !ok {
 		return

+ 3 - 1
api/server/handlers/provision/provision_doks.go

@@ -35,7 +35,9 @@ func (c *ProvisionDOKSHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 	user, _ := r.Context().Value(types.UserScope).(*models.User)
 	proj, _ := r.Context().Value(types.ProjectScope).(*models.Project)
 
-	request := &types.CreateDOKSInfraRequest{}
+	request := &types.CreateDOKSInfraRequest{
+		ProjectID: proj.ID,
+	}
 
 	if ok := c.DecodeAndValidate(w, r, request); !ok {
 		return

+ 3 - 1
api/server/handlers/provision/provision_ecr.go

@@ -35,7 +35,9 @@ func (c *ProvisionECRHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 	user, _ := r.Context().Value(types.UserScope).(*models.User)
 	proj, _ := r.Context().Value(types.ProjectScope).(*models.Project)
 
-	request := &types.CreateECRInfraRequest{}
+	request := &types.CreateECRInfraRequest{
+		ProjectID: proj.ID,
+	}
 
 	if ok := c.DecodeAndValidate(w, r, request); !ok {
 		return

+ 3 - 1
api/server/handlers/provision/provision_eks.go

@@ -35,7 +35,9 @@ func (c *ProvisionEKSHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 	user, _ := r.Context().Value(types.UserScope).(*models.User)
 	proj, _ := r.Context().Value(types.ProjectScope).(*models.Project)
 
-	request := &types.CreateEKSInfraRequest{}
+	request := &types.CreateEKSInfraRequest{
+		ProjectID: proj.ID,
+	}
 
 	if ok := c.DecodeAndValidate(w, r, request); !ok {
 		return

+ 3 - 1
api/server/handlers/provision/provision_gcr.go

@@ -35,7 +35,9 @@ func (c *ProvisionGCRHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 	user, _ := r.Context().Value(types.UserScope).(*models.User)
 	proj, _ := r.Context().Value(types.ProjectScope).(*models.Project)
 
-	request := &types.CreateGCRInfraRequest{}
+	request := &types.CreateGCRInfraRequest{
+		ProjectID: proj.ID,
+	}
 
 	if ok := c.DecodeAndValidate(w, r, request); !ok {
 		return

+ 3 - 1
api/server/handlers/provision/provision_gke.go

@@ -35,7 +35,9 @@ func (c *ProvisionGKEHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 	user, _ := r.Context().Value(types.UserScope).(*models.User)
 	proj, _ := r.Context().Value(types.ProjectScope).(*models.Project)
 
-	request := &types.CreateGKEInfraRequest{}
+	request := &types.CreateGKEInfraRequest{
+		ProjectID: proj.ID,
+	}
 
 	if ok := c.DecodeAndValidate(w, r, request); !ok {
 		return

+ 1 - 1
api/server/router/project.go

@@ -568,7 +568,7 @@ func getProjectRoutes(
 		},
 	)
 
-	provisionDOKSHandler := provision.NewProvisionDOCRHandler(
+	provisionDOKSHandler := provision.NewProvisionDOKSHandler(
 		config,
 		factory.GetDecoderValidator(),
 		factory.GetResultWriter(),

+ 6 - 6
api/types/provision.go

@@ -2,39 +2,39 @@ package types
 
 type CreateECRInfraRequest struct {
 	ECRName          string `json:"ecr_name" form:"required"`
-	ProjectID        uint   `json:"project_id" form:"required"`
+	ProjectID        uint   `json:"-" form:"required"`
 	AWSIntegrationID uint   `json:"aws_integration_id" form:"required"`
 }
 
 type CreateEKSInfraRequest struct {
 	EKSName          string `json:"eks_name" form:"required"`
 	MachineType      string `json:"machine_type"`
-	ProjectID        uint   `json:"project_id" form:"required"`
+	ProjectID        uint   `json:"-" form:"required"`
 	AWSIntegrationID uint   `json:"aws_integration_id" form:"required"`
 }
 
 type CreateGCRInfraRequest struct {
-	ProjectID        uint `json:"project_id" form:"required"`
+	ProjectID        uint `json:"-" form:"required"`
 	GCPIntegrationID uint `json:"gcp_integration_id" form:"required"`
 }
 
 type CreateGKEInfraRequest struct {
 	GKEName          string `json:"gke_name" form:"required"`
-	ProjectID        uint   `json:"project_id" form:"required"`
+	ProjectID        uint   `json:"-" form:"required"`
 	GCPIntegrationID uint   `json:"gcp_integration_id" form:"required"`
 }
 
 type CreateDOCRInfraRequest struct {
 	DOCRName             string `json:"docr_name" form:"required"`
 	DOCRSubscriptionTier string `json:"docr_subscription_tier" form:"required"`
-	ProjectID            uint   `json:"project_id" form:"required"`
+	ProjectID            uint   `json:"-" form:"required"`
 	DOIntegrationID      uint   `json:"do_integration_id" form:"required"`
 }
 
 type CreateDOKSInfraRequest struct {
 	DORegion        string `json:"do_region" form:"required"`
 	DOKSName        string `json:"doks_name" form:"required"`
-	ProjectID       uint   `json:"project_id" form:"required"`
+	ProjectID       uint   `json:"-" form:"required"`
 	DOIntegrationID uint   `json:"do_integration_id" form:"required"`
 }