oss ent change

Author: kartik-579

api/restHandler/app/pipeline/configure/DeploymentPipelineRestHandler.go

@@ -717,48 +717,22 @@ func (handler *PipelineConfigRestHandlerImpl) EnvConfigOverrideCreate(w http.Res
 		return
 	}
 
-	createResp, err := handler.propertiesConfigService.CreateEnvironmentProperties(appId, &envConfigProperties)
-	if err != nil {
-		if err.Error() == bean4.NOCHARTEXIST {
-			ctx, cancel := context.WithCancel(r.Context())
-			if cn, ok := w.(http.CloseNotifier); ok {
-				go func(done <-chan struct{}, closed <-chan bool) {
-					select {
-					case <-done:
-					case <-closed:
-						cancel()
-					}
-				}(ctx.Done(), cn.CloseNotify())
-			}
-			appMetrics := false
-			if envConfigProperties.AppMetrics != nil {
-				appMetrics = *envConfigProperties.AppMetrics
-			}
-			templateRequest := bean3.TemplateRequest{
-				AppId:               appId,
-				ChartRefId:          envConfigProperties.ChartRefId,
-				ValuesOverride:      []byte("{}"),
-				UserId:              userId,
-				IsAppMetricsEnabled: appMetrics,
+	ctx, cancel := context.WithCancel(r.Context())
+	if cn, ok := w.(http.CloseNotifier); ok {
+		go func(done <-chan struct{}, closed <-chan bool) {
+			select {
+			case <-done:
+			case <-closed:
+				cancel()
 			}
+		}(ctx.Done(), cn.CloseNotify())
+	}
 
-			_, err = handler.chartService.CreateChartFromEnvOverride(templateRequest, ctx)
-			if err != nil {
-				handler.Logger.Errorw("service err, EnvConfigOverrideCreate", "err", err, "payload", envConfigProperties)
-				common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
-				return
-			}
-			createResp, err = handler.propertiesConfigService.CreateEnvironmentProperties(appId, &envConfigProperties)
-			if err != nil {
-				handler.Logger.Errorw("service err, EnvConfigOverrideCreate", "err", err, "payload", envConfigProperties)
-				common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
-				return
-			}
-		} else {
-			handler.Logger.Errorw("service err, EnvConfigOverrideCreate", "err", err, "payload", envConfigProperties)
-			common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
-			return
-		}
+	createResp, err := handler.propertiesConfigService.CreateEnvironmentPropertiesAndBaseIfNeeded(ctx, appId, &envConfigProperties)
+	if err != nil {
+		handler.Logger.Errorw("service err, CreateEnvironmentPropertiesAndBaseIfNeeded", "payload", envConfigProperties, "err", err)
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
 	}
 	common.WriteJsonResp(w, err, createResp, http.StatusOK)
 }

pkg/pipeline/PropertiesConfig.go

@@ -22,6 +22,9 @@ import (
 	errors2 "errors"
 	"fmt"
 	"github.com/devtron-labs/devtron/internal/util"
+	bean5 "github.com/devtron-labs/devtron/pkg/auth/user/bean"
+	chartService "github.com/devtron-labs/devtron/pkg/chart"
+	bean3 "github.com/devtron-labs/devtron/pkg/chart/bean"
 	"github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
 	"github.com/devtron-labs/devtron/pkg/deployment/common"
 	"github.com/devtron-labs/devtron/pkg/deployment/manifest/deployedAppMetrics"
@@ -47,6 +50,7 @@ import (
 )
 
 type PropertiesConfigService interface {
+	CreateEnvironmentPropertiesAndBaseIfNeeded(ctx context.Context, appId int, environmentProperties *bean.EnvironmentProperties) (*bean.EnvironmentProperties, error)
 	CreateEnvironmentProperties(appId int, propertiesRequest *bean.EnvironmentProperties) (*bean.EnvironmentProperties, error)
 	UpdateEnvironmentProperties(appId int, propertiesRequest *bean.EnvironmentProperties, userId int32) (*bean.EnvironmentProperties, error)
 	//create environment entry for each new environment
@@ -71,6 +75,7 @@ type PropertiesConfigServiceImpl struct {
 	deployedAppMetricsService        deployedAppMetrics.DeployedAppMetricsService
 	envConfigOverrideReadService     read.EnvConfigOverrideService
 	deploymentConfigService          common.DeploymentConfigService
+	chartService                     chartService.ChartService
 }
 
 func NewPropertiesConfigServiceImpl(logger *zap.SugaredLogger,
@@ -81,7 +86,8 @@ func NewPropertiesConfigServiceImpl(logger *zap.SugaredLogger,
 	scopedVariableManager variables.ScopedVariableManager,
 	deployedAppMetricsService deployedAppMetrics.DeployedAppMetricsService,
 	envConfigOverrideReadService read.EnvConfigOverrideService,
-	deploymentConfigService common.DeploymentConfigService) *PropertiesConfigServiceImpl {
+	deploymentConfigService common.DeploymentConfigService,
+	chartService chartService.ChartService) *PropertiesConfigServiceImpl {
 	return &PropertiesConfigServiceImpl{
 		logger:                           logger,
 		envConfigRepo:                    envConfigRepo,
@@ -92,6 +98,7 @@ func NewPropertiesConfigServiceImpl(logger *zap.SugaredLogger,
 		deployedAppMetricsService:        deployedAppMetricsService,
 		envConfigOverrideReadService:     envConfigOverrideReadService,
 		deploymentConfigService:          deploymentConfigService,
+		chartService:                     chartService,
 	}
 
 }
@@ -214,6 +221,39 @@ func (impl PropertiesConfigServiceImpl) FetchEnvProperties(appId, envId, chartRe
 	return impl.envConfigOverrideReadService.GetByAppIdEnvIdAndChartRefId(appId, envId, chartRefId)
 }
 
+func (impl PropertiesConfigServiceImpl) CreateEnvironmentPropertiesAndBaseIfNeeded(ctx context.Context, appId int, environmentProperties *bean.EnvironmentProperties) (*bean.EnvironmentProperties, error) {
+	createResp, err := impl.CreateEnvironmentProperties(appId, environmentProperties)
+	if err != nil {
+		if err.Error() == bean5.NOCHARTEXIST {
+			appMetrics := false
+			if environmentProperties.AppMetrics != nil {
+				appMetrics = *environmentProperties.AppMetrics
+			}
+			templateRequest := bean3.TemplateRequest{
+				AppId:               appId,
+				ChartRefId:          environmentProperties.ChartRefId,
+				ValuesOverride:      []byte("{}"),
+				UserId:              environmentProperties.UserId,
+				IsAppMetricsEnabled: appMetrics,
+			}
+			_, err = impl.chartService.CreateChartFromEnvOverride(templateRequest, ctx)
+			if err != nil {
+				impl.logger.Errorw("service err, EnvConfigOverrideCreate", "err", err, "payload", environmentProperties)
+				return nil, err
+			}
+			createResp, err = impl.CreateEnvironmentProperties(appId, environmentProperties)
+			if err != nil {
+				impl.logger.Errorw("service err, EnvConfigOverrideCreate", "err", err, "payload", environmentProperties)
+				return nil, err
+			}
+		} else {
+			impl.logger.Errorw("service err, EnvConfigOverrideCreate", "err", err, "payload", environmentProperties)
+			return nil, err
+		}
+	}
+	return createResp, nil
+}
+
 func (impl PropertiesConfigServiceImpl) CreateEnvironmentProperties(appId int, environmentProperties *bean.EnvironmentProperties) (*bean.EnvironmentProperties, error) {
 	chart, err := impl.chartRepo.FindChartByAppIdAndRefId(appId, environmentProperties.ChartRefId)
 	if err != nil && !errors2.Is(err, pg.ErrNoRows) {