未验证 提交 1250eb04 编写于 作者: P Petrus 提交者: GitHub

fix panic when wd get product info (#2997)

Signed-off-by: NPatrick Zhao <zhaoyu@koderover.com>
上级 d173d407
...@@ -1853,13 +1853,15 @@ func GetProductInfo(username, envName, productName string, log *zap.SugaredLogge ...@@ -1853,13 +1853,15 @@ func GetProductInfo(username, envName, productName string, log *zap.SugaredLogge
return nil, e.ErrGetEnv return nil, e.ErrGetEnv
} }
renderSetOpt := &commonrepo.RenderSetFindOption{Name: prod.Render.Name, Revision: prod.Render.Revision, ProductTmpl: productName} if prod.Render != nil {
renderSet, err := commonrepo.NewRenderSetColl().Find(renderSetOpt) renderSetOpt := &commonrepo.RenderSetFindOption{Name: prod.Render.Name, Revision: prod.Render.Revision, ProductTmpl: productName}
if err != nil { renderSet, err := commonrepo.NewRenderSetColl().Find(renderSetOpt)
log.Errorf("find helm renderset[%s] error: %v", prod.Render.Name, err) if err != nil {
return prod, nil log.Errorf("find helm renderset[%s] error: %v", prod.Render.Name, err)
return prod, nil
}
prod.ServiceRenders = renderSet.ChartInfos
} }
prod.ServiceRenders = renderSet.ChartInfos
return prod, nil return prod, nil
} }
......
...@@ -441,16 +441,6 @@ func (p *DeployTaskPlugin) getService(ctx context.Context, name, serviceType, pr ...@@ -441,16 +441,6 @@ func (p *DeployTaskPlugin) getService(ctx context.Context, name, serviceType, pr
return s, nil return s, nil
} }
func getProductInfo(ctx context.Context, httpClient *httpclient.Client, envName, productName string) (*types.Product, error) {
url := fmt.Sprintf("/api/environment/environments/%s/productInfo", envName)
prod := &types.Product{}
_, err := httpClient.Get(url, httpclient.SetResult(prod), httpclient.SetQueryParam("projectName", productName), httpclient.SetQueryParam("ifPassFilter", "true"))
if err != nil {
return nil, err
}
return prod, nil
}
func getRenderedManifests(ctx context.Context, httpClient *httpclient.Client, envName, productName string, serviceName string) ([]string, error) { func getRenderedManifests(ctx context.Context, httpClient *httpclient.Client, envName, productName string, serviceName string) ([]string, error) {
url := "/api/environment/export/service" url := "/api/environment/export/service"
prod := make([]string, 0) prod := make([]string, 0)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册