Merge pull request #6871 from devtron-labs/vc-empty-ns-fix

misc: Vc empty ns fix

Author: prakash100198

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

@@ -21,19 +21,21 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+
 	models2 "github.com/devtron-labs/devtron/internal/sql/models"
 	bean4 "github.com/devtron-labs/devtron/pkg/auth/user/bean"
 	util3 "github.com/devtron-labs/devtron/pkg/auth/user/util"
 	bean3 "github.com/devtron-labs/devtron/pkg/chart/bean"
 
-	devtronAppGitOpConfigBean "github.com/devtron-labs/devtron/pkg/chart/gitOpsConfig/bean"
-	"github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning/repository"
 	"io"
 	"net/http"
 	"strconv"
 	"strings"
 	"time"
 
+	devtronAppGitOpConfigBean "github.com/devtron-labs/devtron/pkg/chart/gitOpsConfig/bean"
+	"github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning/repository"
+
 	bean2 "github.com/devtron-labs/devtron/api/bean"
 	"github.com/devtron-labs/devtron/api/restHandler/common"
 	"github.com/devtron-labs/devtron/internal/sql/repository/helper"
@@ -107,6 +109,7 @@ type DevtronAppDeploymentConfigRestHandler interface {
 	GetDefaultDeploymentPipelineStrategy(w http.ResponseWriter, r *http.Request)
 
 	EnvConfigOverrideCreateNamespace(w http.ResponseWriter, r *http.Request)
+	UpdateEmptyNamespaceInChartEnvConfigOverride(w http.ResponseWriter, r *http.Request)
 
 	DevtronAppDeploymentConfigRestHandlerEnt
 }
@@ -2062,6 +2065,36 @@ func (handler *PipelineConfigRestHandlerImpl) EnvConfigOverrideCreateNamespace(w
 	common.WriteJsonResp(w, err, createResp, http.StatusOK)
 }
 
