fix: Validation of resource request for app type both helm and devtron #5348
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
komalreddy3
requested review from
vikramdevtron,
kripanshdevtron and
nishant-d
as code owners
|
| handler.logger.Errorw("error in validating resource request", "err", err) | ||
| common.WriteJsonResp(w, err, nil, http.StatusBadRequest) | ||
| return | ||
| } | ||
| if !valid { | ||
| apiError := utils.ApiError{ | ||
| InternalMessage: fmt.Sprintf("resource %s: \"%s\" doesn't exist", request.K8sRequest.ResourceIdentifier.GroupVersionKind.Kind, request.K8sRequest.ResourceIdentifier.Name), |
There was a problem hiding this comment.
extract the error message into variable adn use that here
| } | ||
| if !valid { | ||
| apiError := utils.ApiError{ | ||
| InternalMessage: fmt.Sprintf("resource %s: \"%s\" doesn't exist", request.K8sRequest.ResourceIdentifier.GroupVersionKind.Kind, request.K8sRequest.ResourceIdentifier.Name), |
| @@ -204,10 +240,52 @@ func (handler *K8sApplicationRestHandlerImpl) GetResource(w http.ResponseWriter, | |||
| //setting devtronAppIdentifier value in request | |||
| request.DevtronAppIdentifier = devtronAppIdentifier | |||
| request.ClusterId = request.DevtronAppIdentifier.ClusterId | |||
| appId := request.DevtronAppIdentifier.AppId | |||
| envId := request.DevtronAppIdentifier.EnvId | |||
| cdPipeline, err := handler.k8sApplicationService.GetPipelineByAppIdEnvId(appId, envId) | |||
There was a problem hiding this comment.
why is this method in k8's application service. this logic should be in pipeline service or pipeline config service.
| } | ||
| common.WriteJsonResp(w, &apiError, nil, http.StatusBadRequest) | ||
| return | ||
| } | ||
| } else if request.DeploymentType == bean2.ArgoInstalledType { | ||
| //TODO Implement ResourceRequest Validation for ArgoCD Installed APPs From ResourceTree |
There was a problem hiding this comment.
the below logic seems duplicate, please move it to seperate method which will handle this validation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixes #
Checklist:
Does this PR introduce a user-facing change?