Skip to content

Refactoring pipeline #893

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 4 commits into from
Nov 25, 2021
Merged

Refactoring pipeline #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e965fb
first cut refactoring - WIP
pghildiyal Nov 24, 2021
4a1f20d
Merge branch 'main' into refactoring-pipeline
pghildiyal Nov 24, 2021
1bd013b
work in progress refactoring
pghildiyal Nov 24, 2021
2afad10
compiled after refactoring
pghildiyal Nov 24, 2021
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
9 changes: 5 additions & 4 deletions Wire.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ package main
import (
"github.com/devtron-labs/devtron/api/connector"
"github.com/devtron-labs/devtron/api/restHandler"
pipeline2 "github.com/devtron-labs/devtron/api/restHandler/app"
"github.com/devtron-labs/devtron/api/router"
"github.com/devtron-labs/devtron/api/router/pubsub"
"github.com/devtron-labs/devtron/api/sse"
Expand Down Expand Up @@ -140,8 +141,8 @@ func InitializeApp() (*App, error) {

pipeline.NewPipelineBuilderImpl,
wire.Bind(new(pipeline.PipelineBuilder), new(*pipeline.PipelineBuilderImpl)),
restHandler.NewPipelineRestHandlerImpl,
wire.Bind(new(restHandler.PipelineConfigRestHandler), new(*restHandler.PipelineConfigRestHandlerImpl)),
pipeline2.NewPipelineRestHandlerImpl,
wire.Bind(new(pipeline2.PipelineConfigRestHandler), new(*pipeline2.PipelineConfigRestHandlerImpl)),
router.NewPipelineRouterImpl,
wire.Bind(new(router.PipelineConfigRouter), new(*router.PipelineConfigRouterImpl)),
pipeline.NewDbPipelineOrchestrator,
Expand Down Expand Up @@ -276,8 +277,8 @@ func InitializeApp() (*App, error) {
repository2.NewServiceClientImpl,
wire.Bind(new(repository2.ServiceClient), new(*repository2.ServiceClientImpl)),
wire.Bind(new(connector.Pump), new(*connector.PumpImpl)),
restHandler.NewApplicationRestHandlerImpl,
wire.Bind(new(restHandler.ApplicationRestHandler), new(*restHandler.ApplicationRestHandlerImpl)),
restHandler.NewArgoApplicationRestHandlerImpl,
wire.Bind(new(restHandler.ArgoApplicationRestHandler), new(*restHandler.ArgoApplicationRestHandlerImpl)),
router.NewApplicationRouterImpl,
wire.Bind(new(router.ApplicationRouter), new(*router.ApplicationRouterImpl)),
//app.GetConfig,
Expand Down
29 changes: 15 additions & 14 deletions api/restHandler/AppLabelsRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package restHandler

import (
"encoding/json"
"github.com/devtron-labs/devtron/api/restHandler/common"
"github.com/devtron-labs/devtron/pkg/app"
"github.com/devtron-labs/devtron/pkg/bean"
"github.com/devtron-labs/devtron/pkg/user"
Expand Down Expand Up @@ -62,15 +63,15 @@ func NewAppLabelRestHandlerImpl(logger *zap.SugaredLogger, appLabelService app.A
func (handler AppLabelRestHandlerImpl) GetAllLabels(w http.ResponseWriter, r *http.Request) {
userId, err := handler.userAuthService.GetLoggedInUser(r)
if userId == 0 || err != nil {
writeJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
return
}
token := r.Header.Get("token")
results := make([]*bean.AppLabelDto, 0)
labels, err := handler.appLabelService.FindAll()
if err != nil {
handler.logger.Errorw("service err, GetAllLabels", "err", err)
writeJsonResp(w, err, nil, http.StatusInternalServerError)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
return
}
objects := handler.enforcerUtil.GetRbacObjectsForAllApps()
Expand All @@ -80,45 +81,45 @@ func (handler AppLabelRestHandlerImpl) GetAllLabels(w http.ResponseWriter, r *ht
results = append(results, label)
}
}
writeJsonResp(w, nil, results, http.StatusOK)
common.WriteJsonResp(w, nil, results, http.StatusOK)
}

func (handler AppLabelRestHandlerImpl) GetAppMetaInfo(w http.ResponseWriter, r *http.Request) {
userId, err := handler.userAuthService.GetLoggedInUser(r)
if userId == 0 || err != nil {
writeJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
return
}
vars := mux.Vars(r)
appId, err := strconv.Atoi(vars["appId"])
if err != nil {
handler.logger.Errorw("request err, GetAppMetaInfo", "err", err, "appId", appId)
writeJsonResp(w, err, nil, http.StatusBadRequest)
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
}

//rback implementation starts here
token := r.Header.Get("token")
object := handler.enforcerUtil.GetAppRBACNameByAppId(appId)
if ok := handler.enforcer.Enforce(token, rbac.ResourceApplications, rbac.ActionGet, object); !ok {
writeJsonResp(w, err, "Unauthorized User", http.StatusForbidden)
common.WriteJsonResp(w, err, "Unauthorized User", http.StatusForbidden)
return
}
//rback implementation ends here

res, err := handler.appLabelService.GetAppMetaInfo(appId)
if err != nil {
handler.logger.Errorw("service err, GetAppMetaInfo", "err", err)
writeJsonResp(w, err, nil, http.StatusInternalServerError)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
return
}
writeJsonResp(w, nil, res, http.StatusOK)
common.WriteJsonResp(w, nil, res, http.StatusOK)
}

func (handler AppLabelRestHandlerImpl) UpdateLabelsInApp(w http.ResponseWriter, r *http.Request) {
userId, err := handler.userAuthService.GetLoggedInUser(r)
if userId == 0 || err != nil {
writeJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
return
}
decoder := json.NewDecoder(r.Body)
Expand All @@ -127,29 +128,29 @@ func (handler AppLabelRestHandlerImpl) UpdateLabelsInApp(w http.ResponseWriter,
request.UserId = userId
if err != nil {
handler.logger.Errorw("request err, UpdateLabelsInApp", "err", err, "request", request)
writeJsonResp(w, err, nil, http.StatusBadRequest)
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
}
handler.logger.Infow("request payload, UpdateLabelsInApp", "request", request)
err = handler.validator.Struct(request)
if err != nil {
handler.logger.Errorw("validation err, UpdateLabelsInApp", "err", err, "request", request)
writeJsonResp(w, err, nil, http.StatusBadRequest)
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
}
//rback implementation starts here
token := r.Header.Get("token")
object := handler.enforcerUtil.GetAppRBACNameByAppId(request.AppId)
if ok := handler.enforcer.Enforce(token, rbac.ResourceApplications, rbac.ActionUpdate, object); !ok {
writeJsonResp(w, err, "Unauthorized User", http.StatusForbidden)
common.WriteJsonResp(w, err, "Unauthorized User", http.StatusForbidden)
return
}
//rback implementation ends here
res, err := handler.appLabelService.UpdateLabelsInApp(&request)
if err != nil {
handler.logger.Errorw("service err, UpdateLabelsInApp", "err", err)
writeJsonResp(w, err, nil, http.StatusInternalServerError)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
return
}
writeJsonResp(w, nil, res, http.StatusOK)
common.WriteJsonResp(w, nil, res, http.StatusOK)
}
Loading