some refact after code review -1

Author: prakash100198

api/restHandler/app/configDiff/DeploymentConfigurationRestHandler.go

@@ -154,7 +154,7 @@ func (handler *DeploymentConfigurationRestHandlerImpl) CompareCategoryWiseConfig
 		return
 	}
 	vars := mux.Vars(r)
-	configCategory := vars["category"]
+	configCategory := vars["resource"]
 	var comparisonRequestDto bean.ComparisonRequestDto
 	err = json.NewDecoder(r.Body).Decode(&comparisonRequestDto)
 	if err != nil {

api/restHandler/app/configDiff/utils.go

@@ -5,7 +5,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/configDiff/bean"
 )
 
-var validConfigCategories = map[string]bool{"secret": true, "cm": true, "dt": true, "ps": true}
+var validConfigCategories = map[string]bool{bean.Secret.ToString(): true, bean.ConfigMap.ToString(): true, bean.DeploymentTemplate.ToString(): true, bean.PipelineStrategy.ToString(): true}
 var ErrInvalidConfigCategory = errors.New("invalid config category provided")
 var ErrInvalidComparisonItems = errors.New("invalid comparison items, only 2 items are supported for comparison")
 var ErrInvalidIndexValInComparisonItems = errors.New("invalid index values in comparison items")

api/router/app/configDiff/DeploymentConfigRouter.go

@@ -27,7 +27,7 @@ func (router DeploymentConfigurationRouterImpl) InitDeploymentConfigurationRoute
 	configRouter.Path("/data").
 		HandlerFunc(router.deploymentGroupRestHandler.GetConfigData).
 		Methods("GET")
-	configRouter.Path("/compare/{category}").
+	configRouter.Path("/compare/{resource}").
 		HandlerFunc(router.deploymentGroupRestHandler.CompareCategoryWiseConfigData).
 		Methods("GET")
 

cmd/external-app/wire_gen.go

@@ -1105,13 +1105,13 @@ func (impl *DeploymentConfigurationServiceImpl) getSingleSecretDataForAppConfigu
 	var err error
 	switch comparisonItem.ConfigType {
 	case bean2.DraftOnly.ToString():
-		secretConfigMetadata, err = impl.getSingleSecretDataForDraftOnly(ctx, appEnvAndClusterMetadata, comparisonItem.UserId)
+		secretConfigMetadata, err = impl.getSecretDataForDraftOnly(ctx, appEnvAndClusterMetadata, comparisonItem.UserId)
 		if err != nil {
 			impl.logger.Errorw("error in getting single secret data for draft only", "appEnvAndClusterMetadata", appEnvAndClusterMetadata, "err", err)
 			return nil, err
 		}
 	case bean2.PublishedWithDraft.ToString():
-		secretConfigMetadata, err = impl.getSingleSecretDataForPublishedWithDraft(ctx, appEnvAndClusterMetadata, systemMetadata, comparisonItem.UserId)
+		secretConfigMetadata, err = impl.getSecretDataForPublishedWithDraft(ctx, appEnvAndClusterMetadata, systemMetadata, comparisonItem.UserId)
 		if err != nil {
 			impl.logger.Errorw("error in getting single secret data for published with draft ", "appEnvAndClusterMetadata", appEnvAndClusterMetadata, "err", err)
 			return nil, err
@@ -1124,7 +1124,7 @@ func (impl *DeploymentConfigurationServiceImpl) getSingleSecretDataForAppConfigu
 			return nil, err
 		}
 	default: // keeping default as PublishedOnly
-		secretConfigMetadata, err = impl.getSingleSecretDataForPublishedOnly(ctx, appEnvAndClusterMetadata, systemMetadata)
+		secretConfigMetadata, err = impl.getSecretDataForPublishedOnly(ctx, appEnvAndClusterMetadata, systemMetadata)
 		if err != nil {
 			impl.logger.Errorw("error in config data for PublishedOnly", "comparisonDataPayload", comparisonItem.ConfigDataQueryParams, "err", err)
 			return nil, err
@@ -1174,7 +1174,7 @@ func (impl *DeploymentConfigurationServiceImpl) getSingleSecretDataForPreviousDe
 	return secretsList, resolvedSecretData, nil
 }
 
-func (impl *DeploymentConfigurationServiceImpl) getSingleSecretDataForPublishedOnly(ctx context.Context, appEnvAndClusterMetadata *bean2.AppEnvAndClusterMetadata,
+func (impl *DeploymentConfigurationServiceImpl) getSecretDataForPublishedOnly(ctx context.Context, appEnvAndClusterMetadata *bean2.AppEnvAndClusterMetadata,
 	systemMetadata *resourceQualifiers.SystemMetadata) (*bean2.SecretConfigMetadata, error) {
 	secretData, err := impl.getSecretConfigResponse("", 0, appEnvAndClusterMetadata.EnvId, appEnvAndClusterMetadata.AppId)
 	if err != nil {

pkg/configDiff/DeploymentConfigurationService.go

@@ -8,11 +8,11 @@ import (
 	"net/http"
 )
 
-func (impl *DeploymentConfigurationServiceImpl) getSingleSecretDataForDraftOnly(ctx context.Context, appEnvAndClusterMetadata *bean2.AppEnvAndClusterMetadata, userId int32) (*bean2.SecretConfigMetadata, error) {
+func (impl *DeploymentConfigurationServiceImpl) getSecretDataForDraftOnly(ctx context.Context, appEnvAndClusterMetadata *bean2.AppEnvAndClusterMetadata, userId int32) (*bean2.SecretConfigMetadata, error) {
 	return nil, util.GetApiError(http.StatusNotFound, "implementation for draft kind not found", "implementation for draft kind not found")
 }
 
-func (impl *DeploymentConfigurationServiceImpl) getSingleSecretDataForPublishedWithDraft(ctx context.Context, appEnvAndClusterMetadata *bean2.AppEnvAndClusterMetadata,
+func (impl *DeploymentConfigurationServiceImpl) getSecretDataForPublishedWithDraft(ctx context.Context, appEnvAndClusterMetadata *bean2.AppEnvAndClusterMetadata,
 	systemMetadata *resourceQualifiers.SystemMetadata, userId int32) (*bean2.SecretConfigMetadata, error) {
 	return nil, util.GetApiError(http.StatusNotFound, "implementation for published with draft kind not found", "implementation for published with draft kind not found")
 }

pkg/configDiff/DeploymentConfigurationService_ent.go

@@ -293,3 +293,16 @@ type SecretConfigMetadata struct {
 	SecretsList                 *bean.SecretsList
 	SecretScopeVariableMetadata *CmCsScopeVariableMetadata
 }
+
+type Resource string
+
+const (
+	ConfigMap          Resource = "cm"
+	Secret             Resource = "secret"
+	DeploymentTemplate Resource = "dt"
+	PipelineStrategy   Resource = "ps"
+)
+
+func (r Resource) ToString() string {
+	return string(r)
+}