Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

chore(handlers): replace structs by functions for HTTP errors EE-4227 (#7664)

Browse source
This commit is contained in:
andres-portainer 2022-09-14 20:42:39 -03:00 • committed by GitHub
parent 7accdf704c
commit 9ef5636718
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
157 changed files with 1123 additions and 1147 deletions
Download patch file Download diff file Expand all files Collapse all files

10
api/http/handler/teams/team_create.go
View file

@ -44,15 +44,15 @@ func (handler *Handler) teamCreate(w http.ResponseWriter, r *http.Request) *http
var payload teamCreatePayload
err := request.DecodeAndValidateJSONPayload(r, &payload)
if err != nil {
return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err}
return httperror.BadRequest("Invalid request payload", err)
}
team, err := handler.DataStore.Team().TeamByName(payload.Name)
if err != nil && !handler.DataStore.IsErrObjectNotFound(err) {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve teams from the database", err}
return httperror.InternalServerError("Unable to retrieve teams from the database", err)
}
if team != nil {
return &httperror.HandlerError{http.StatusConflict, "A team with the same name already exists", errors.New("Team already exists")}
return &httperror.HandlerError{StatusCode: http.StatusConflict, Message: "A team with the same name already exists", Err: errors.New("Team already exists")}
}
team = &portainer.Team{
@ -61,7 +61,7 @@ func (handler *Handler) teamCreate(w http.ResponseWriter, r *http.Request) *http
err = handler.DataStore.Team().Create(team)
if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the team inside the database", err}
return httperror.InternalServerError("Unable to persist the team inside the database", err)
}
for _, teamLeader := range payload.TeamLeaders {
@ -73,7 +73,7 @@ func (handler *Handler) teamCreate(w http.ResponseWriter, r *http.Request) *http
err = handler.DataStore.TeamMembership().Create(membership)
if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist team leadership inside the database", err}
return httperror.InternalServerError("Unable to persist team leadership inside the database", err)
}
}

12
api/http/handler/teams/team_delete.go
View file

@ -27,30 +27,30 @@ import (
func (handler *Handler) teamDelete(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
teamID, err := request.RetrieveNumericRouteVariableValue(r, "id")
if err != nil {
return &httperror.HandlerError{http.StatusBadRequest, "Invalid team identifier route variable", err}
return httperror.BadRequest("Invalid team identifier route variable", err)
}
_, err = handler.DataStore.Team().Team(portainer.TeamID(teamID))
if handler.DataStore.IsErrObjectNotFound(err) {
return &httperror.HandlerError{http.StatusNotFound, "Unable to find a team with the specified identifier inside the database", err}
return httperror.NotFound("Unable to find a team with the specified identifier inside the database", err)
} else if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find a team with the specified identifier inside the database", err}
return httperror.InternalServerError("Unable to find a team with the specified identifier inside the database", err)
}
err = handler.DataStore.Team().DeleteTeam(portainer.TeamID(teamID))
if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to delete the team from the database", err}
return httperror.InternalServerError("Unable to delete the team from the database", err)
}
err = handler.DataStore.TeamMembership().DeleteTeamMembershipByTeamID(portainer.TeamID(teamID))
if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to delete associated team memberships from the database", err}
return httperror.InternalServerError("Unable to delete associated team memberships from the database", err)
}
// update default team if deleted team was default
err = handler.updateDefaultTeamIfDeleted(portainer.TeamID(teamID))
if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to reset default team", err}
return httperror.InternalServerError("Unable to reset default team", err)
}
return response.Empty(w)

10
api/http/handler/teams/team_inspect.go
View file

@ -30,23 +30,23 @@ import (
func (handler *Handler) teamInspect(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
teamID, err := request.RetrieveNumericRouteVariableValue(r, "id")
if err != nil {
return &httperror.HandlerError{http.StatusBadRequest, "Invalid team identifier route variable", err}
return httperror.BadRequest("Invalid team identifier route variable", err)
}
securityContext, err := security.RetrieveRestrictedRequestContext(r)
if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve info from request context", err}
return httperror.InternalServerError("Unable to retrieve info from request context", err)
}
if !security.AuthorizedTeamManagement(portainer.TeamID(teamID), securityContext) {
return &httperror.HandlerError{http.StatusForbidden, "Access denied to team", errors.ErrResourceAccessDenied}
return httperror.Forbidden("Access denied to team", errors.ErrResourceAccessDenied)
}
team, err := handler.DataStore.Team().Team(portainer.TeamID(teamID))
if handler.DataStore.IsErrObjectNotFound(err) {
return &httperror.HandlerError{http.StatusNotFound, "Unable to find a team with the specified identifier inside the database", err}
return httperror.NotFound("Unable to find a team with the specified identifier inside the database", err)
} else if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find a team with the specified identifier inside the database", err}
return httperror.InternalServerError("Unable to find a team with the specified identifier inside the database", err)
}
return response.JSON(w, team)

8
api/http/handler/teams/team_memberships.go
View file

@ -28,21 +28,21 @@ import (
func (handler *Handler) teamMemberships(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
teamID, err := request.RetrieveNumericRouteVariableValue(r, "id")
if err != nil {
return &httperror.HandlerError{http.StatusBadRequest, "Invalid team identifier route variable", err}
return httperror.BadRequest("Invalid team identifier route variable", err)
}
securityContext, err := security.RetrieveRestrictedRequestContext(r)
if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve info from request context", err}
return httperror.InternalServerError("Unable to retrieve info from request context", err)
}
if !security.AuthorizedTeamManagement(portainer.TeamID(teamID), securityContext) {
return &httperror.HandlerError{http.StatusForbidden, "Access denied to team", errors.ErrResourceAccessDenied}
return httperror.Forbidden("Access denied to team", errors.ErrResourceAccessDenied)
}
memberships, err := handler.DataStore.TeamMembership().TeamMembershipsByTeamID(portainer.TeamID(teamID))
if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve associated team memberships from the database", err}
return httperror.InternalServerError("Unable to retrieve associated team memberships from the database", err)
}
return response.JSON(w, memberships)

10
api/http/handler/teams/team_update.go
View file

@ -39,20 +39,20 @@ func (payload *teamUpdatePayload) Validate(r *http.Request) error {
func (handler *Handler) teamUpdate(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
teamID, err := request.RetrieveNumericRouteVariableValue(r, "id")
if err != nil {
return &httperror.HandlerError{http.StatusBadRequest, "Invalid team identifier route variable", err}
return httperror.BadRequest("Invalid team identifier route variable", err)
}
var payload teamUpdatePayload
err = request.DecodeAndValidateJSONPayload(r, &payload)
if err != nil {
return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err}
return httperror.BadRequest("Invalid request payload", err)
}
team, err := handler.DataStore.Team().Team(portainer.TeamID(teamID))
if handler.DataStore.IsErrObjectNotFound(err) {
return &httperror.HandlerError{http.StatusNotFound, "Unable to find a team with the specified identifier inside the database", err}
return httperror.NotFound("Unable to find a team with the specified identifier inside the database", err)
} else if err != nil {
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find a team with the specified identifier inside the database", err}
return httperror.InternalServerError("Unable to find a team with the specified identifier inside the database", err)
}
if payload.Name != "" {
@ -61,7 +61,7 @@ func (handler *Handler) teamUpdate(w http.ResponseWriter, r *http.Request) *http
err = handler.DataStore.Team().UpdateTeam(team.ID, team)
if err != nil {
return &httperror.HandlerError{http.StatusNotFound, "Unable to persist team changes inside the database", err}
return httperror.NotFound("Unable to persist team changes inside the database", err)
}
return response.JSON(w, team)