github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-02-14 10:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: minor fix

Browse Source
This commit is contained in:
Jianbo Sun
2021-12-22 19:52:07 +08:00
parent 6848831704
commit 9cafefa65a
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/apiserver/rest/apis/v1/types.go
View File

@@ -268,7 +268,6 @@ type ClusterBase struct {
// ListApplicatioOptions list application query options
type ListApplicatioOptions struct {
Project string `json:"project"`
Env string `json:"env"`
TargetName string `json:"targetName"`
Query string `json:"query"`
}

1
pkg/apiserver/rest/webservice/application.go
View File

@@ -506,7 +506,6 @@ func (c *applicationWebService) createApplication(req *restful.Request, res *res
func (c *applicationWebService) listApplications(req *restful.Request, res *restful.Response) {
apps, err := c.applicationUsecase.ListApplications(req.Request.Context(), apis.ListApplicatioOptions{
Project: req.QueryParameter("project"),
Env: req.QueryParameter("env"),
TargetName: req.QueryParameter("targetName"),
Query: req.QueryParameter("query"),
})

20
pkg/apiserver/rest/webservice/env.go
View File

@@ -27,13 +27,13 @@ import (
)
type envWebService struct {
envUsecase usecase.EnvUsecase
appUsecase usecase.ApplicationUsecase
envUsecase usecase.EnvUsecase
envbindingUsecase usecase.EnvBindingUsecase
}
// NewEnvWebService new env webservice
func NewEnvWebService(envUsecase usecase.EnvUsecase) WebService {
return &envWebService{envUsecase: envUsecase}
func NewEnvWebService(envUsecase usecase.EnvUsecase, envBinding usecase.EnvBindingUsecase) WebService {
return &envWebService{envUsecase: envUsecase, envbindingUsecase: envBinding}
}
func (n *envWebService) GetWebService() *restful.WebService {
@@ -92,17 +92,9 @@ func (n *envWebService) delete(req *restful.Request, res *restful.Response) {
envname := req.PathParameter("name")
ctx := req.Request.Context()
lists, err := n.appUsecase.ListApplications(ctx, apis.ListApplicatioOptions{Env: envname})
if err != nil {
bcode.ReturnError(req, res, err)
return
}
if len(lists) > 0 {
bcode.ReturnError(req, res, bcode.ErrDeleteEnvButAppExist)
return
}
err = n.envUsecase.DeleteEnv(ctx, envname)
// TODO(wonderflow): prevent env being deleted if still has app inside
err := n.envUsecase.DeleteEnv(ctx, envname)
if err != nil {
bcode.ReturnError(req, res, err)
return