code review incorporation :- kartik

Author: prakash100198

pkg/cluster/repository/EnvironmentRepository.go

@@ -168,7 +168,6 @@ func (repositoryImpl EnvironmentRepositoryImpl) FindEnvByNameWithClusterDetails(
 		Column("environment.*", "Cluster").
 		Where("environment.environment_name = ?", envName).
 		Where("environment.active = ?", true).
-		Limit(1).
 		Select()
 	return environment, err
 }

pkg/configDiff/DeploymentConfigurationService.go

@@ -31,6 +31,7 @@ import (
 	"github.com/juju/errors"
 	"go.uber.org/zap"
 	"net/http"
+	"strconv"
 )
 
 type DeploymentConfigurationService interface {
@@ -140,7 +141,7 @@ func (impl *DeploymentConfigurationServiceImpl) GetAllConfigData(ctx context.Con
 		envId = env.Id
 		clusterId = env.ClusterId
 		systemMetadata.EnvironmentName = env.Name
-		systemMetadata.Namespace = env.Name
+		systemMetadata.Namespace = env.Namespace
 		systemMetadata.ClusterName = env.Cluster.ClusterName
 	}
 	appId, err = impl.appRepository.FindAppIdByName(configDataQueryParams.AppName)
@@ -161,6 +162,9 @@ func (impl *DeploymentConfigurationServiceImpl) GetAllConfigData(ctx context.Con
 
 func (impl *DeploymentConfigurationServiceImpl) getConfigDataForCdRollback(ctx context.Context, configDataQueryParams *bean2.ConfigDataQueryParams, userHasAdminAccess bool) (*bean2.DeploymentAndCmCsConfigDto, error) {
 	// wfrId is expected in this case to return the expected data
+	if configDataQueryParams.WfrId == 0 {
+		return nil, &util.ApiError{HttpStatusCode: http.StatusNotFound, Code: strconv.Itoa(http.StatusNotFound), InternalMessage: bean2.ExpectedWfrIdNotPassedInQueryParamErr, UserMessage: bean2.ExpectedWfrIdNotPassedInQueryParamErr}
+	}
 	return impl.getConfigDataForDeploymentHistory(ctx, configDataQueryParams, userHasAdminAccess)
 }
 
@@ -323,12 +327,7 @@ func (impl *DeploymentConfigurationServiceImpl) getCmCsConfigHistory(ctx context
 		return nil, err
 	}
 	resolvedConfigDataReq := &bean.ConfigDataRequest{ConfigData: resolvedConfigDataList}
-	resolvedConfigDataString, err := utils.ConvertToString(resolvedConfigDataReq)
-	if err != nil {
-		impl.logger.Errorw("getCmCsPublishedConfigResponse, error in converting config data to json raw message", "pipelineId", configDataQueryParams.PipelineId, "wfrId", configDataQueryParams.WfrId, "err", err)
-		return nil, err
-	}
-	resolvedConfigDataStringJson, err := utils.ConvertToJsonRawMessage(resolvedConfigDataString)
+	resolvedConfigDataStringJson, err := utils.ConvertToJsonRawMessage(resolvedConfigDataReq)
 	if err != nil {
 		impl.logger.Errorw("getCmCsPublishedConfigResponse, error in ConvertToJsonRawMessage for resolvedConfigDataString", "pipelineId", configDataQueryParams.PipelineId, "wfrId", configDataQueryParams.WfrId, "err", err)
 		return nil, err
@@ -355,7 +354,7 @@ func (impl *DeploymentConfigurationServiceImpl) encodeSecretDataFromNonAdminUser
 				}
 				for key, _ := range resultMap {
 					//hard-coding values to show them as hidden to user
-					resultMapFinal[key] = "*****"
+					resultMapFinal[key] = bean2.SecretMaskedValue
 				}
 				config.Data, err = utils.ConvertToJsonRawMessage(resultMapFinal)
 				if err != nil {

pkg/configDiff/bean/bean.go

@@ -229,5 +229,7 @@ type DeploymentTemplateMetadata struct {
 }
 
 const (
-	NoDeploymentDoneForSelectedImage = "there were no deployments done for the selected image"
+	NoDeploymentDoneForSelectedImage      = "there were no deployments done for the selected image"
+	ExpectedWfrIdNotPassedInQueryParamErr = "wfrId is expected in the query param which was not passed"
+	SecretMaskedValue                     = "*****"
 )

pkg/generateManifest/DeploymentTemplateService.go

@@ -235,11 +235,7 @@ func (impl DeploymentTemplateServiceImpl) GetDeploymentTemplate(ctx context.Cont
 		result.ResolvedData = resolvedValue
 		result.VariableSnapshot = variableSnapshot
 		if response != nil {
-			result.Data = response.Data
-			result.ResolvedData = response.ResolvedData
-			result.VariableSnapshot = response.VariableSnapshot
-			result.TemplateVersion = response.TemplateVersion
-			result.IsAppMetricsEnabled = response.IsAppMetricsEnabled
+			result = ConvertPointerDeploymentTemplateResponseToNonPointer(response)
 		}
 		return result, nil
 	}
@@ -251,7 +247,9 @@ func (impl DeploymentTemplateServiceImpl) GetDeploymentTemplate(ctx context.Cont
 	if err != nil {
 		return result, err
 	}
-	result.Data = *manifest.Manifest
+	if manifest != nil {
+		result.Data = *manifest.Manifest
+	}
 	return result, nil
 }
 

pkg/generateManifest/adapter.go

@@ -0,0 +1,14 @@
+package generateManifest
+
+func ConvertPointerDeploymentTemplateResponseToNonPointer(r *DeploymentTemplateResponse) DeploymentTemplateResponse {
+	if r != nil {
+		return DeploymentTemplateResponse{
+			Data:                r.Data,
+			ResolvedData:        r.ResolvedData,
+			VariableSnapshot:    r.VariableSnapshot,
+			TemplateVersion:     r.TemplateVersion,
+			IsAppMetricsEnabled: r.IsAppMetricsEnabled,
+		}
+	}
+	return DeploymentTemplateResponse{}
+}

pkg/pipeline/history/ConfigMapHistoryService.go

@@ -763,12 +763,7 @@ func (impl *ConfigMapHistoryServiceImpl) getResolvedConfigData(ctx context.Conte
 		return nil, err
 	}
 	resolvedConfigDataReq := &bean3.ConfigDataRequest{ConfigData: resolvedConfigDataList}
-	resolvedConfigDataString, err := utils.ConvertToString(resolvedConfigDataReq)
-	if err != nil {
-		impl.logger.Errorw("getCmCsPublishedConfigResponse, error in converting config data to json raw message", "pipelineId", pipelineId, "deployedOn", deployedOn, "err", err)
-		return nil, err
-	}
-	resolvedConfigDataStringJson, err := utils.ConvertToJsonRawMessage(resolvedConfigDataString)
+	resolvedConfigDataStringJson, err := utils.ConvertToJsonRawMessage(resolvedConfigDataReq)
 	if err != nil {
 		impl.logger.Errorw("getCmCsPublishedConfigResponse, error in ConvertToJsonRawMessage for resolvedJson", "resolvedJson", resolvedConfigDataStringJson, "err", err)
 		return nil, err