+func (handler *PipelineConfigRestHandlerImpl) UpdateEmptyNamespaceInChartEnvConfigOverride(w http.ResponseWriter, r *http.Request) {
+	userId, err := handler.userAuthService.GetLoggedInUser(r)
+	if userId == 0 || err != nil {
+		common.HandleUnauthorized(w, r)
+		return
+	}
+	token := r.Header.Get("token")
+
+	// Check if user is super admin - this is a global operation
+	if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionUpdate, "*"); !ok {
+		common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
+		return
+	}
+
+	handler.Logger.Infow("request received, UpdateEmptyNamespaceInChartEnvConfigOverride", "userId", userId)
+
+	count, err := handler.propertiesConfigService.UpdateEmptyNamespaceInChartEnvConfigOverride(userId)
+	if err != nil {
+		handler.Logger.Errorw("service err, UpdateEmptyNamespaceInChartEnvConfigOverride", "err", err)
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	}
+
+	response := map[string]interface{}{
+		"message":      "Namespace updated successfully from environment table",
+		"updatedCount": count,
+	}
+	common.WriteJsonResp(w, nil, response, http.StatusOK)
+}
+
 func (handler *PipelineConfigRestHandlerImpl) IsReadyToTrigger(w http.ResponseWriter, r *http.Request) {
 	token := r.Header.Get("token")
 	vars := mux.Vars(r)

api/router/app/pipeline/configure/PipelineConfigRouter.go

@@ -124,6 +124,9 @@ func (router PipelineConfigRouterImpl) InitPipelineConfigRouter(configRouter *mu
 	configRouter.Path("/env/reset/{appId}/{environmentId}/{id}").HandlerFunc(router.restHandler.EnvConfigOverrideReset).Methods("DELETE")
 	configRouter.Path("/env/namespace/{appId}/{environmentId}").HandlerFunc(router.restHandler.EnvConfigOverrideCreateNamespace).Methods("POST")
 
+	// this api was made for issue :- https://github.com/devtron-labs/sprint-tasks/issues/2692
+	configRouter.Path("/env/namespace/populate-empty").HandlerFunc(router.restHandler.UpdateEmptyNamespaceInChartEnvConfigOverride).Methods("GET")
+
 	configRouter.Path("/cd-pipeline/workflow/history/{appId}/{environmentId}/{pipelineId}").HandlerFunc(router.restHandler.ListDeploymentHistory).Methods("GET")
 	configRouter.Path("/cd-pipeline/workflow/logs/{appId}/{environmentId}/{pipelineId}/{workflowId}").HandlerFunc(router.restHandler.GetPrePostDeploymentLogs).Methods("GET")
 	configRouter.Path("/cd-pipeline/workflow/trigger-info/{appId}/{environmentId}/{pipelineId}/{workflowRunnerId}").HandlerFunc(router.restHandler.FetchCdWorkflowDetails).Methods("GET")

internal/sql/repository/chartConfig/EnvConfigOverrideRepository.go

@@ -17,6 +17,8 @@
 package chartConfig
 
 import (
+	"time"
+
 	"github.com/devtron-labs/devtron/internal/sql/models"
 	chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
 	"github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
@@ -80,6 +82,8 @@ type EnvConfigOverrideRepository interface {
 	// as the chartRepoRepository.Chart contains the reference chart(in bytes).
 	GetAllOverridesForApp(appId int) ([]*EnvConfigOverride, error)
 	GetDbConnection() *pg.DB
+	// UpdateEmptyNamespaceInChartEnvConfigOverride updates namespace in chart_env_config_override from environment table for empty namespaces
+	UpdateEmptyNamespaceInChartEnvConfigOverride(userId int32) (int, error)
 }
 
 type EnvConfigOverrideRepositoryImpl struct {
@@ -401,3 +405,23 @@ func (r EnvConfigOverrideRepositoryImpl) GetAllOverridesForApp(appId int) ([]*En
 func (r EnvConfigOverrideRepositoryImpl) GetDbConnection() *pg.DB {
 	return r.dbConnection
 }
+
+func (r EnvConfigOverrideRepositoryImpl) UpdateEmptyNamespaceInChartEnvConfigOverride(userId int32) (int, error) {
+	query := `UPDATE chart_env_config_override
+		SET namespace = e.namespace,
+		    updated_by = ?,
+		    updated_on = ?
+		FROM charts c
+		INNER JOIN app a ON a.id = c.app_id
+		INNER JOIN chart_env_config_override ce ON ce.chart_id = c.id
+		INNER JOIN environment e ON e.id = ce.target_environment
+		WHERE a.active = true
+		  AND (ce.namespace = '' OR ce.namespace IS NULL)
+		  AND chart_env_config_override.id = ce.id`
+
+	result, err := r.dbConnection.Exec(query, userId, time.Now())
+	if err != nil {
+		return 0, err
+	}
+	return result.RowsAffected(), nil
+}

pkg/pipeline/PropertiesConfig.go

@@ -21,6 +21,9 @@ import (
 	"encoding/json"
 	errors2 "errors"
 	"fmt"
+	"net/http"
+	"time"
+
 	"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"
@@ -38,8 +41,6 @@ import (
 	repository5 "github.com/devtron-labs/devtron/pkg/variables/repository"
 	globalUtil "github.com/devtron-labs/devtron/util"
 	"go.opentelemetry.io/otel"
-	"net/http"
-	"time"
 
 	chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
 	"github.com/devtron-labs/devtron/pkg/sql"
@@ -68,6 +69,9 @@ type PropertiesConfigService interface {
 	FetchEnvProperties(appId, envId, chartRefId int) (*bean4.EnvConfigOverride, error)
 	ChangeChartRefForEnvConfigOverride(ctx context.Context, request *bean3.ChartRefChangeRequest, userId int32) (*bean.EnvironmentProperties, error)
 
+	// UpdateEmptyNamespaceInChartEnvConfigOverride updates namespace in chart_env_config_override from environment table for empty namespaces
+	UpdateEmptyNamespaceInChartEnvConfigOverride(userId int32) (int, error)
+
 	PropertiesConfigServiceEnt
 }
 type PropertiesConfigServiceImpl struct {
@@ -805,3 +809,14 @@ func (impl *PropertiesConfigServiceImpl) createEnvConfigOverrideWithChart(ctx co
 	}
 	return createResp, nil
 }
+
+func (impl *PropertiesConfigServiceImpl) UpdateEmptyNamespaceInChartEnvConfigOverride(userId int32) (int, error) {
+	count, err := impl.envConfigRepo.UpdateEmptyNamespaceInChartEnvConfigOverride(userId)
+	if err != nil {
+		impl.logger.Errorw("error in updating namespace from environment table", "err", err)
+		return 0, err
+	}
+
+	impl.logger.Infow("successfully updated namespace for env config overrides from environment table", "count", count)
+	return count, nil
+}