@@ -1762,7 +1762,7 @@ func (handler CoreAppRestHandlerImpl) createEnvDeploymentTemplate(appId int, use
17621762 }
17631763
17641764 // if chart not found for chart_ref then create
1765- _ , err = handler .chartRepo .FindChartByAppIdAndRefId (appId , chartRefId )
1765+ chartEntry , err : = handler .chartRepo .FindChartByAppIdAndRefId (appId , chartRefId )
17661766 if err != nil {
17671767 if pg .ErrNoRows == err {
17681768 templateRequest := chart.TemplateRequest {
@@ -1784,9 +1784,15 @@ func (handler CoreAppRestHandlerImpl) createEnvDeploymentTemplate(appId int, use
17841784 }
17851785
17861786 // create if required
1787- _ , err = handler .propertiesConfigService .CreateEnvironmentProperties (appId , envConfigProperties )
1787+ appMetrics := false
1788+ if envConfigProperties .AppMetrics != nil {
1789+ appMetrics = * envConfigProperties .AppMetrics
1790+ }
1791+ chartEntry .GlobalOverride = string (envConfigProperties .EnvOverrideValues )
1792+ _ , err = handler .propertiesConfigService .CreateIfRequired (chartEntry , envId , userId , envConfigProperties .ManualReviewed , models .CHARTSTATUS_SUCCESS ,
1793+ true , appMetrics , envConfigProperties .Namespace , envConfigProperties .IsBasicViewLocked , envConfigProperties .CurrentViewEditor , nil )
17881794 if err != nil {
1789- handler .logger .Errorw ("service err, CreateEnvironmentProperties " , "err" , err , "appId" , appId , "envId" , envId , "chartRefId" , chartRefId )
1795+ handler .logger .Errorw ("service err, CreateIfRequired " , "err" , err , "appId" , appId , "envId" , envId , "chartRefId" , chartRefId )
17901796 return err
17911797 }
17921798
@@ -2088,7 +2094,6 @@ func (handler CoreAppRestHandlerImpl) CreateAppWorkflow(w http.ResponseWriter, r
20882094 //rbac ends
20892095
20902096 handler .logger .Infow ("creating app workflow created " , "createAppRequest" , createAppRequest )
2091- var errResp * multierror.Error
20922097 var statusCode int
20932098
20942099 //creating workflow starts
@@ -2099,7 +2104,7 @@ func (handler CoreAppRestHandlerImpl) CreateAppWorkflow(w http.ResponseWriter, r
20992104 }
21002105 err , statusCode = handler .createWorkflows (ctx , createAppRequest .AppId , userId , createAppRequest .AppWorkflows , token , app .AppName )
21012106 if err != nil {
2102- common .WriteJsonResp (w , errResp , nil , statusCode )
2107+ common .WriteJsonResp (w , err , nil , statusCode )
21032108 return
21042109 }
21052110 }
@@ -2109,7 +2114,7 @@ func (handler CoreAppRestHandlerImpl) CreateAppWorkflow(w http.ResponseWriter, r
21092114 if createAppRequest .EnvironmentOverrides != nil && len (createAppRequest .EnvironmentOverrides ) > 0 {
21102115 err , statusCode = handler .createEnvOverrides (ctx , createAppRequest .AppId , userId , createAppRequest .EnvironmentOverrides , token )
21112116 if err != nil {
2112- common .WriteJsonResp (w , errResp , nil , statusCode )
2117+ common .WriteJsonResp (w , err , nil , statusCode )
21132118 return
21142119 }
21152120 }
0 commit comments