Merge pull request #6190 from devtron-labs/runtime-params-patch

chore: file type unit support for pipeline stage input variable

Author: Ash-exp

api/restHandler/GlobalPluginRestHandler.go

@@ -184,9 +184,9 @@ func (handler *GlobalPluginRestHandlerImpl) GetAllGlobalVariables(w http.Respons
 	object := handler.enforcerUtil.GetAppRBACNameByAppId(appId)
 	authorised := false
 	if app.AppType == helper.Job {
-		authorised = handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionGet, object)
-	} else if app.AppType == helper.CustomApp {
 		authorised = handler.enforcer.Enforce(token, casbin.ResourceJobs, casbin.ActionGet, object)
+	} else if app.AppType == helper.CustomApp {
+		authorised = handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionGet, object)
 	}
 	if !authorised {
 		common.WriteJsonResp(w, common.ErrUnAuthorized, nil, http.StatusForbidden)

pkg/pipeline/bean/pipelineStage.go

@@ -130,7 +130,7 @@ func (s *StepVariableDto) IsEmptyValueAllowed(isTriggerStage bool) bool {
 type ConditionDetailDto struct {
 	Id                  int                                       `json:"id"`
 	ConditionOnVariable string                                    `json:"conditionOnVariable"` //name of variable on which condition is written
-	ConditionType       repository.PipelineStageStepConditionType `json:"conditionType" validate:"oneof=SKIP TRIGGER SUCCESS FAIL"`
+	ConditionType       repository.PipelineStageStepConditionType `json:"conditionType" validate:"oneof=SKIP TRIGGER FAIL PASS"`
 	ConditionalOperator string                                    `json:"conditionOperator"`
 	ConditionalValue    string                                    `json:"conditionalValue"`
 }