Gitops delete repo fix (#809)

* removed delete repo access error in gitops validation

* changed gitops response for delete repo validation fix

* review changes

* wip

* wip

* review changes

* fixed response name

* review changes

* review changes

Author: kartik-579

api/restHandler/GitOpsConfigRestHandler.go

@@ -97,16 +97,13 @@ func (impl GitOpsConfigRestHandlerImpl) CreateGitOpsConfig(w http.ResponseWriter
 		writeJsonResp(w, err, nil, http.StatusBadRequest)
 		return
 	}
-	gitOpsConfig, detailedErrorGitOpsConfigResponse, err := impl.gitOpsConfigService.ValidateAndCreateGitOpsConfig(&bean)
+	detailedErrorGitOpsConfigResponse, err := impl.gitOpsConfigService.ValidateAndCreateGitOpsConfig(&bean)
 	if err != nil {
 		impl.logger.Errorw("service err, SaveGitRepoConfig", "err", err, "payload", bean)
 		writeJsonResp(w, err, nil, http.StatusInternalServerError)
 	}
-	if gitOpsConfig != nil {
-		writeJsonResp(w, nil, gitOpsConfig, http.StatusOK)
-	} else {
-		writeJsonResp(w, nil, detailedErrorGitOpsConfigResponse, http.StatusOK)
-	}
+	writeJsonResp(w, nil, detailedErrorGitOpsConfigResponse, http.StatusOK)
+
 }
 
 func (impl GitOpsConfigRestHandlerImpl) UpdateGitOpsConfig(w http.ResponseWriter, r *http.Request) {
@@ -138,16 +135,13 @@ func (impl GitOpsConfigRestHandlerImpl) UpdateGitOpsConfig(w http.ResponseWriter
 		writeJsonResp(w, err, nil, http.StatusBadRequest)
 		return
 	}
-	gitOpsConfig, detailedErrorGitOpsConfigResponse, err := impl.gitOpsConfigService.ValidateAndUpdateGitOpsConfig(&bean)
+	detailedErrorGitOpsConfigResponse, err := impl.gitOpsConfigService.ValidateAndUpdateGitOpsConfig(&bean)
 	if err != nil {
 		impl.logger.Errorw("service err, UpdateGitOpsConfig", "err", err, "payload", bean)
 		writeJsonResp(w, err, nil, http.StatusInternalServerError)
 	}
-	if gitOpsConfig != nil {
-		writeJsonResp(w, nil, gitOpsConfig, http.StatusOK)
-	} else {
-		writeJsonResp(w, nil, detailedErrorGitOpsConfigResponse, http.StatusOK)
-	}
+	writeJsonResp(w, nil, detailedErrorGitOpsConfigResponse, http.StatusOK)
+
 }
 
 func (impl GitOpsConfigRestHandlerImpl) GetGitOpsConfigById(w http.ResponseWriter, r *http.Request) {

internal/util/GitService.go

@@ -72,6 +72,7 @@ type DetailedErrorGitOpsConfigActions struct {
 	SuccessfulStages []string         `json:"successfulStages"`
 	StageErrorMap    map[string]error `json:"stageErrorMap"`
 	ValidatedOn      time.Time        `json:"validatedOn"`
+	DeleteRepoFailed bool   `json:"deleteRepoFailed"`
 }
 
 func (factory *GitFactory) Reload() error {

pkg/gitops/GitOpsConfigService.go

@@ -46,8 +46,8 @@ import (
 )
 
 type GitOpsConfigService interface {
-	ValidateAndCreateGitOpsConfig(config *bean2.GitOpsConfigDto) (*bean2.GitOpsConfigDto, DetailedErrorGitOpsConfigResponse, error)
-	ValidateAndUpdateGitOpsConfig(config *bean2.GitOpsConfigDto) (*bean2.GitOpsConfigDto, DetailedErrorGitOpsConfigResponse, error)
+	ValidateAndCreateGitOpsConfig(config *bean2.GitOpsConfigDto) (DetailedErrorGitOpsConfigResponse, error)
+	ValidateAndUpdateGitOpsConfig(config *bean2.GitOpsConfigDto) (DetailedErrorGitOpsConfigResponse, error)
 	GitOpsValidateDryRun(config *bean2.GitOpsConfigDto) DetailedErrorGitOpsConfigResponse
 	CreateGitOpsConfig(config *bean2.GitOpsConfigDto) (*bean2.GitOpsConfigDto, error)
 	UpdateGitOpsConfig(config *bean2.GitOpsConfigDto) error
@@ -80,7 +80,9 @@ type DetailedErrorGitOpsConfigResponse struct {
 	SuccessfulStages []string          `json:"successfulStages"`
 	StageErrorMap    map[string]string `json:"stageErrorMap"`
 	ValidatedOn      time.Time         `json:"validatedOn"`
+	DeleteRepoFailed bool   `json:"deleteRepoFailed"`
 }
+
 type GitOpsConfigServiceImpl struct {
 	randSource       rand.Source
 	logger           *zap.SugaredLogger
@@ -110,29 +112,27 @@ func NewGitOpsConfigServiceImpl(Logger *zap.SugaredLogger, ciHandler pipeline.Ci
 	}
 }
 
-func (impl *GitOpsConfigServiceImpl) ValidateAndCreateGitOpsConfig(config *bean2.GitOpsConfigDto) (*bean2.GitOpsConfigDto, DetailedErrorGitOpsConfigResponse, error) {
+func (impl *GitOpsConfigServiceImpl) ValidateAndCreateGitOpsConfig(config *bean2.GitOpsConfigDto) (DetailedErrorGitOpsConfigResponse, error) {
 	detailedErrorGitOpsConfigResponse := impl.GitOpsValidateDryRun(config)
 	if len(detailedErrorGitOpsConfigResponse.StageErrorMap) == 0 {
-		gitOpsConfig, err := impl.CreateGitOpsConfig(config)
+		_, err := impl.CreateGitOpsConfig(config)
 		if err != nil {
 			impl.logger.Errorw("service err, SaveGitRepoConfig", "err", err, "payload", config)
-			return gitOpsConfig, detailedErrorGitOpsConfigResponse, err
+			return detailedErrorGitOpsConfigResponse, err
 		}
-		return gitOpsConfig, detailedErrorGitOpsConfigResponse, nil
 	}
-	return nil, detailedErrorGitOpsConfigResponse, nil
+	return detailedErrorGitOpsConfigResponse, nil
 }
-func (impl *GitOpsConfigServiceImpl) ValidateAndUpdateGitOpsConfig(config *bean2.GitOpsConfigDto) (*bean2.GitOpsConfigDto, DetailedErrorGitOpsConfigResponse, error) {
+func (impl *GitOpsConfigServiceImpl) ValidateAndUpdateGitOpsConfig(config *bean2.GitOpsConfigDto) (DetailedErrorGitOpsConfigResponse, error) {
 	detailedErrorGitOpsConfigResponse := impl.GitOpsValidateDryRun(config)
 	if len(detailedErrorGitOpsConfigResponse.StageErrorMap) == 0 {
 		err := impl.UpdateGitOpsConfig(config)
 		if err != nil {
 			impl.logger.Errorw("service err, UpdateGitOpsConfig", "err", err, "payload", config)
-			return config, detailedErrorGitOpsConfigResponse, err
+			return detailedErrorGitOpsConfigResponse, err
 		}
-		return config, detailedErrorGitOpsConfigResponse, nil
 	}
-	return nil, detailedErrorGitOpsConfigResponse, nil
+	return detailedErrorGitOpsConfigResponse, nil
 }
 
 func (impl *GitOpsConfigServiceImpl) CreateGitOpsConfig(request *bean2.GitOpsConfigDto) (*bean2.GitOpsConfigDto, error) {
@@ -687,7 +687,9 @@ func (impl *GitOpsConfigServiceImpl) GitOpsValidateDryRun(config *bean2.GitOpsCo
 	err = client.DeleteRepository(appName, config.Username, config.GitHubOrgId, config.AzureProjectName, repoOptions)
 	if err != nil {
 		impl.logger.Errorw("error in deleting repo", "err", err)
-		detailedErrorGitOpsConfigActions.StageErrorMap[DeleteRepoStage] = impl.extractErrorMessageByProvider(err, config.Provider)
+		//here below the assignment of delete is removed for making this stage optional, and it's failure not preventing it from saving/updating gitOps config
+		//detailedErrorGitOpsConfigActions.StageErrorMap[DeleteRepoStage] = impl.extractErrorMessageByProvider(err, config.Provider)
+		detailedErrorGitOpsConfigActions.DeleteRepoFailed = true
 	} else {
 		detailedErrorGitOpsConfigActions.SuccessfulStages = append(detailedErrorGitOpsConfigActions.SuccessfulStages, DeleteRepoStage)
 	}
@@ -731,5 +733,6 @@ func (impl *GitOpsConfigServiceImpl) convertDetailedErrorToResponse(detailedErro
 	for stage, err := range detailedErrorGitOpsConfigActions.StageErrorMap {
 		detailedErrorResponse.StageErrorMap[stage] = err.Error()
 	}
+	detailedErrorResponse.DeleteRepoFailed = detailedErrorGitOpsConfigActions.DeleteRepoFailed
 	return detailedErrorResponse
 }