test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-11-29 18:27:58 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

perf: yaml creates duplicate resource names (#1693)

Browse Source
This commit is contained in:
张启航 2023-07-07 18:28:26 +08:00 committed by GitHub
parent 32e65c3aa4
commit 8644fcc95a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/handler/resource_import.go
View File

@ -39,8 +39,12 @@ func (c *clusterAction) ResourceImport(namespace string, as map[string]model.App
return nil, &util.APIHandleError{Code: 400, Err: fmt.Errorf("create K8sResources err:%v", err)}
}
var componentAttributes []model.ComponentAttributes
existComponents, err := db.GetManager().TenantServiceDao().ListByAppID(app.AppID)
if err != nil {
return nil, &util.APIHandleError{Code: 400, Err: fmt.Errorf("get app service by appID failure: %v", err)}
}
for _, componentResource := range components.ConvertResource {
component, err := c.CreateComponent(app, tenant.UUID, componentResource, namespace, false)
component, err := c.CreateComponent(app, tenant.UUID, componentResource, namespace, false, existComponents)
if err != nil {
logrus.Errorf("%v", err)
return nil, &util.APIHandleError{Code: 400, Err: fmt.Errorf("create app error:%v", err)}
@ -148,7 +152,7 @@ func (c *clusterAction) CreateK8sResource(k8sResources []dbmodel.K8sResource, Ap
return k8sResources, err
}
func (c *clusterAction) CreateComponent(app *dbmodel.Application, tenantID string, component model.ConvertResource, namespace string, isYaml bool) (*dbmodel.TenantServices, error) {
func (c *clusterAction) CreateComponent(app *dbmodel.Application, tenantID string, component model.ConvertResource, namespace string, isYaml bool, existComponents []*dbmodel.TenantServices) (*dbmodel.TenantServices, error) {
var extendMethod string
switch component.BasicManagement.ResourceType {
case model.Deployment:
@ -170,6 +174,13 @@ func (c *clusterAction) CreateComponent(app *dbmodel.Application, tenantID strin
if err != nil {
logrus.Errorf("component %v BasicManagement.JobStrategy json error%v", component.ComponentsName, err)
}
for _, cpt := range existComponents {
if cpt.K8sComponentName == component.ComponentsName {
uid := strings.Replace(uuid.NewV4().String(), "-", "", -1)
suffix := uid[:6]
component.ComponentsName = component.ComponentsName + "-" + suffix
}
}
ts := dbmodel.TenantServices{
TenantID: tenantID,
ServiceID: serviceID,

6
api/handler/yaml_resource.go
View File

@ -310,8 +310,12 @@ func (c *clusterAction) AppYamlResourceImport(yamlResource api_model.YamlResourc
return ar, &util.APIHandleError{Code: 400, Err: fmt.Errorf("create K8sResources err:%v", err)}
}
var componentAttributes []api_model.ComponentAttributes
existComponents, err := db.GetManager().TenantServiceDao().ListByAppID(app.AppID)
if err != nil {
return api_model.AppComponent{}, &util.APIHandleError{Code: 400, Err: fmt.Errorf("get app service by appID failure: %v", err)}
}
for _, componentResource := range components.ConvertResource {
component, err := c.CreateComponent(app, yamlResource.TenantID, componentResource, yamlResource.Namespace, true)
component, err := c.CreateComponent(app, yamlResource.TenantID, componentResource, yamlResource.Namespace, true, existComponents)
if err != nil {
logrus.Errorf("%v", err)
return ar, &util.APIHandleError{Code: 400, Err: fmt.Errorf("create app error:%v", err)}