Skip to content

fix: handled no config exists case for enforced deployment app type #3575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 28, 2023
Merged

fix: handled no config exists case for enforced deployment app type #3575

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8010f92
chore: handled no config exists case
HimanshuJha2000 Jun 28, 2023
248df36
chore: handled no config exists case
HimanshuJha2000 Jun 28, 2023
9cac367
chore: handled no config exists case
HimanshuJha2000 Jun 28, 2023
788d9d8
chore: handled no config exists case
HimanshuJha2000 Jun 28, 2023
16446f2
chore: added unit test case and refactoring
HimanshuJha2000 Jun 28, 2023
e886f1a
chore: added unit test case and refactoring
HimanshuJha2000 Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/cluster/EnvironmentService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,8 @@ func (impl EnvironmentServiceImpl) GetEnvironmentListForAutocomplete(isDeploymen
allowedDeploymentConfigString []string
)
deploymentConfigValues, _ := impl.attributesRepository.FindByKey(fmt.Sprintf("%d", model.Id))
if err = json.Unmarshal([]byte(deploymentConfigValues.Value), &deploymentConfig); err != nil {
//if empty config received(doesn't exist in table) which can't be parsed
if err = json.Unmarshal([]byte(deploymentConfigValues.Value), &deploymentConfig); err != nil && deploymentConfigValues.Value != "" {
return nil, err
}

Expand Down
3 changes: 2 additions & 1 deletion pkg/pipeline/PipelineBuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1856,7 +1856,8 @@ func (impl PipelineBuilderImpl) CreateCdPipelines(pipelineCreateRequest *bean.Cd
func (impl PipelineBuilderImpl) validateDeploymentAppType(pipeline *bean.CDPipelineConfigObject) error {
var deploymentConfig map[string]bool
deploymentConfigValues, _ := impl.attributesRepository.FindByKey(fmt.Sprintf("%d", pipeline.EnvironmentId))
if err := json.Unmarshal([]byte(deploymentConfigValues.Value), &deploymentConfig); err != nil {
//if empty config received(doesn't exist in table) which can't be parsed
if err := json.Unmarshal([]byte(deploymentConfigValues.Value), &deploymentConfig); err != nil && deploymentConfigValues.Value != "" {
rerr := &util.ApiError{
HttpStatusCode: http.StatusInternalServerError,
InternalMessage: err.Error(),
Expand Down
2 changes: 1 addition & 1 deletion pkg/pipeline/PipelineBuilder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func TestPipelineBuilderImpl_validateDeploymentAppType(t *testing.T) {
mockDeploymentConfigConfig := &repository.Attributes{
Id: 1,
Key: "2",
Value: "",
Value: "fsfdfz",
Active: false,
AuditLog: sql.AuditLog{},
}
Expand Down